Skip to content

Commit 7422396

Browse files
committed
Clean up unused field in map reveal trigger script, fix map reveal trigger script and interior wall randomization script being included in compilation, fix interior wall randomization script not getting copied to build output
1 parent 5b8b4b9 commit 7422396

2 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/TSMapEditor/Config/Scripts/Add Map Reveal Trigger.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,11 @@ public class AddMapRevealTrigger
2828
/// </summary>
2929
public string GetSuccessMessage()
3030
{
31-
if (error == null)
32-
return string.Format(Translator.Translate("MapScripts.AddMapRevealTrigger.SuccessMessage",
33-
"Successfully created a map reveal trigger with name \"{0}\". You can locate it in the Triggers window."),
34-
mapRevealTriggerName);
35-
36-
return error;
31+
return string.Format(Translator.Translate("MapScripts.AddMapRevealTrigger.SuccessMessage",
32+
"Created a map reveal trigger with name \"{0}\". You can locate it in the Triggers window."),
33+
mapRevealTriggerName);
3734
}
3835

39-
private string error;
40-
4136
private string mapRevealTriggerName = Translator.Translate("MapScripts.AddMapRevealTrigger.TriggerName", "Map Reveal Trigger");
4237

4338
/// <summary>

src/TSMapEditor/TSMapEditor.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
</PropertyGroup>
2828
<ItemGroup>
2929
<Compile Remove="Config\Scripts\Activate Assign Mission Cursor Action.cs" />
30+
<Compile Remove="Config\Scripts\Add Map Reveal Trigger.cs" />
3031
<Compile Remove="Config\Scripts\Apply Animated Water.cs" />
3132
<Compile Remove="Config\Scripts\Disable All Debug Triggers.cs" />
3233
<Compile Remove="Config\Scripts\List Unused Scripting Elements.cs" />
3334
<Compile Remove="Config\Scripts\Make Civilian Vehicles Sleep.cs" />
35+
<Compile Remove="Config\Scripts\Randomize Interior Walls.cs" />
3436
<Compile Remove="Config\Scripts\Remove All Terrain Objects.cs" />
3537
<Compile Remove="Config\Scripts\Replace Autumn Grass With Tall Grass.cs" />
3638
<Compile Remove="Config\Scripts\Replace Autumn Jungle Grass With Summer Grass.cs" />
@@ -498,6 +500,9 @@
498500
<None Include="Config\Scripts\Activate Assign Mission Cursor Action.cs">
499501
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
500502
</None>
503+
<None Include="Config\Scripts\Add Map Reveal Trigger.cs">
504+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
505+
</None>
501506
<None Include="Config\Scripts\Apply Animated Water.cs">
502507
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
503508
</None>
@@ -511,6 +516,9 @@
511516
<None Include="Config\Scripts\Make Civilian Vehicles Sleep.cs">
512517
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
513518
</None>
519+
<None Include="Config\Scripts\Randomize Interior Walls.cs">
520+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
521+
</None>
514522
<None Include="Config\Scripts\Remove All Terrain Objects.cs">
515523
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
516524
</None>
@@ -530,11 +538,6 @@
530538
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
531539
</None>
532540
</ItemGroup>
533-
<ItemGroup>
534-
<Compile Update="Config\Scripts\Add Map Reveal Trigger.cs">
535-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
536-
</Compile>
537-
</ItemGroup>
538541
<Target Name="RestoreDotnetTools" BeforeTargets="Restore">
539542
<Message Text="Restoring dotnet tools" Importance="High" />
540543
<Exec Command="dotnet tool restore" />

0 commit comments

Comments
 (0)