Revert "Merge branch 'develop-test' into fryone/owner_changer"

This reverts commit 4e73b03, reversing
changes made to f00d0e6.

Author: Fryone

CREDITS.md

@@ -284,9 +284,6 @@ This page lists all the individual contributions to the project by their author.
   - Vehicle voxel turret shadows & body multi-section shadows
 - **Fryone**
   - Customizable ElectricBolt Arcs
-  - Sound entry on unit's creation
-  - Offline power plant indicator
-  - Auto-deploy/DeployBlock on ammo change
   - Change target Owner on warhead impact
 - **Ares developers**
   - YRpp and Syringe which are used, save/load, project foundation and generally useful code from Ares

Phobos.vcxproj

@@ -78,7 +78,6 @@
     <ClCompile Include="src\Ext\House\Body.cpp" />
     <ClCompile Include="src\Ext\House\Hooks.cpp" />
     <ClCompile Include="src\Ext\House\Hooks.AINavalProduction.cpp" />
-    <ClCompile Include="src\Ext\House\Hooks.UnitFromFactory.cpp" />
     <ClCompile Include="src\Ext\RadSite\Body.cpp" />
     <ClCompile Include="src\Ext\RadSite\Hooks.cpp" />
     <ClCompile Include="src\Ext\Scenario\Body.cpp" />
@@ -114,7 +113,6 @@
     <ClCompile Include="src\Ext\Unit\Hooks.DeployFire.cpp" />
     <ClCompile Include="src\Ext\Unit\Hooks.DisallowMoving.cpp" />
     <ClCompile Include="src\Ext\Unit\Hooks.Jumpjet.cpp" />
-    <ClCompile Include="src\Ext\Unit\Hooks.Unload.cpp" />
     <ClCompile Include="src\Ext\WarheadType\Detonate.cpp" />
     <ClCompile Include="src\Ext\Tiberium\Body.cpp" />
     <ClCompile Include="src\Ext\Tiberium\Hooks.cpp" />

docs/Fixed-or-Improved-Logics.md

@@ -275,22 +275,6 @@ In `rulesmd.ini`:
 SellBuildupLength=23  ; integer, number of buildup frames to play
 ```
 
-### Offline power plant indicator
-
-- If `DrawPowerOffline` is set, `POWEROFF.SHP` indicator will appear on power plants when being infiltrated or drained.
-- `DrawPowerOffline.Offset` is used to vertically adjust position of indicator.
-- `DisablePowerOfflineIcon` is used to disable indicator per building type.
-
-In `rulesmd.ini`:
-```ini
-[AudioVisual]
-DrawPowerOffline=false          ; boolean
-DrawPowerOffline.Offset=0       ; integer, vertical offset,
-
-[SOMEBUILDING]
-DisablePowerOfflineIcon=false   ; boolean
-```
-
 ## Projectiles
 
 ### Cluster scatter distance customization
@@ -522,7 +506,6 @@ In `rulesmd.ini`:
 [SOMETECHNO]    ; TechnoType
 JumpjetRotateOnCrash=true  ; boolean
 ```
-
 ```{warning}
 This may subject to further changes.
 ```
