Update and new 11x11 server grid

This commit is contained in:
GrapeshotGames 2020-07-07 13:04:28 -04:00
parent cffac3d0df
commit c86f24b31c
12 changed files with 278839 additions and 166523 deletions

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 KiB

After

Width:  |  Height:  |  Size: 576 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 KiB

After

Width:  |  Height:  |  Size: 576 KiB

Before After
Before After

171316
Projects/ServerGrid _OG.json Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

54164
Projects/ServerGrid11x11.json Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

View file

@ -323,6 +323,8 @@ namespace AtlasGridDataLibrary
public float singleSpawnPointX; public float singleSpawnPointX;
public float singleSpawnPointY; public float singleSpawnPointY;
public float singleSpawnPointZ; public float singleSpawnPointZ;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
public float maxIslandClaimFlagZ;
} }
public class DiscoveryZoneData : MoveableObjectData public class DiscoveryZoneData : MoveableObjectData

View file

@ -57,6 +57,8 @@ namespace ServerGridEditor
[DefaultValue(0)] [DefaultValue(0)]
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
public float singleSpawnPointZ; public float singleSpawnPointZ;
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore)]
public float maxIslandClaimFlagZ = 0.0f;
[JsonIgnore] [JsonIgnore]
public string modDir = null; public string modDir = null;
@ -108,7 +110,7 @@ namespace ServerGridEditor
public Island(string name, float x, float y, string imagePath, int landscapeMaterialOverride public Island(string name, float x, float y, string imagePath, int landscapeMaterialOverride
, List<string> sublevelNames, Dictionary<string, string> spawnerOverrides, List<string> treasureMapSpawnPoints, List<string> wildPirateCampSpawnPoints, float minTreasureQuality, float maxTreasureQuality, bool useNpcVolumesForTreasures, , List<string> sublevelNames, Dictionary<string, string> spawnerOverrides, List<string> treasureMapSpawnPoints, List<string> wildPirateCampSpawnPoints, float minTreasureQuality, float maxTreasureQuality, bool useNpcVolumesForTreasures,
bool useLevelBoundsForTreasures, bool prioritizeVolumesForTreasures, string IslandTreasureBottleSupplyCrateOverrides, List<string> extraSublevels, int islandPoints, float sPlayerSpawnPointX, float sPlayerSpawnPointY, float sPlayerSpawnPointZ) bool useLevelBoundsForTreasures, bool prioritizeVolumesForTreasures, string IslandTreasureBottleSupplyCrateOverrides, List<string> extraSublevels, int islandPoints, float sPlayerSpawnPointX, float sPlayerSpawnPointY, float sPlayerSpawnPointZ, float theMaxIslandClaimFlagZ)
{ {
this.name = name; this.name = name;
this.x = x; this.x = x;
@ -130,6 +132,7 @@ namespace ServerGridEditor
this.singleSpawnPointX = sPlayerSpawnPointX; this.singleSpawnPointX = sPlayerSpawnPointX;
this.singleSpawnPointY = sPlayerSpawnPointY; this.singleSpawnPointY = sPlayerSpawnPointY;
this.singleSpawnPointZ = sPlayerSpawnPointZ; this.singleSpawnPointZ = sPlayerSpawnPointZ;
this.maxIslandClaimFlagZ = theMaxIslandClaimFlagZ;
} }
} }
@ -163,6 +166,7 @@ namespace ServerGridEditor
Data.singleSpawnPointX = 0; Data.singleSpawnPointX = 0;
Data.singleSpawnPointY = 0; Data.singleSpawnPointY = 0;
Data.singleSpawnPointZ = 0; Data.singleSpawnPointZ = 0;
Data.maxIslandClaimFlagZ = 0;
return Data; return Data;
} }

View file

@ -157,6 +157,7 @@ namespace ServerGridEditor
instance.singleSpawnPointX = referencedIsland.singleSpawnPointX; instance.singleSpawnPointX = referencedIsland.singleSpawnPointX;
instance.singleSpawnPointY = referencedIsland.singleSpawnPointY; instance.singleSpawnPointY = referencedIsland.singleSpawnPointY;
instance.singleSpawnPointZ = referencedIsland.singleSpawnPointZ; instance.singleSpawnPointZ = referencedIsland.singleSpawnPointZ;
instance.maxIslandClaimFlagZ = referencedIsland.maxIslandClaimFlagZ;
} }
instance.SyncOverridesWithTemplates(mainForm); instance.SyncOverridesWithTemplates(mainForm);

View file

