Skip to content

Commit

Permalink
September 24th Hotfix
Browse files Browse the repository at this point in the history
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
  • Loading branch information
PG-SteveT committed Sep 24, 2020
1 parent fd05be3 commit 7d496e8
Show file tree
Hide file tree
Showing 40 changed files with 226 additions and 264 deletions.
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1022
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Controls/BasicSettings.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Controls/BriefingSettings.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Controls/MapPanel.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Controls/ObjectProperties.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Controls/PlayerSettings.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Controls/TerrainProperties.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/ErrorMessageBox.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/InviteMessageBox.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/MapSettingsDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/NewMapDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/SteamDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/TeamTypesDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Dialogs/TriggersDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/MainForm.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Properties/Resources.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Properties/Settings.settings
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/CellTriggersToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/GenericToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/ObjectToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/ResourcesToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/TemplateToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/TerrainToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
2 changes: 1 addition & 1 deletion CnCTDRAMapEditor/Tools/Dialogs/WaypointsToolDialog.resx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down
28 changes: 27 additions & 1 deletion CnCTDRAMapEditor/Utility/INI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,33 @@ public static void ParseSection<T>(ITypeDescriptorContext context, INISection se
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;
}
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion REDALERT/ANIM.CPP
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ IsTheaterShape = false;
** Check for a virtual animation
*/
if (Class->VirtualAnim != ANIM_NONE) {
AnimClass* virtual_anim = new AnimClass(Class->VirtualAnim, 0, timedelay, loop);
AnimClass* virtual_anim = new AnimClass(Class->VirtualAnim, Coord, timedelay, loop);
if (virtual_anim != NULL) {
virtual_anim->Make_Invisible();
VirtualAnimTarget = virtual_anim->As_Target();
Expand Down
4 changes: 3 additions & 1 deletion REDALERT/BUILDING.CPP
Original file line number Diff line number Diff line change
Expand Up @@ -3463,7 +3463,9 @@ bool BuildingClass::Can_Capture(void) const

// Only allow capturing of multiplayer-owned structures
if (Session.Type != GAME_NORMAL) {
can_capture &= House->Class->House >= HOUSE_MULTI1 && House->Class->House <= HOUSE_MULTI8;
if (*this == STRUCT_V01) { // Check to fix exploit in specific map 'Tournament Ore Rift'
can_capture = false;
}
}

return(can_capture);
Expand Down
2 changes: 1 addition & 1 deletion REDALERT/MiscAsm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ int __cdecl Desired_Facing8(long x1, long y1, long x2, long y2)
#if (0)

/*
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/REDALERT/MiscAsm.cpp#131 $
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/REDALERT/MiscAsm.cpp#138 $
;***************************************************************************
;** C O N F I D E N T I A L --- W E S T W O O D A S S O C I A T E S **
;***************************************************************************
Expand Down
11 changes: 11 additions & 0 deletions REDALERT/TECHNO.CPP
Original file line number Diff line number Diff line change
Expand Up @@ -6495,6 +6495,17 @@ int TechnoTypeClass::Time_To_Build(HousesType house) const
time *= hptr->BuildSpeedBias;
}
else {

/*
** New feature - Turkey has a 10% build speed bonus even though it isn't specified in the rules
*/
if (hptr->ActLike == HOUSE_TURKEY) {
if (hptr->BuildSpeedBias == fixed(1)) {
time *= 9;
time /= 10;
}
}

if (What_Am_I() == RTTI_BUILDINGTYPE || What_Am_I() == RTTI_INFANTRYTYPE) {
time *= hptr->BuildSpeedBias;
}
Expand Down
Loading

0 comments on commit 7d496e8

Please sign in to comment.