tiberium/CnC_Remastered_Collection
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

September 24th Hotfix

Browse source 
Fixed some problematic harvester behavior
Implemented 10% build time reduction for Turkey
Neutral structures are capturable in multiplayer again (except for STRUCT_V01)
Other misc. fixes
This commit is contained in:
PG-SteveT 2020-09-24 10:20:58 -07:00
parent fd05be35c1
commit 7d496e8a63
40 changed files with 226 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CnCTDRAMapEditor/Controls/BasicSettings.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Controls/BriefingSettings.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Controls/MapPanel.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Controls/ObjectProperties.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Controls/PlayerSettings.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Controls/TerrainProperties.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/ErrorMessageBox.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/InviteMessageBox.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/MapSettingsDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/NewMapDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/SteamDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/TeamTypesDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Dialogs/TriggersDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/MainForm.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Properties/Resources.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Properties/Settings.settings
View file

@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="MobiusEditor.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>

2
CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.resx
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

28
CnCTDRAMapEditor/Utility/INI.cs
View file

@ -533,7 +533,33 @@ namespace MobiusEditor.Utility
var converter = propertyDescriptors.Find(property.Name, false)?.Converter ?? TypeDescriptor.GetConverter(property.PropertyType);
if (converter.CanConvertFrom(context, typeof(string)))
{
property.SetValue(data, converter.ConvertFromString(context, section[property.Name]));
try
{
property.SetValue(data, converter.ConvertFromString(context, section[property.Name]));
}
catch (FormatException)
{
if (property.PropertyType == typeof(bool))
{
var value = section[property.Name].ToLower();
if (value == "no")
{
property.SetValue(data, false);
}
else if (value == "yes")
{
property.SetValue(data, true);
}
else
{
throw;
}
}
else
{
throw;
}
}
}
}
}