Moving all Dev changes to Main

GeneralsMD/Code/GameEngine/CMakeLists.txt

@@ -129,17 +129,17 @@ set(GAMEENGINE_SRC
     Include/Common/UserPreferences.h
     Include/Common/version.h
     Include/Common/WellKnownKeys.h
-#    Include/Common/Xfer.h
-#    Include/Common/XferCRC.h
-#    Include/Common/XferDeepCRC.h
-#    Include/Common/XferLoad.h
-#    Include/Common/XferSave.h
+#    Include/Common/Xfer.h
+#    Include/Common/XferCRC.h
+#    Include/Common/XferDeepCRC.h
+#    Include/Common/XferLoad.h
+#    Include/Common/XferSave.h
     Include/GameClient/Anim2D.h
     Include/GameClient/AnimateWindowManager.h
     Include/GameClient/CampaignManager.h
     Include/GameClient/CDCheck.h
     Include/GameClient/ChallengeGenerals.h
-    Include/GameClient/ClientInstance.h
+    Include/GameClient/ClientInstance.h
     Include/GameClient/ClientRandomValue.h
     Include/GameClient/Color.h
     Include/GameClient/CommandXlat.h
@@ -288,6 +288,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h
     Include/GameLogic/Module/CostModifierUpgrade.h
     Include/GameLogic/Module/ProductionTimeModifierUpgrade.h
+    Include/GameLogic/Module/UnitProductionBonusUpgrade.h
     Include/GameLogic/Module/CountermeasuresBehavior.h
     Include/GameLogic/Module/CrateCollide.h
     Include/GameLogic/Module/CreateCrateDie.h
@@ -309,6 +310,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/DockUpdate.h
     Include/GameLogic/Module/DozerAIUpdate.h
     Include/GameLogic/Module/DumbProjectileBehavior.h
+    Include/GameLogic/Module/FreeFallProjectileBehavior.h
     Include/GameLogic/Module/DynamicGeometryInfoUpdate.h
     Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h
     Include/GameLogic/Module/EjectPilotDie.h
@@ -323,6 +325,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/FireWeaponUpdate.h
     Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h
     Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h
+    Include/GameLogic/Module/DelayedUpgradeBehavior.h
     Include/GameLogic/Module/FlammableUpdate.h
     Include/GameLogic/Module/FlightDeckBehavior.h
     Include/GameLogic/Module/FloatUpdate.h
@@ -345,6 +348,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/ImmortalBody.h
     Include/GameLogic/Module/InactiveBody.h
     Include/GameLogic/Module/InstantDeathBehavior.h
+    Include/GameLogic/Module/ChronoDeathBehavior.h
     Include/GameLogic/Module/InternetHackContain.h
     Include/GameLogic/Module/JetAIUpdate.h
     Include/GameLogic/Module/JetSlowDeathBehavior.h
@@ -399,6 +403,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/RadarUpdate.h
     Include/GameLogic/Module/RadarUpgrade.h
     Include/GameLogic/Module/RadiusDecalUpdate.h
+    Include/GameLogic/Module/RadiusDecalBehavior.h
     Include/GameLogic/Module/RailedTransportAIUpdate.h
     Include/GameLogic/Module/RailedTransportContain.h
     Include/GameLogic/Module/RailedTransportDockUpdate.h
@@ -432,6 +437,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/SpecialPowerUpdateModule.h
     Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h
     Include/GameLogic/Module/SpectreGunshipUpdate.h
+    Include/GameLogic/Module/UpgradeSpecialPower.h
     Include/GameLogic/Module/SpyVisionSpecialPower.h
     Include/GameLogic/Module/SpyVisionUpdate.h
     Include/GameLogic/Module/SquishCollide.h
@@ -445,6 +451,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/StructureCollapseUpdate.h
     Include/GameLogic/Module/StructureToppleUpdate.h
     Include/GameLogic/Module/SubdualDamageHelper.h
+    Include/GameLogic/Module/ChronoDamageHelper.h
     Include/GameLogic/Module/SubObjectsUpgrade.h
     Include/GameLogic/Module/SupplyCenterCreate.h
     Include/GameLogic/Module/SupplyCenterDockUpdate.h
@@ -470,6 +477,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/VeterancyCrateCollide.h
     Include/GameLogic/Module/VeterancyGainCreate.h
     Include/GameLogic/Module/WanderAIUpdate.h
+    Include/GameLogic/Module/TeleporterAIUpdate.h
     Include/GameLogic/Module/WaveGuideUpdate.h
     Include/GameLogic/Module/WeaponBonusUpdate.h
     Include/GameLogic/Module/ArmorDamageScalarUpdate.h
@@ -668,10 +676,10 @@ set(GAMEENGINE_SRC
     Source/Common/System/Trig.cpp
     Source/Common/System/UnicodeString.cpp
     Source/Common/System/Upgrade.cpp
-#    Source/Common/System/Xfer.cpp
-#    Source/Common/System/XferCRC.cpp
-#    Source/Common/System/XferLoad.cpp
-#    Source/Common/System/XferSave.cpp
+#    Source/Common/System/Xfer.cpp
+#    Source/Common/System/XferCRC.cpp
+#    Source/Common/System/XferLoad.cpp
+#    Source/Common/System/XferSave.cpp
     Source/Common/TerrainTypes.cpp
     Source/Common/Thing/DrawModule.cpp
     Source/Common/Thing/Module.cpp
@@ -681,7 +689,7 @@ set(GAMEENGINE_SRC
     Source/Common/Thing/ThingTemplate.cpp
     Source/Common/UserPreferences.cpp
     Source/Common/version.cpp
-    Source/GameClient/ClientInstance.cpp
+    Source/GameClient/ClientInstance.cpp
     Source/GameClient/Color.cpp
     Source/GameClient/Credits.cpp
     Source/GameClient/Display.cpp
@@ -852,12 +860,15 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Behavior/BunkerBusterBehavior.cpp
     Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp
     Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
+    Source/GameLogic/Object/Behavior/FreeFallProjectileBehavior.cpp
     Source/GameLogic/Object/Behavior/FireWeaponWhenDamagedBehavior.cpp
     Source/GameLogic/Object/Behavior/FireWeaponWhenDeadBehavior.cpp
+    Source/GameLogic/Object/Behavior/DelayedUpgradeBehavior.cpp
     Source/GameLogic/Object/Behavior/FlightDeckBehavior.cpp
     Source/GameLogic/Object/Behavior/GenerateMinefieldBehavior.cpp
     Source/GameLogic/Object/Behavior/GrantStealthBehavior.cpp
     Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
+    Source/GameLogic/Object/Behavior/ChronoDeathBehavior.cpp
     Source/GameLogic/Object/Behavior/JetSlowDeathBehavior.cpp
     Source/GameLogic/Object/Behavior/MinefieldBehavior.cpp
     Source/GameLogic/Object/Behavior/NeutonBlastBehavior.cpp
@@ -948,6 +959,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp
     Source/GameLogic/Object/Helper/StatusDamageHelper.cpp
     Source/GameLogic/Object/Helper/SubdualDamageHelper.cpp
+    Source/GameLogic/Object/Helper/ChronoDamageHelper.cpp
     Source/GameLogic/Object/Helper/TempWeaponBonusHelper.cpp
     Source/GameLogic/Object/Locomotor.cpp
     Source/GameLogic/Object/Object.cpp
@@ -965,6 +977,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/SpecialPower/OCLSpecialPower.cpp
     Source/GameLogic/Object/SpecialPower/SpecialAbility.cpp
     Source/GameLogic/Object/SpecialPower/SpecialPowerModule.cpp
+    Source/GameLogic/Object/SpecialPower/UpgradeSpecialPower.cpp
     Source/GameLogic/Object/SpecialPower/SpyVisionSpecialPower.cpp
     Source/GameLogic/Object/Update/AIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/AssaultTransportAIUpdate.cpp
@@ -981,6 +994,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Update/AIUpdate/SupplyTruckAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/WanderAIUpdate.cpp
+    Source/GameLogic/Object/Update/AIUpdate/TeleporterAIUpdate.cpp
     Source/GameLogic/Object/Update/AIUpdate/WorkerAIUpdate.cpp
     Source/GameLogic/Object/Update/AnimationSteeringUpdate.cpp
     Source/GameLogic/Object/Update/AssistedTargetingUpdate.cpp
@@ -1035,6 +1049,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Update/ProneUpdate.cpp
     Source/GameLogic/Object/Update/RadarUpdate.cpp
     Source/GameLogic/Object/Update/RadiusDecalUpdate.cpp
+    Source/GameLogic/Object/Update/RadiusDecalBehavior.cpp
     Source/GameLogic/Object/Update/ScatterShotUpdate.cpp
     Source/GameLogic/Object/Update/SlavedUpdate.cpp
     Source/GameLogic/Object/Update/SmartBombTargetHomingUpdate.cpp
@@ -1059,6 +1074,7 @@ set(GAMEENGINE_SRC
     Source/GameLogic/Object/Upgrade/CommandSetUpgrade.cpp
     Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
     Source/GameLogic/Object/Upgrade/ProductionTimeModifierUpgrade.cpp
+    Source/GameLogic/Object/Upgrade/UnitProductionBonusUpgrade.cpp
     Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
     Source/GameLogic/Object/Upgrade/GrantScienceUpgrade.cpp
     Source/GameLogic/Object/Upgrade/LocomotorSetUpgrade.cpp
@@ -1167,12 +1183,12 @@ target_include_directories(z_gameengine PRIVATE
 )
 
 target_link_libraries(z_gameengine PRIVATE
-    corei_gameengine_private
+    corei_gameengine_private
     zi_always
 )
 
 target_link_libraries(z_gameengine PUBLIC
-    corei_gameengine_public
+    corei_gameengine_public
     z_wwvegas
 )
 

GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h

@@ -59,6 +59,9 @@ enum DisabledType CPP_11(: Int)
 	DISABLED_SCRIPT_DISABLED,
 	DISABLED_SCRIPT_UNDERPOWERED,
 
+	DISABLED_TELEPORT,    // Chrono Legionnaire after teleporting
+	DISABLED_CHRONO,    // Chrono Gun removal
+
 	DISABLED_COUNT,
 
 	DISABLED_ANY = 65535		///< Do not use this value for setting disabled types (read-only)

GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h

@@ -233,6 +233,11 @@ enum CommandSourceType CPP_11(: Int)
 	CMD_SYNC_TO_PRIMARY,  // This weapon can only be used when PRIMARY is fired
 	CMD_SYNC_TO_SECONDARY,  // This weapon can only be used when SECONDARY is fired
 	CMD_SYNC_TO_TERTIARY,  // This weapon can only be used when TERTIARY is fired
+	CMD_SYNC_TO_FOUR,  // This weapon can only be used when WEAPON_FOUR is fired
+	CMD_SYNC_TO_FIVE,  // ...
+	CMD_SYNC_TO_SIX,  // ...
+	CMD_SYNC_TO_SEVEN,  // ...
+	CMD_SYNC_TO_EIGHT,  // ...
 
 };		///< the source of a command
 

GeneralsMD/Code/GameEngine/Include/Common/GameType.h

@@ -175,6 +175,11 @@ enum WeaponSlotType CPP_11(: Int)
 	PRIMARY_WEAPON = 0,
 	SECONDARY_WEAPON,
 	TERTIARY_WEAPON,
+	WEAPON_FOUR,
+	WEAPON_FIVE,
+	WEAPON_SIX,
+	WEAPON_SEVEN,
+	WEAPON_EIGHT,
 
 	WEAPONSLOT_COUNT	// keep last
 };

GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h

@@ -51,6 +51,7 @@ class INI;
 class WeaponBonusSet;
 enum BodyDamageType CPP_11(: Int);
 enum AIDebugOptions CPP_11(: Int);
+typedef UnsignedInt DeathTypeFlags;
 //enum DrawableColorTint CPP_11(: Int);
 
 // PUBLIC /////////////////////////////////////////////////////////////////////////////////////////
@@ -527,6 +528,22 @@ class GlobalData : public SubsystemInterface
 
 	Bool m_useOldMoveSpeed;
 
+	Real m_chronoDamageDisableThreshold;
+	UnsignedInt m_chronoDamageHealRate;
+	Real m_chronoDamageHealAmount;
+
+	Real m_chronoDisableAlphaStart;
+	Real m_chronoDisableAlphaEnd;
+
+	// TintStatus m_chronoTintStatusType;
+	AsciiString m_chronoDisableParticleSystemLarge;
+	AsciiString m_chronoDisableParticleSystemMedium;
+	AsciiString m_chronoDisableParticleSystemSmall;
+
+	//AudioEventRTS m_chronoDisableSoundLoop;
+
+	DeathTypeFlags m_defaultExcludedDeathTypes;
+
 
 	// the trailing '\' is included!
   const AsciiString &getPath_UserData() const { return m_userDataDir; }

GeneralsMD/Code/GameEngine/Include/Common/INI.h

@@ -299,6 +299,7 @@ class INI
 	static void parseBitString32( INI *ini, void *instance, void *store, const void* userData );
 	static void parseByteSizedIndexList( INI *ini, void *instance, void *store, const void* userData );
 	static void parseIndexList( INI *ini, void *instance, void *store, const void* userData );
+	static void parseIndexListOrNone( INI *ini, void *instance, void *store, const void* userData );
 	static void parseLookupList( INI *ini, void *instance, void *store, const void* userData );
 	static void parseThingTemplate( INI *ini, void *instance, void *store, const void* userData );
 	static void parseArmorTemplate( INI *ini, void *instance, void *store, const void* userData );
@@ -319,6 +320,7 @@ class INI
 	static void parseAngularVelocityReal( INI *ini, void *instance, void *store, const void *userData );
 	static void parseDamageTypeFlags(INI* ini, void* instance, void* store, const void* userData);
 	static void parseDeathTypeFlags(INI* ini, void* instance, void* store, const void* userData);
+	static void parseDeathTypeFlagsList(INI* ini, void* instance, void* store, const void* userData);
 	static void parseVeterancyLevelFlags(INI* ini, void* instance, void* store, const void* userData);
 	static void parseSoundsList( INI* ini, void *instance, void *store, const void* /*userData*/ );
 

GeneralsMD/Code/GameEngine/Include/Common/KindOf.h

@@ -171,6 +171,40 @@ enum KindOfType CPP_11(: Int)
 	KINDOF_CONSERVATIVE_BUILDING,		///< Conservative structures aren't considered part of your base for sneak attack boundary calculations...
 	KINDOF_IGNORE_DOCKING_BONES,		///< Structure will not look up docking bones. Patch 1.03 hack.
 
+	// NEW KINDOFs
+
+	KINDOF_VTOL,
+	KINDOF_LARGE_AIRCRAFT,
+	KINDOF_MEDIUM_AIRCRAFT,
+	KINDOF_SMALL_AIRCRAFT,
+	KINDOF_ARTILLERY,
+	KINDOF_HEAVY_ARTILLERY,
+	KINDOF_ANTI_AIR,
+	KINDOF_SCOUT,
+	KINDOF_COMMANDO,
+	KINDOF_HEAVY_INFANTRY,
+	KINDOF_SUPERHEAVY_VEHICLE,
+
+	KINDOF_TELEPORTER,
+
+	KINDOF_EXTRA1,
+	KINDOF_EXTRA2,
+	KINDOF_EXTRA3,
+	KINDOF_EXTRA4,
+	KINDOF_EXTRA5,
+	KINDOF_EXTRA6,
+	KINDOF_EXTRA7,
+	KINDOF_EXTRA8,
+	KINDOF_EXTRA9,
+	KINDOF_EXTRA10,
+	KINDOF_EXTRA11,
+	KINDOF_EXTRA12,
+	KINDOF_EXTRA13,
+	KINDOF_EXTRA14,
+	KINDOF_EXTRA15,
+	KINDOF_EXTRA16,
+
+
 	KINDOF_COUNT										// total number of kindofs
 
 }; 

GeneralsMD/Code/GameEngine/Include/Common/MiscAudio.h

@@ -72,6 +72,7 @@ struct MiscAudio
 	AudioEventRTS m_sabotageShutDownBuilding;											///< When Saboteur hits a building 
 	AudioEventRTS m_sabotageResetTimerBuilding;											///< When Saboteur hits a building 
 	AudioEventRTS m_aircraftWheelScreech;									///< When a jet lands on a runway.
+	AudioEventRTS m_chronoDisabledSoundLoop;									///< When a unit is being disabled/deleted by a chrono gun
 };
 
 