@@ -742,33 +725,6 @@ In `artmd.ini`:
 TurretShadow=   ; boolean
 ```
 
-### IsSimpleDeployer vehicle auto-deploy / deploy block on ammo change
-
-- `Ammo.AutoDeployAmount` determines amount of ammo, that converts/deploys vehicle automatically.
-- `Ammo.DeployUnlockAmount` determines amount of ammo, that allows vehicle converting/deploying command.
-
-In `rulesmd.ini`:
-```ini
-[SOMEVEHICLE]                          ; VehicleType
-Ammo.DeployUnlockAmount=-1      ; integer, unit will be allowed to undeploy only if it has at least this much ammo
-Ammo.AutoDeployAmount=-1        ; integer, unit will automatically deploy after running out of ammo
-```
-
-```{warning}
-`Ammo.AutoDeployAmount` feature requires `Convert.Deploy` from [Ares’ Type Conversion](https://ares-developers.github.io/Ares-docs/new/typeconversion.html) to change type. Unit without it will constantly use deploy command on self until ammo is changed.
-```
-
-### IsSimpleDeployer vehicle ammo change on deploy
-
-- `Ammo.AddOnDeploy` determines amount of ammo, added or extracted, if negative, on deploy.
-
-In `rulesmd.ini`:
-```ini
-[SOMEVEHICLE]                          ; VehicleType
-Ammo.AddOnDeploy=0      ; integer, unit will receive or lose this amount of ammo on deploy
-```
-
-
 ## VoxelAnims
 
 ### Customizable debris & meteor impact and warhead detonation behaviour

docs/New-or-Enhanced-Logics.md

@@ -928,20 +928,6 @@ EVA.Sold=       ; EVA entry
 SellSound=      ; sound entry
 ```
 
-### Sound entry on unit's creation
-
-- When a unit is created, sound specified in `VoiceCreated` will be played for the unit owner.
-- If `IsVoiceCreatedGlobal` is set to true, `VoiceCreated` will be played globally instead of `EVA_UnitReady`.
-
-In `rulesmd.ini`:
-```ini
-[AudioVisual]
-IsVoiceCreatedGlobal=false   ; boolean
-
-[SOMETECHNO]                 ; UnitType
-VoiceCreated=SOMEVOICEENTRY  ; sound entry
-```
-
 ## Terrain
 
 ### Destroy animation & sound

docs/Whats-New.md

@@ -320,18 +320,13 @@ New:
 - Vehicle voxel turret shadows & body multi-section shadows (by TwinkleStar)
 - Crushing tilt and slowdown customization (by Starkku)
 - Extra warhead detonations on weapon (by Starkku)
+- Customizable ElectricBolt Arcs (by Fryone, Kerbiter)
 - Chrono sparkle animation display customization and improvements (by Starkku)
 - Script action to Chronoshift teams to enemy base (by Starkku)
-- Customizable ElectricBolt Arcs (by Fryone, Kerbiter)
 - Digital display of HP and SP (by ststl, FlyStar, Saigyouji, JunJacobYoung)
 - PipScale pip size & ammo pip frame customization (by Starkku)
 - `AltPalette` lighting toggle (by Starkku)
 - Change target Owner on warhead impact (by Fryone)
-- Added sound entry on unit's creation (by Fryone)
-- Additional sync logging in case of desync errors occuring (by Starkku)
-- Offline power plant indicator (by Fryone)
-- Auto-deploy/DeployBlock on ammo change (by Fryone)
-
 
 Vanilla fixes:
 - Allow AI to repair structures built from base nodes/trigger action 125/SW delivery in single player missions (by Trsdy)

src/Ext/Building/Hooks.cpp

@@ -430,58 +430,3 @@ DEFINE_HOOK(0x4511D6, BuildingClass_AnimationAI_SellBuildup, 0x7)
 
 	return pTypeExt->SellBuildupLength == pThis->Animation.Value ? Continue : Skip;
 }
-
-//Addition to Ares' Extras
-DEFINE_HOOK(0x6F5347, TechnoClass_DrawExtras_OfflinePlants, 0x7)
-{
-	GET(TechnoClass*, pThis, EBP);
-	GET_STACK(RectangleStruct*, pRect, 0xA0);
-
-	if(auto pBld = abstract_cast<BuildingClass*>(pThis))
-	{
-		bool drawPowOffline = RulesExt::Global()->DrawPowerOffline;
-		if(!drawPowOffline)
-		{
-			R->ESI(pRect);
-			return 0x6F534E;
-		}
-
-		const auto pBldExt = BuildingTypeExt::ExtMap.Find(pBld->Type);
-		bool showLowPower = FileSystem::POWEROFF_SHP
-			&& (pBld->Type->PowerBonus > 0)
-			&& (pBld->Factory == nullptr)
-			&& (pBld->IsPowerOnline() == false || pBld->IsBeingDrained())
-			&& (pBld->IsBeingWarpedOut() == false)
-			&& (pBld->WarpingOut == false)
-			&& (pBldExt->DisablePowerOfflineIcon == false)
-			&& ((pBld->GetCurrentMission() != Mission::Selling) && (pBld->GetCurrentMission() != Mission::Construction))
-			&& (pBld->CloakState == CloakState::Uncloaked);
-
-		if(showLowPower) {
-			auto cell = pBld->GetMapCoords();
-
-			if(!MapClass::Instance->GetCellAt(cell)->IsShrouded()) {
-				auto crd = pBld->GetRenderCoords();
-
-				Point2D nPoint;
-				TacticalClass::Instance->CoordsToClient(crd, &nPoint);
-
-				Point2D ptPower = nPoint;
-
-				ptPower.Y += 22; //wrench offset
-				ptPower.Y -= RulesExt::Global()->DrawPowerOffline_Offset;
-
-				int speed = GameOptionsClass::Instance->GetAnimSpeed(14) / 4;
-				if(speed < 2) {
-					speed = 2;
-				}
-
-				int frame = (FileSystem::POWEROFF_SHP->Frames * (Unsorted::CurrentFrame % speed)) / speed;
-				DSurface::Temp->DrawSHP(FileSystem::MOUSE_PAL, FileSystem::POWEROFF_SHP, frame, &ptPower, pRect, BlitterFlags(0xE00), 0, 0, ZGradient::Ground, 1000, 0, 0, 0, 0, 0);
-
-			}
-		}
-	}
-	R->ESI(pRect);
-	return 0x6F534E;
-}

