Skip to content

Commit b5b4c87

Browse files
committed
Removed some old testing code
removed mapinfo.lua from output directory made "maps" subfolder the default for created smf and smt files
1 parent 7dae55d commit b5b4c87

File tree

3 files changed

+1
-35
lines changed

3 files changed

+1
-35
lines changed

MapCreationTool/MapCreationTool/MapCreationTool.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<Content Include="..\..\Map-Blueprint\mapcontainer.sdd\mapoptions.lua" Link="Tools\Map-Blueprint\mapcontainer.sdd\mapoptions.lua">
118118
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
119119
</Content>
120-
<Content Include="..\..\Map-Blueprint\README" Link="Tools\Map-Blueprint\README">
121-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
122-
</Content>
123120
<Content Include="..\..\springrts_smf_compiler\pymapconv.exe" Link="Tools\PyMapConv\pymapconv.exe">
124121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
125122
</Content>
@@ -138,9 +135,6 @@
138135
</ItemGroup>
139136

140137
<ItemGroup>
141-
<None Update="mapinfo.lua">
142-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
143-
</None>
144138
<None Update="Rendering\heightmap-Flat.bmp">
145139
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
146140
</None>

MapCreationTool/MapCreationTool/Models/ProjectSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static ProjectSettings CreateDefault(MapPathInformation pathInfo)
6666
HeightMapName = Path.Combine(pathInfo.mapPath, "height.png"),
6767
GrassMapName = Path.Combine(pathInfo.mapPath, "grass.bmp"),
6868
MetalMapName = Path.Combine(pathInfo.mapPath, "metal.bmp"),
69-
OutSmfFilePath = Path.Combine(pathInfo.mapPath, $@"{pathInfo.mapName}.smf"),
69+
OutSmfFilePath = Path.Combine(pathInfo.mapPath, $@"maps\{pathInfo.mapName}.smf"),
7070
GeoventDecalPath = geoventPath,
7171
MinHeight = -50,
7272
MaxHeight = 200,

MapCreationTool/MapCreationTool/Windows/MainWindow.xaml.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,6 @@ public MainWindow()
3434
{
3535
InitializeComponent();
3636
DataContext = ViewModel = new MainWindowViewModel();
37-
38-
39-
// Just for testing
40-
//try
41-
//{
42-
// TestLuaEditor();
43-
//}
44-
//catch (Exception e)
45-
//{
46-
47-
//}
48-
}
49-
50-
private void TestLuaEditor()
51-
{
52-
LuaEditor editor = new LuaEditor();
53-
editor.Load(@"mapinfo.lua");
54-
55-
int? test1 = editor.GetValue<int>("maphardness");
56-
bool? test2 = editor.GetValue<bool>("notDeformable");
57-
string test3 = editor.GetValue<string>("name");
58-
double test4 = editor.GetValue<double>("extractorRadius");
59-
60-
editor.SetValue("maphardness", 99);
61-
editor.SetValue("notDeformable", true);
62-
editor.SetValue("name", "NewName");
63-
editor.SetValue("extractorRadius", 441.293);
64-
editor.Save("mapinfoTest.lua");
6537
}
6638

6739
private void ctrlStart_OnMapOpened(object sender, MapPathInformation mapPathInfo)

0 commit comments

Comments
 (0)