GeneralsMD/Code/GameEngine/Include/Common/ModelState.h

@@ -248,6 +248,44 @@ enum ModelConditionFlagType CPP_11(: Int)
 	// MODELCONDITION_WEAPONSET_GARRISONED,  // somewhat obsolote since we are usually not visible when contained.
 
 
+    // New Weaponslots (4 to 8 -- D to H)
+	MODELCONDITION_PREATTACK_D,
+	MODELCONDITION_FIRING_D,
+	MODELCONDITION_BETWEEN_FIRING_SHOTS_D,
+	MODELCONDITION_RELOADING_D,
+    MODELCONDITION_USING_WEAPON_D,
+
+	MODELCONDITION_PREATTACK_E,
+	MODELCONDITION_FIRING_E,
+	MODELCONDITION_BETWEEN_FIRING_SHOTS_E,
+	MODELCONDITION_RELOADING_E,
+	MODELCONDITION_USING_WEAPON_E,
+
+	MODELCONDITION_PREATTACK_F,
+	MODELCONDITION_FIRING_F,
+	MODELCONDITION_BETWEEN_FIRING_SHOTS_F,
+	MODELCONDITION_RELOADING_F,
+	MODELCONDITION_USING_WEAPON_F,
+
+	MODELCONDITION_PREATTACK_G,
+	MODELCONDITION_FIRING_G,
+	MODELCONDITION_BETWEEN_FIRING_SHOTS_G,
+	MODELCONDITION_RELOADING_G,
+	MODELCONDITION_USING_WEAPON_G,
+
+	MODELCONDITION_PREATTACK_H,
+	MODELCONDITION_FIRING_H,
+	MODELCONDITION_BETWEEN_FIRING_SHOTS_H,
+	MODELCONDITION_RELOADING_H,
+	MODELCONDITION_USING_WEAPON_H,
+
+	// VTOL
+	MODELCONDITION_TAKEOFF,
+	MODELCONDITION_LANDING,
+
+	// Teleporter / Chrono Legionnaire
+	MODELCONDITION_TELEPORT_RECOVER,
+
 //
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!