Merge branch 'develop'

Lined up some code in MiscPatches.cpp.
Reverted item highlighting mod to the previous status (commit 90485a205a). #132
2026-07-27 16:52:34 -07:00 · 2018-02-13 09:50:43 +08:00 · 2018-02-12 21:07:02 +08:00 · 2018-01-28 18:15:35 +08:00 · 2018-01-17 21:22:37 +08:00 · 2018-01-17 13:55:22 +08:00
309 changed files with 37956 additions and 41380 deletions
@@ -46,6 +46,8 @@ nb-configuration.xml
 *.user
 *.userosscache
 *.sln.docstates
+*.VC.db
+*.VC.opendb

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -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.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.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;

    }
 }
@@ -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() {
@@ -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.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.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;
    }
 }
@@ -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];
-            }
-        }
    }
 }
@@ -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>
@@ -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
@@ -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
+    } 
 }
@@ -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")]
@@ -1,8 +1,8 @@
 # sfall

-A set of engine modifications for the classic game Fallout 2 in form of a DLL, which modifies executable in memory without changing anything in EXE file itself.
+A set of engine modifications for the classic game Fallout 2 in form of a DLL, which modifies executable in memory without changing anything in EXE file itself.  

-**Engine modifications include:**
+Engine modifications include:   
 - Better support for modern operating systems
 - Externalizing many settings like starting map and game time, skills, perks, critical hit tables, books, etc.
 - Bug fixes
@@ -10,7 +10,7 @@ A set of engine modifications for the classic game Fallout 2 in form of a DLL, w
 - Extended scripting capabilities for modders (many new opcodes to control sfall features as well as previously unavailable vanilla engine functions)


-Original author: timeslip
+Original author: timeslip  

-Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows fallout to run correctly on modern operating systems, and adds additional features for modders.
+Original description: A set of engine modifications for the classic game Fallout 2 by Interplay. Includes fixes for bugs in the original engine, allows fallout to run correctly on modern operating systems, and adds additional features for modders.  

@@ -14,18 +14,17 @@ 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
 ;Note that the UOP fixes are included in the defaults, and do not need to be
-;  added manually when using this override format, as opposed to the old one
+;  added manually when using this override format, as opposed to the old one
@@ -7,32 +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

-[PerksTweak]
-;Change the penalty distance and distance bonus for 'Weapon Scope Range' weapon perk
-;0 - no penalty, 8 - default penalty
-WeaponScopeRangePenalty=8
-;2 - no bonus, 5 - default bonus
-WeaponScopeRangeBonus=5
-
-;Changes the distance bonus for 'Weapon Long Range' weapon perk
-;2 - no bonus, 4 - default bonus
-WeaponLongRangeBonus=4
-
-;Changes the hit chance bonus for 'Weapon Accurate' weapon perk
-;0 - no bonus,  200 - maximum bonus, 20 - default bonus
-WeaponAccurateBonus=20
-
-;Changes the strength bonus for 'Weapon Handling' perk
-;0 - no bonus,  10 - maximum bonus, 3 - default bonus
-WeaponHandlingBonus=3
-
-;##############################################################################
-[Perks]
-;Set to 1 to enable the modifications for perks
-Enable=0
-
-;Name=The name of the perk (max 63 characters)
-;Desc=The description of the perk (max 255 characters)
+;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
@@ -59,7 +35,6 @@ Enable=0

 ;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
@@ -82,11 +57,6 @@ INT=0
 AGL=0
 LCK=0

-;##############################################################################
-[Traits]
-;Set to 1 to enable the modifications for traits
-Enable=0
-
 ;This is a modification to trait 0
 [t0]
 NoHardcode=0
@@ -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
@@ -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
@@ -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
@@ -24,23 +23,4 @@ ID3=50
 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)
+;No forth exit point
@@ -0,0 +1,73 @@
+
+; 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
+Default=16777280
+Leather=16777325
+Power=16777324
+Metal=16777323
+Jacket=16777321
+Combat=16777322
+
+; Vic
+[2]
+PID=16777278
+Default=16777307
+Jacket=16777329
+Combat=16777330
+Metal=16777331
+Power=16777332
+Leather=16777333
+
+; Cassidy
+[3]
+PID=16777305
+Default=16777354
+Leather=16777260
+Power=16777328
+Metal=16777327
+Jacket=16777351
+Combat=16777326
+
+; Myron
+[4]
+PID=16777376
+Default=16777304
+Leather=
+Power=16777349
+Combat=16777350
+
+; Cat Jules
+[5]
+PID=16777734
+Default=16777353
+Leather=16777347
+Metal=16777348
+Jacket=16777346
+Combat=16777226
+
+; Kitsune
+[6]
+PID=16777724
+Default=16777222
+Leather=16777221
+Metal=16777223
+Jacket=16777222
+Combat=16777219
@@ -1,14 +1,14 @@
 [Highlighting]

-; DX scancode of a key to press to highlight items on the ground
+; DX scandode of a key to press to highlight items on the ground
 ;  42 - SHIFT key
 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
@@ -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
--- a/Show More
+++ b/Show More