diff --git a/Projects/ServerGrid.json b/Projects/ServerGrid.json index 095051f..9c0ad27 100644 --- a/Projects/ServerGrid.json +++ b/Projects/ServerGrid.json @@ -85,9 +85,8 @@ "showDiscoZoneInfo": true, "showShipPathsInfo": true, "showIslandNames": false, - "exportPngs": false, "showBackground": true, - "backgroundImgPath": "./WaterTiles/instinctworld-autoscaling", + "backgroundImgPath": "./WaterTiles/instinctworld-autoscaling.png", "discoZonesImagePath": "Resources/discoZoneBox.png", "servers": [ { diff --git a/Projects/ServerGrid2x2.json b/Projects/ServerGrid2x2.json index de19523..5e6c13f 100644 --- a/Projects/ServerGrid2x2.json +++ b/Projects/ServerGrid2x2.json @@ -8,7 +8,10 @@ "WorldAtlasPassword": "", "ModIDs": "", "MapImageURL": "http://arkdedicated.com/atlaspreview.jpg", + "totalGridsX": 2, + "totalGridsY": 2, "bUseUTCTime": true, + "columnUTCOffset": 0.0, "Day0": "2018-07-16 17:05:21", "globalTransitionMinZ": 0.0, "AdditionalCmdLineParams": "", @@ -84,7 +87,7 @@ "showIslandNames": true, "exportPngs": false, "showBackground": true, - "backgroundImgPath": "./WaterTiles/instinctworld-autoscaling", + "backgroundImgPath": "./WaterTiles/instinctworld-autoscaling.png", "discoZonesImagePath": "Resources/discoZoneBox.png", "servers": [ { diff --git a/Projects/ServerGrid4x4.json b/Projects/ServerGrid4x4.json index 8306f80..1d2a103 100644 --- a/Projects/ServerGrid4x4.json +++ b/Projects/ServerGrid4x4.json @@ -86,8 +86,8 @@ "showIslandNames": true, "alphaBackground": true, "showBackground": true, - "backgroundImgPath": "./WaterTiles/instinctworld-autoscaling", "showForeground": true, + "backgroundImgPath": "./WaterTiles/instinctworld-autoscaling.png", "discoZonesImagePath": "Resources/discoZoneBox.png", "servers": [ { diff --git a/ServerGridEditor.exe b/ServerGridEditor.exe index 6c230c8..b903c35 100644 Binary files a/ServerGridEditor.exe and b/ServerGridEditor.exe differ diff --git a/Src/ServerGridEditor/Forms/MainForm.cs b/Src/ServerGridEditor/Forms/MainForm.cs index a8f26a8..19e937c 100644 --- a/Src/ServerGridEditor/Forms/MainForm.cs +++ b/Src/ServerGridEditor/Forms/MainForm.cs @@ -1610,6 +1610,8 @@ namespace ServerGridEditor return; saveFileDialog.Filter = "json files (*.json)|*.json"; + saveFileDialog.FileName = actualJsonFile; + saveFileDialog.InitialDirectory = GlobalSettings.Instance.ProjectsDir; if (saveFileDialog.ShowDialog() == DialogResult.OK) { File.WriteAllText(saveFileDialog.FileName, currentProject.Serialize(this)); @@ -1851,7 +1853,8 @@ namespace ServerGridEditor if (currentProject == null) return; - openFileDialog.Filter = "png files (*.png)|*.png"; + openFileDialog.Filter = "png files (*.png)|*.png|All files (*.*)|*.*"; + openFileDialog.FileName = ""; openFileDialog.InitialDirectory = GlobalSettings.Instance.BaseDir + waterTilesDir.Replace("./",""); if (openFileDialog.ShowDialog() == DialogResult.OK) { @@ -1862,10 +1865,10 @@ namespace ServerGridEditor if (tile != null) tile.Dispose(); - File.Copy(openFileDialog.FileName, imgName + openFileDialog.SafeFileName, true); - SetTileImage(openFileDialog.FileName); + //File.Copy(openFileDialog.FileName, imgName + openFileDialog.SafeFileName, true); currentProject.showBackground = true; - currentProject.backgroundImgPath = imgName; + currentProject.backgroundImgPath = imgName + openFileDialog.SafeFileName; + SetTileImage(currentProject.backgroundImgPath); tiledBackgroundCheckbox.Checked = true; } } diff --git a/WaterTiles/instinctworld-autoscaling.png b/WaterTiles/instinctworld-autoscaling.png new file mode 100644 index 0000000..7ac1ea8 Binary files /dev/null and b/WaterTiles/instinctworld-autoscaling.png differ