src/Ext/BuildingType/Body.cpp

@@ -146,7 +146,6 @@ void BuildingTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI)
 
 	this->ConsideredVehicle.Read(exINI, pSection, "ConsideredVehicle");
 	this->SellBuildupLength.Read(exINI, pSection, "SellBuildupLength");
-	this->DisablePowerOfflineIcon.Read(exINI, pSection, "DisablePowerOfflineIcon");
 
 	// Ares tag
 	this->SpyEffect_Custom.Read(exINI, pSection, "SpyEffect.Custom");
@@ -234,7 +233,6 @@ void BuildingTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->ConsideredVehicle)
 		.Process(this->ZShapePointMove_OnBuildup)
 		.Process(this->SellBuildupLength)
-		.Process(this->DisablePowerOfflineIcon)
 		;
 }
 

src/Ext/BuildingType/Body.h

@@ -60,7 +60,6 @@ class BuildingTypeExt
 		Nullable<bool> ConsideredVehicle;
 		Valueable<bool> ZShapePointMove_OnBuildup;
 		Valueable<int> SellBuildupLength;
-		Valueable<bool> DisablePowerOfflineIcon;
 
 		ExtData(BuildingTypeClass* OwnerObject) : Extension<BuildingTypeClass>(OwnerObject)
 			, PowersUp_Owner { AffectedHouse::Owner }
@@ -97,7 +96,6 @@ class BuildingTypeExt
 			, ConsideredVehicle {}
 			, ZShapePointMove_OnBuildup { false }
 			, SellBuildupLength { 23 }
-			, DisablePowerOfflineIcon { false }
 		{ }
 
 		// Ares 0.A functions

src/Ext/House/Hooks.UnitFromFactory.cpp

@@ -105,9 +105,6 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	this->DrawTurretShadow.Read(exINI, GameStrings::AudioVisual, "DrawTurretShadow");
 	this->AnimRemapDefaultColorScheme.Read(exINI, GameStrings::AudioVisual, "AnimRemapDefaultColorScheme");
 
-	this->DrawPowerOffline.Read(exINI, GameStrings::AudioVisual, "DrawPowerOffline");
-	this->DrawPowerOffline_Offset.Read(exINI, GameStrings::AudioVisual, "DrawPowerOffline.Offset");
-
 	this->AllowParallelAIQueues.Read(exINI, "GlobalControls", "AllowParallelAIQueues");
 	this->ForbidParallelAIQueues_Aircraft.Read(exINI, "GlobalControls", "ForbidParallelAIQueues.Infantry");
 	this->ForbidParallelAIQueues_Building.Read(exINI, "GlobalControls", "ForbidParallelAIQueues.Building");
@@ -132,8 +129,6 @@ void RulesExt::ExtData::LoadBeforeTypeData(RulesClass* pThis, CCINIClass* pINI)
 	this->Vehicles_DefaultDigitalDisplayTypes.Read(exINI, GameStrings::AudioVisual, "Vehicles.DefaultDigitalDisplayTypes");
 	this->Aircraft_DefaultDigitalDisplayTypes.Read(exINI, GameStrings::AudioVisual, "Aircraft.DefaultDigitalDisplayTypes");
 
-	this->IsVoiceCreatedGlobal.Read(exINI, GameStrings::AudioVisual, "IsVoiceCreatedGlobal");
-
 	// Section AITargetTypes
 	int itemsCount = pINI->GetKeyCount(sectionAITargetTypes);
 	for (int i = 0; i < itemsCount; ++i)
@@ -254,13 +249,10 @@ void RulesExt::ExtData::Serialize(T& Stm)
 		.Process(this->RadialIndicatorVisibility)
 		.Process(this->DrawTurretShadow)
 		.Process(this->AnimRemapDefaultColorScheme)
-		.Process(this->DrawPowerOffline)
-		.Process(this->DrawPowerOffline_Offset)
 		.Process(this->Buildings_DefaultDigitalDisplayTypes)
 		.Process(this->Infantry_DefaultDigitalDisplayTypes)
 		.Process(this->Vehicles_DefaultDigitalDisplayTypes)
 		.Process(this->Aircraft_DefaultDigitalDisplayTypes)
-		.Process(this->IsVoiceCreatedGlobal)
 		;
 }