From: <geo...@us...> - 2012-10-31 01:36:27
|
Revision: 5358 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5358&view=rev Author: geoffthemedio Date: 2012-10-31 01:36:21 +0000 (Wed, 31 Oct 2012) Log Message: ----------- Added PopulationCenter conditions to the scope of many building effects, to avoid many errors in logs about objects being targeted that didn't have populations to reference in the applied effects. Modified Paths: -------------- trunk/FreeOrion/default/buildings.txt Modified: trunk/FreeOrion/default/buildings.txt =================================================================== --- trunk/FreeOrion/default/buildings.txt 2012-10-30 15:53:15 UTC (rev 5357) +++ trunk/FreeOrion/default/buildings.txt 2012-10-31 01:36:21 UTC (rev 5358) @@ -22,7 +22,7 @@ EffectsGroup // These bonuses given to anyone scope = And [ - Planet + PopulationCenter OwnedBy TheEmpire Source.Owner Contains Source [[STANDARD_CONDITION_POP]] @@ -432,6 +432,7 @@ effectsgroups = [ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source Focus "FOCUS_INDUSTRY" @@ -446,6 +447,7 @@ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source Focus "FOCUS_INDUSTRY" @@ -460,6 +462,7 @@ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source Focus "FOCUS_INDUSTRY" @@ -474,6 +477,7 @@ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source Focus "FOCUS_INDUSTRY" @@ -488,6 +492,7 @@ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source Focus "FOCUS_INDUSTRY" @@ -499,6 +504,7 @@ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source Focus "FOCUS_INDUSTRY" @@ -736,6 +742,7 @@ effectsgroups = [ EffectsGroup scope = And [ + PopulationCenter Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source @@ -747,6 +754,7 @@ EffectsGroup scope = And [ + PopulationCenter Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source @@ -782,6 +790,7 @@ effectsgroups = [ EffectsGroup scope = And [ + PopulationCenter ContainedBy Contains Source Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner @@ -794,6 +803,7 @@ EffectsGroup scope = And [ + PopulationCenter ContainedBy Contains Source Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner @@ -806,6 +816,7 @@ EffectsGroup scope = And [ + PopulationCenter ContainedBy Contains Source Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner @@ -825,6 +836,7 @@ EffectsGroup scope = And [ + PopulationCenter ContainedBy Contains Source Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner @@ -844,6 +856,7 @@ EffectsGroup scope = And [ + PopulationCenter ContainedBy Contains Source Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner @@ -863,6 +876,7 @@ EffectsGroup scope = And [ + PopulationCenter ContainedBy Contains Source Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner @@ -1003,7 +1017,10 @@ ] effectsgroups = [ EffectsGroup - scope = Contains Source + scope = And [ + Contains Source + PopulationCenter + ] activation = ContainedBy And [ OwnedBy TheEmpire Source.Owner PopulationCenter @@ -1035,6 +1052,7 @@ effectsgroups = [ EffectsGroup scope = And [ + PopulationCenter Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source @@ -1046,6 +1064,7 @@ EffectsGroup scope = And [ + PopulationCenter Focus "FOCUS_INDUSTRY" OwnedBy TheEmpire Source.Owner ResourceSupplyConnected Source.Owner Source @@ -1204,6 +1223,7 @@ effectsgroups = [ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner Focus "FOCUS_RESEARCH" [[POP_CONDITION_INFRA]] @@ -1214,6 +1234,7 @@ EffectsGroup scope = And [ + PopulationCenter OwnedBy TheEmpire Source.Owner Focus "FOCUS_RESEARCH" [[POP_CONDITION_POP]] @@ -1527,7 +1548,10 @@ effects = SetPopulation Value + 2 EffectsGroup - scope = Contains Source + scope = And [ + Contains Source + PopulationCenter + ] activation = ContainedBy And [ OwnedBy TheEmpire Source.Owner PopulationCenter |