mirror of
https://github.com/tribufu/ServerGridEditor
synced 2026-05-06 07:07:32 +00:00
Minor save dialog settings initial path fix.
Stopped doing a copy for watertile picking. Just use image in that path already. Added same poorly named water tile again with .png at end. Should replace one day. Set this on all examples
This commit is contained in:
parent
1db4ee1af8
commit
019c4903ca
6 changed files with 13 additions and 8 deletions
|
|
@ -85,9 +85,8 @@
|
||||||
"showDiscoZoneInfo": true,
|
"showDiscoZoneInfo": true,
|
||||||
"showShipPathsInfo": true,
|
"showShipPathsInfo": true,
|
||||||
"showIslandNames": false,
|
"showIslandNames": false,
|
||||||
"exportPngs": false,
|
|
||||||
"showBackground": true,
|
"showBackground": true,
|
||||||
"backgroundImgPath": "./WaterTiles/instinctworld-autoscaling",
|
"backgroundImgPath": "./WaterTiles/instinctworld-autoscaling.png",
|
||||||
"discoZonesImagePath": "Resources/discoZoneBox.png",
|
"discoZonesImagePath": "Resources/discoZoneBox.png",
|
||||||
"servers": [
|
"servers": [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,10 @@
|
||||||
"WorldAtlasPassword": "",
|
"WorldAtlasPassword": "",
|
||||||
"ModIDs": "",
|
"ModIDs": "",
|
||||||
"MapImageURL": "http://arkdedicated.com/atlaspreview.jpg",
|
"MapImageURL": "http://arkdedicated.com/atlaspreview.jpg",
|
||||||
|
"totalGridsX": 2,
|
||||||
|
"totalGridsY": 2,
|
||||||
"bUseUTCTime": true,
|
"bUseUTCTime": true,
|
||||||
|
"columnUTCOffset": 0.0,
|
||||||
"Day0": "2018-07-16 17:05:21",
|
"Day0": "2018-07-16 17:05:21",
|
||||||
"globalTransitionMinZ": 0.0,
|
"globalTransitionMinZ": 0.0,
|
||||||
"AdditionalCmdLineParams": "",
|
"AdditionalCmdLineParams": "",
|
||||||
|
|
@ -84,7 +87,7 @@
|
||||||
"showIslandNames": true,
|
"showIslandNames": true,
|
||||||
"exportPngs": false,
|
"exportPngs": false,
|
||||||
"showBackground": true,
|
"showBackground": true,
|
||||||
"backgroundImgPath": "./WaterTiles/instinctworld-autoscaling",
|
"backgroundImgPath": "./WaterTiles/instinctworld-autoscaling.png",
|
||||||
"discoZonesImagePath": "Resources/discoZoneBox.png",
|
"discoZonesImagePath": "Resources/discoZoneBox.png",
|
||||||
"servers": [
|
"servers": [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -86,8 +86,8 @@
|
||||||
"showIslandNames": true,
|
"showIslandNames": true,
|
||||||
"alphaBackground": true,
|
"alphaBackground": true,
|
||||||
"showBackground": true,
|
"showBackground": true,
|
||||||
"backgroundImgPath": "./WaterTiles/instinctworld-autoscaling",
|
|
||||||
"showForeground": true,
|
"showForeground": true,
|
||||||
|
"backgroundImgPath": "./WaterTiles/instinctworld-autoscaling.png",
|
||||||
"discoZonesImagePath": "Resources/discoZoneBox.png",
|
"discoZonesImagePath": "Resources/discoZoneBox.png",
|
||||||
"servers": [
|
"servers": [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1610,6 +1610,8 @@ namespace ServerGridEditor
|
||||||
return;
|
return;
|
||||||
|
|
||||||
saveFileDialog.Filter = "json files (*.json)|*.json";
|
saveFileDialog.Filter = "json files (*.json)|*.json";
|
||||||
|
saveFileDialog.FileName = actualJsonFile;
|
||||||
|
saveFileDialog.InitialDirectory = GlobalSettings.Instance.ProjectsDir;
|
||||||
if (saveFileDialog.ShowDialog() == DialogResult.OK)
|
if (saveFileDialog.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
File.WriteAllText(saveFileDialog.FileName, currentProject.Serialize(this));
|
File.WriteAllText(saveFileDialog.FileName, currentProject.Serialize(this));
|
||||||
|
|
@ -1851,7 +1853,8 @@ namespace ServerGridEditor
|
||||||
if (currentProject == null)
|
if (currentProject == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
openFileDialog.Filter = "png files (*.png)|*.png";
|
openFileDialog.Filter = "png files (*.png)|*.png|All files (*.*)|*.*";
|
||||||
|
openFileDialog.FileName = "";
|
||||||
openFileDialog.InitialDirectory = GlobalSettings.Instance.BaseDir + waterTilesDir.Replace("./","");
|
openFileDialog.InitialDirectory = GlobalSettings.Instance.BaseDir + waterTilesDir.Replace("./","");
|
||||||
if (openFileDialog.ShowDialog() == DialogResult.OK)
|
if (openFileDialog.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
|
|
@ -1862,10 +1865,10 @@ namespace ServerGridEditor
|
||||||
if (tile != null)
|
if (tile != null)
|
||||||
tile.Dispose();
|
tile.Dispose();
|
||||||
|
|
||||||
File.Copy(openFileDialog.FileName, imgName + openFileDialog.SafeFileName, true);
|
//File.Copy(openFileDialog.FileName, imgName + openFileDialog.SafeFileName, true);
|
||||||
SetTileImage(openFileDialog.FileName);
|
|
||||||
currentProject.showBackground = true;
|
currentProject.showBackground = true;
|
||||||
currentProject.backgroundImgPath = imgName;
|
currentProject.backgroundImgPath = imgName + openFileDialog.SafeFileName;
|
||||||
|
SetTileImage(currentProject.backgroundImgPath);
|
||||||
tiledBackgroundCheckbox.Checked = true;
|
tiledBackgroundCheckbox.Checked = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
WaterTiles/instinctworld-autoscaling.png
Normal file
BIN
WaterTiles/instinctworld-autoscaling.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.6 MiB |
Loading…
Add table
Add a link
Reference in a new issue