September 24th Hotfix
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
parent
fd05be35c1
commit
7d496e8a63
40 changed files with 226 additions and 264 deletions
|
|
@ -1899,15 +1899,24 @@ void AircraftClass::Enter_Idle_Mode(bool )
|
|||
} else {
|
||||
|
||||
/*
|
||||
** Normal aircraft try to find a good landing spot to rest.
|
||||
** Continue with the current helipad if there is one.
|
||||
*/
|
||||
BuildingClass * building = Find_Docking_Bay(STRUCT_HELIPAD, false);
|
||||
Assign_Destination(TARGET_NONE);
|
||||
if (building && Transmit_Message(RADIO_HELLO, building) == RADIO_ROGER) {
|
||||
mission = MISSION_ENTER;
|
||||
if (!In_Radio_Contact() ||
|
||||
Contact_With_Whom()->What_Am_I() != RTTI_BUILDING ||
|
||||
*((BuildingClass*)Contact_With_Whom()) != STRUCT_HELIPAD) {
|
||||
/*
|
||||
** Normal aircraft try to find a good landing spot to rest.
|
||||
*/
|
||||
BuildingClass * building = Find_Docking_Bay(STRUCT_HELIPAD, false);
|
||||
Assign_Destination(TARGET_NONE);
|
||||
if (building && Transmit_Message(RADIO_HELLO, building) == RADIO_ROGER) {
|
||||
mission = MISSION_ENTER;
|
||||
} else {
|
||||
Assign_Destination(Good_LZ());
|
||||
mission = MISSION_MOVE;
|
||||
}
|
||||
} else {
|
||||
Assign_Destination(Good_LZ());
|
||||
mission = MISSION_MOVE;
|
||||
mission = MISSION_ENTER;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -637,7 +637,7 @@ AnimClass::AnimClass(AnimType animnum, COORDINATE coord, unsigned char timedelay
|
|||
** Check for a virtual animation
|
||||
*/
|
||||
if (Class->VirtualAnim != ANIM_NONE) {
|
||||
VirtualAnim = new AnimClass(Class->VirtualAnim, 0, timedelay, loop, alt);
|
||||
VirtualAnim = new AnimClass(Class->VirtualAnim, Coord, timedelay, loop, alt);
|
||||
if (VirtualAnim != NULL) {
|
||||
VirtualAnim->Make_Invisible();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3879,9 +3879,6 @@ bool BuildingClass::Can_Capture(void) const
|
|||
if (!House->IsHuman && Trigger != NULL && Trigger->Action == TriggerClass::ACTION_WINLOSE) {
|
||||
can_capture = true;
|
||||
}
|
||||
} else {
|
||||
// Only allow capturing of multiplayer-owned structures
|
||||
can_capture &= House->Class->House >= HOUSE_MULTI1 && House->Class->House <= HOUSE_MULTI6;
|
||||
}
|
||||
|
||||
return(can_capture);
|
||||
|
|
|
|||
|
|
@ -428,7 +428,7 @@ dxisbig:
|
|||
#if (0)
|
||||
|
||||
/*
|
||||
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/TIBERIANDAWN/MiscAsm.cpp#131 $
|
||||
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/TIBERIANDAWN/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 **
|
||||
;***************************************************************************
|
||||
|
|
|
|||
|
|
@ -396,20 +396,6 @@ void UnitClass::AI(void)
|
|||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
** Clear the unload refinery if not haresting or entering a refinery.
|
||||
*/
|
||||
if (Class->IsToHarvest) {
|
||||
if (Mission != MISSION_HARVEST) {
|
||||
if (Mission != MISSION_ENTER ||
|
||||
!In_Radio_Contact() ||
|
||||
Contact_With_Whom()->What_Am_I() != RTTI_BUILDING ||
|
||||
*((BuildingClass*)Contact_With_Whom()) != STRUCT_REFINERY) {
|
||||
TiberiumUnloadRefinery = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
** Rocket launchers will reload every so often.
|
||||
*/
|
||||
|
|
@ -763,6 +749,22 @@ RadioMessageType UnitClass::Receive_Message(RadioClass * from, RadioMessageType
|
|||
}
|
||||
break;
|
||||
|
||||
/*
|
||||
** Something bad has happened to the object in contact with. Abort any coordinated
|
||||
** activity with this object. Basically, ... run away! Run away!
|
||||
*/
|
||||
case RADIO_RUN_AWAY:
|
||||
if (Class->IsToHarvest && In_Radio_Contact() && Mission == MISSION_ENTER) {
|
||||
TechnoClass * contact = Contact_With_Whom();
|
||||
if (contact->What_Am_I() == RTTI_BUILDING && *((BuildingClass*)contact) == STRUCT_REFINERY) {
|
||||
// Slight hack; set a target so the harvest mission knows to skip to finding home state
|
||||
Assign_Mission(MISSION_HARVEST);
|
||||
TarCom = As_Target();
|
||||
return(RADIO_ROGER);
|
||||
}
|
||||
}
|
||||
return(DriveClass::Receive_Message(from, message, param));
|
||||
|
||||
/*
|
||||
** When this message is received, it means that the other object
|
||||
** has already turned its radio off. Turn this radio off as well.
|
||||
|
|
@ -2418,93 +2420,26 @@ bool UnitClass::Goto_Tiberium(void)
|
|||
}
|
||||
|
||||
|
||||
struct RefineryData
|
||||
{
|
||||
BuildingClass* Refinery;
|
||||
int Distance;
|
||||
int Harvesters;
|
||||
};
|
||||
|
||||
static bool operator==(const RefineryData& lhs, const RefineryData& rhs)
|
||||
{
|
||||
return lhs.Refinery == rhs.Refinery;
|
||||
}
|
||||
|
||||
static bool operator!=(const RefineryData& lhs, const RefineryData& rhs)
|
||||
{
|
||||
return !(lhs == rhs);
|
||||
}
|
||||
|
||||
static int _refinery_compare(const void * left, const void * right)
|
||||
{
|
||||
const RefineryData& lhs = *reinterpret_cast<const RefineryData*>(left);
|
||||
const RefineryData& rhs = *reinterpret_cast<const RefineryData*>(right);
|
||||
if (lhs.Distance < rhs.Distance) {
|
||||
return -1;
|
||||
} else if (rhs.Distance < lhs.Distance) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
BuildingClass* UnitClass::Find_Best_Refinery(void) const
|
||||
{
|
||||
static DynamicVectorClass<RefineryData> _refineries;
|
||||
|
||||
_refineries.Clear();
|
||||
for (int i = 0; i < Buildings.Count(); ++i) {
|
||||
BuildingClass* refinery = Buildings.Ptr(i);
|
||||
if (refinery != NULL &&
|
||||
refinery->House == House &&
|
||||
!refinery->IsInLimbo &&
|
||||
*refinery == STRUCT_REFINERY) {
|
||||
_refineries.Add(RefineryData{ refinery, Distance(refinery), 0 });
|
||||
/*
|
||||
** Remember our last refinery and prefer that one, if still available and valid.
|
||||
*/
|
||||
if (TiberiumUnloadRefinery != NULL) {
|
||||
if (TiberiumUnloadRefinery->House == House &&
|
||||
!TiberiumUnloadRefinery->IsInLimbo &&
|
||||
TiberiumUnloadRefinery->Mission != MISSION_DECONSTRUCTION &&
|
||||
*TiberiumUnloadRefinery == STRUCT_REFINERY) {
|
||||
return TiberiumUnloadRefinery;
|
||||
} else {
|
||||
TiberiumUnloadRefinery = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
// Base case for zero or one refineries.
|
||||
if (_refineries.Count() == 0) {
|
||||
return NULL;
|
||||
} else if (_refineries.Count() == 1) {
|
||||
return _refineries[0].Refinery;
|
||||
}
|
||||
|
||||
// Count harvesters going to each refinery as well as the total.
|
||||
int num_harvesters = 0;
|
||||
for (int i = 0; i < Units.Count(); ++i) {
|
||||
UnitClass* unit = Units.Ptr(i);
|
||||
if (unit->IsActive && unit->Class->IsToHarvest && unit->House == House) {
|
||||
BuildingClass* refinery = unit->Tiberium_Unload_Refinery();
|
||||
if (refinery != NULL) {
|
||||
int index = _refineries.ID(RefineryData{ refinery });
|
||||
assert(index >= 0);
|
||||
_refineries[index].Harvesters++;
|
||||
num_harvesters++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort by distance (special case for 2 refineries as that's a single swap).
|
||||
if (_refineries.Count() == 2) {
|
||||
if (_refineries[0].Distance > _refineries[1].Distance) {
|
||||
RefineryData temp = _refineries[0];
|
||||
_refineries[0] = _refineries[1];
|
||||
_refineries[1] = temp;
|
||||
}
|
||||
} else {
|
||||
qsort(&_refineries[0], _refineries.Count(), sizeof(RefineryData), _refinery_compare);
|
||||
}
|
||||
|
||||
// Evenly distribute harvesters among refineries.
|
||||
int harvesters_per_refinery = (num_harvesters + _refineries.Count() - 1) / _refineries.Count();
|
||||
for (int i = 0; i < _refineries.Count(); ++i) {
|
||||
if (_refineries[i].Harvesters < harvesters_per_refinery) {
|
||||
return _refineries[i].Refinery;
|
||||
}
|
||||
}
|
||||
|
||||
// Fall back on closest refinery
|
||||
return _refineries[0].Refinery;
|
||||
/*
|
||||
** Find nearby refinery and head to it?
|
||||
*/
|
||||
return Find_Docking_Bay(STRUCT_REFINERY, false);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -2800,10 +2735,7 @@ int UnitClass::Mission_Harvest(void)
|
|||
Assign_Target(TARGET_NONE);
|
||||
Status = FINDHOME;
|
||||
return(1);
|
||||
}
|
||||
|
||||
TiberiumUnloadRefinery = NULL;
|
||||
if (Goto_Tiberium()) {
|
||||
} else if (Goto_Tiberium()) {
|
||||
IsHarvesting = true;
|
||||
Set_Rate(2);
|
||||
Set_Stage(0);
|
||||
|
|
@ -2865,14 +2797,21 @@ int UnitClass::Mission_Harvest(void)
|
|||
if (!Target_Legal(NavCom)) {
|
||||
|
||||
/*
|
||||
** Find nearby refinery and head to it.
|
||||
** Find best refinery.
|
||||
*/
|
||||
BuildingClass * nearest = Find_Best_Refinery();
|
||||
if (nearest) {
|
||||
TiberiumUnloadRefinery = nearest;
|
||||
if (Transmit_Message(RADIO_HELLO, nearest) == RADIO_ROGER) {
|
||||
Status = HEADINGHOME;
|
||||
} else {
|
||||
|
||||
/*
|
||||
** Since the refinery said it was ok to load, establish radio
|
||||
** contact with the refinery and then await docking orders.
|
||||
*/
|
||||
if (nearest && Transmit_Message(RADIO_HELLO, nearest) == RADIO_ROGER) {
|
||||
Status = HEADINGHOME;
|
||||
} else {
|
||||
ScenarioInit++;
|
||||
nearest = Find_Best_Refinery();
|
||||
ScenarioInit--;
|
||||
if (nearest) {
|
||||
Assign_Destination(::As_Target(nearest->Nearby_Location(this)));
|
||||
}
|
||||
}
|
||||
|
|
@ -2889,7 +2828,6 @@ int UnitClass::Mission_Harvest(void)
|
|||
return(1);
|
||||
|
||||
case GOINGTOIDLE:
|
||||
TiberiumUnloadRefinery = NULL;
|
||||
Assign_Mission(MISSION_GUARD);
|
||||
break;
|
||||
|
||||
|
|
@ -2968,6 +2906,28 @@ int UnitClass::Mission_Hunt(void)
|
|||
}
|
||||
|
||||
|
||||
int UnitClass::Mission_Enter(void)
|
||||
{
|
||||
Validate();
|
||||
if (Class->IsToHarvest) {
|
||||
TechnoClass * contact = Contact_With_Whom();
|
||||
if (contact == NULL) {
|
||||
contact = As_Techno(ArchiveTarget);
|
||||
}
|
||||
if (contact == NULL) {
|
||||
contact = As_Techno(NavCom);
|
||||
}
|
||||
if (contact != NULL &&
|
||||
contact->What_Am_I() == RTTI_BUILDING &&
|
||||
*((BuildingClass*)contact) == STRUCT_REFINERY) {
|
||||
TiberiumUnloadRefinery = (BuildingClass*)contact;
|
||||
}
|
||||
}
|
||||
|
||||
return(TarComClass::Mission_Enter());
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************************************
|
||||
* UnitClass::Look -- Perform map revelation from a unit's position. *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -84,8 +84,7 @@ class UnitClass : public TarComClass
|
|||
bool Harvesting(void);
|
||||
void APC_Close_Door(void);
|
||||
void APC_Open_Door(void);
|
||||
BuildingClass* Tiberium_Unload_Refinery(void) const {return TiberiumUnloadRefinery;}
|
||||
BuildingClass* Find_Best_Refinery(void) const;
|
||||
virtual BuildingClass* Find_Best_Refinery(void) const;
|
||||
|
||||
/*
|
||||
** Query functions.
|
||||
|
|
@ -158,6 +157,7 @@ class UnitClass : public TarComClass
|
|||
virtual int Mission_Guard(void);
|
||||
virtual int Mission_Harvest(void);
|
||||
virtual int Mission_Hunt(void);
|
||||
virtual int Mission_Enter(void);
|
||||
virtual int UnitClass::Mission_Move(void);
|
||||
virtual FireErrorType Can_Fire(TARGET, int which) const;
|
||||
|
||||
|
|
@ -204,7 +204,7 @@ class UnitClass : public TarComClass
|
|||
/*
|
||||
** This is the refinery a harvester is interested in unloading at.
|
||||
*/
|
||||
BuildingClass* TiberiumUnloadRefinery;
|
||||
mutable BuildingClass* TiberiumUnloadRefinery;
|
||||
|
||||
/*
|
||||
** Some additional padding in case we need to add data to the class and maintain backwards compatibility for save/load
|
||||
|
|
|
|||
|
|
@ -4841,7 +4841,7 @@ extern "C" int __cdecl Confine_Rect ( int * x , int * y , int w , int h , int wi
|
|||
|
||||
|
||||
/*
|
||||
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/TIBERIANDAWN/WIN32LIB/DrawMisc.cpp#131 $
|
||||
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/TIBERIANDAWN/WIN32LIB/DrawMisc.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 **
|
||||
;***************************************************************************
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ int __cdecl Desired_Facing8(long x1, long y1, long x2, long y2);
|
|||
|
||||
|
||||
/*
|
||||
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/TIBERIANDAWN/WIN32LIB/FACINGFF.h#131 $
|
||||
; $Header: //depot/Projects/Mobius/QA/Project/Run/SOURCECODE/TIBERIANDAWN/WIN32LIB/FACINGFF.h#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 **
|
||||
;***************************************************************************
|
||||
|
|
|
|||
Reference in a new issue