@ -77,6 +77,8 @@
this.TreasureMapSpawnPointsTxtBox = new System.Windows.Forms.TextBox(); this.TreasureMapSpawnPointsTxtBox = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label();
this.WildPirateCampSpawnPointsTxtBox = new System.Windows.Forms.TextBox(); this.WildPirateCampSpawnPointsTxtBox = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.spawnerOverridesGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.spawnerOverridesGrid)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
@ -503,6 +505,23 @@
this.WildPirateCampSpawnPointsTxtBox.Size = new System.Drawing.Size(332, 82); this.WildPirateCampSpawnPointsTxtBox.Size = new System.Drawing.Size(332, 82);
this.WildPirateCampSpawnPointsTxtBox.TabIndex = 54; this.WildPirateCampSpawnPointsTxtBox.TabIndex = 54;
// //
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(194, 685);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(55, 20);
this.textBox1.TabIndex = 56;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(69, 688);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(119, 13);
this.label22.TabIndex = 58;
this.label22.Text = "Island Max Claim Flag Z";
this.label22.Click += new System.EventHandler(this.label22_Click);
//
// CreateIslandForm // CreateIslandForm
// //
this.AcceptButton = this.createBtn; this.AcceptButton = this.createBtn;
@ -510,6 +529,8 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.cancelBtn; this.CancelButton = this.cancelBtn;
this.ClientSize = new System.Drawing.Size(609, 773); this.ClientSize = new System.Drawing.Size(609, 773);
this.Controls.Add(this.label22);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.label20); this.Controls.Add(this.label20);
this.Controls.Add(this.WildPirateCampSpawnPointsTxtBox); this.Controls.Add(this.WildPirateCampSpawnPointsTxtBox);
this.Controls.Add(this.label15); this.Controls.Add(this.label15);
@ -622,5 +643,7 @@
private System.Windows.Forms.TextBox TreasureMapSpawnPointsTxtBox; private System.Windows.Forms.TextBox TreasureMapSpawnPointsTxtBox;
private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label20;
private System.Windows.Forms.TextBox WildPirateCampSpawnPointsTxtBox; private System.Windows.Forms.TextBox WildPirateCampSpawnPointsTxtBox;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Label label22;
} }
} }

View file

@ -67,6 +67,8 @@ namespace ServerGridEditor
singleSpawnPointXTxtBox.Text = editedIsland.singleSpawnPointX + ""; singleSpawnPointXTxtBox.Text = editedIsland.singleSpawnPointX + "";
singleSpawnPointYTxtBox.Text = editedIsland.singleSpawnPointY + ""; singleSpawnPointYTxtBox.Text = editedIsland.singleSpawnPointY + "";
singleSpawnPointZTxtBox.Text = editedIsland.singleSpawnPointZ + ""; singleSpawnPointZTxtBox.Text = editedIsland.singleSpawnPointZ + "";
textBox1.Text = editedIsland.maxIslandClaimFlagZ + "";
if (editedIsland.extraSublevels != null) if (editedIsland.extraSublevels != null)
extraSublevelsTxtBox.Lines = editedIsland.extraSublevels.ToArray(); extraSublevelsTxtBox.Lines = editedIsland.extraSublevels.ToArray();
@ -190,6 +192,9 @@ namespace ServerGridEditor
float.TryParse(singleSpawnPointYTxtBox.Text, out spSpawnPointY); float.TryParse(singleSpawnPointYTxtBox.Text, out spSpawnPointY);
float.TryParse(singleSpawnPointZTxtBox.Text, out spSpawnPointZ); float.TryParse(singleSpawnPointZTxtBox.Text, out spSpawnPointZ);
float maxIslandZ = 0.0f;
float.TryParse(textBox1.Text, out maxIslandZ);
int islandPoints = 1; int islandPoints = 1;
int.TryParse(islandPointsTxtBox.Text, out islandPoints); int.TryParse(islandPointsTxtBox.Text, out islandPoints);
string islandRemovedFromMod = null; string islandRemovedFromMod = null;
@ -317,6 +322,7 @@ namespace ServerGridEditor
editedIsland.singleSpawnPointX = spSpawnPointX; editedIsland.singleSpawnPointX = spSpawnPointX;
editedIsland.singleSpawnPointY = spSpawnPointY; editedIsland.singleSpawnPointY = spSpawnPointY;
editedIsland.singleSpawnPointZ = spSpawnPointZ; editedIsland.singleSpawnPointZ = spSpawnPointZ;
editedIsland.maxIslandClaimFlagZ = maxIslandZ;
editedIsland.islandTreasureBottleSupplyCrateOverrides = IslandTreasureBottleSupplyCrateOverridesTxtBox.Text; editedIsland.islandTreasureBottleSupplyCrateOverrides = IslandTreasureBottleSupplyCrateOverridesTxtBox.Text;
@ -395,7 +401,7 @@ namespace ServerGridEditor
mainForm.islands.Add(Name, new Island(Name, x, y, newImgPath, landscapeMaterialOverride, sublevelNames, spawnerOverrides, mainForm.islands.Add(Name, new Island(Name, x, y, newImgPath, landscapeMaterialOverride, sublevelNames, spawnerOverrides,
treasureMapSpawnPoints, wildPirateCampSpawnPoints, minTreasureQuality, maxTreasureQuality, useNpcVolumesForTreasuresChkBox.Checked, useLevelBoundsForTreasuresChkBox.Checked, treasureMapSpawnPoints, wildPirateCampSpawnPoints, minTreasureQuality, maxTreasureQuality, useNpcVolumesForTreasuresChkBox.Checked, useLevelBoundsForTreasuresChkBox.Checked,
prioritizeVolumesForTreasuresChkBox.Checked, IslandTreasureBottleSupplyCrateOverridesTxtBox.Text, new List<string>(extraSublevelsTxtBox.Lines), islandPoints, spSpawnPointX, spSpawnPointY, spSpawnPointZ)); prioritizeVolumesForTreasuresChkBox.Checked, IslandTreasureBottleSupplyCrateOverridesTxtBox.Text, new List<string>(extraSublevelsTxtBox.Lines), islandPoints, spSpawnPointX, spSpawnPointY, spSpawnPointZ, maxIslandZ));
mainForm.islands.Last().Value.modDir = modNameTxtBox.Text.Trim(); mainForm.islands.Last().Value.modDir = modNameTxtBox.Text.Trim();
@ -443,5 +449,10 @@ namespace ServerGridEditor
sublevelsList.Items.Remove(item); sublevelsList.Items.Remove(item);
} }
} }
private void label22_Click(object sender, EventArgs e)
{
}
} }
} }