From: <ele...@us...> - 2012-11-27 18:09:52
|
Revision: 5470 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5470&view=rev Author: eleazzaar Date: 2012-11-27 18:09:40 +0000 (Tue, 27 Nov 2012) Log Message: ----------- ~ Major Redo of Ground Troops: ~ ~ Protection focus now increases max troops to 200% ~ ~ Species Bonus/Malus is now multiplied ~ ~ Native planets and homeworlds now have a bonus to troops ~ ~ Outposts have weaker defenses ~ ~ Increased cost of Garrison Techs, and decreased capacity of Troop Pods Modified Paths: -------------- trunk/FreeOrion/changelog.txt trunk/FreeOrion/default/buildings.txt trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/default/ship_parts.txt trunk/FreeOrion/default/specials.txt trunk/FreeOrion/default/species.txt trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/troops.png Modified: trunk/FreeOrion/changelog.txt =================================================================== --- trunk/FreeOrion/changelog.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/changelog.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -37,6 +37,12 @@ ~ ~ Strengthened Egassem with Ultimate Industry ~ ~ Strengthened Laenfa with Average Industry ~ ~ Strengthened Gyisache with Great Research + ~ Major Redo of Ground Troops: + ~ ~ Protection focus now increases max troops to 200% + ~ ~ Species Bonus/Malus is now multiplied + ~ ~ Native planets and homeworlds now have a bonus to troops + ~ ~ Outposts have weaker defenses + ~ ~ Increased cost of Garrison Techs, and decreased capacity of Troop Pods Content: ~ More Game Concepts 'pedia entries. Modified: trunk/FreeOrion/default/buildings.txt =================================================================== --- trunk/FreeOrion/default/buildings.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/default/buildings.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -88,14 +88,6 @@ SetTargetConstruction Value + 20 SetMaxDefense Value + 5 ] - - EffectsGroup - scope = And [ - Object Source.PlanetID - OwnedBy TheEmpire Source.ProducedByEmpireID - ] - activation = OwnerHasTech "DEF_ROOT_DEFENSE" - effects = SetMaxTroops Value + 10 ] icon = "icons/building/palace.png" Added: trunk/FreeOrion/default/data/art/icons/tech/troops.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/troops.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/default/eng_stringtable.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -7955,7 +7955,7 @@ '''+ Good Industry: 150%''' GREAT_INDUSTRY -'''++ Great Industry: 250%''' +'''++ Great Industry: 200%''' ULTIMATE_INDUSTRY '''+++ Ultimate Industry: 400%''' @@ -7973,7 +7973,7 @@ '''+ Good Research: 150%''' GREAT_RESEARCH -'''++ Great Research: 250%''' +'''++ Great Research: 200%''' ULTIMATE_RESEARCH '''+++ Ultimate Research: 400%''' @@ -7983,19 +7983,19 @@ '''−−− No Ground Troops''' BAD_GROUND_TROOPS -'''− Bad Ground Troops: 1 unit.''' +'''− Bad Ground Troops: 50%''' AVERAGE_GROUND_TROOPS -''' Average Ground Troops: 5 units.''' +''' Average Ground Troops: 100%''' GOOD_GROUND_TROOPS -'''+ Good Ground Troops: 15 units.''' +'''+ Good Ground Troops: 150%.''' GREAT_GROUND_TROOPS -'''++ Great Ground Troops: 25 units.''' +'''++ Great Ground Troops: 200%.''' ULTIMATE_GROUND_TROOPS -'''+++ Ultimate Ground Troops: 50 units.''' +'''+++ Ultimate Ground Troops: 300%.''' BAD_DETECTION '''− Bad Detection: −10 malus.''' @@ -8153,6 +8153,12 @@ ULTIMATE_TROOPS_LABEL '''%2% Ultimate Ground Troops''' +INDEPENDENT_TROOP_LABEL +'''Independent Homeworld''' + +OUTPOST_TROOP_LABEL +'''Outpost''' + VERY_BRIGHT_STAR '''Very bright star''' Modified: trunk/FreeOrion/default/ship_parts.txt =================================================================== --- trunk/FreeOrion/default/ship_parts.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/default/ship_parts.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -3,9 +3,9 @@ name = "GT_TROOP_POD" description = "GT_TROOP_POD_DESC" class = Troops - capacity = 5 + capacity = 2 mountableSlotTypes = [External Internal] - buildcost = 5 + buildcost = 3 buildtime = 1 tags = "COMFORTABLE" location = OwnedBy TheEmpire Source.Owner Modified: trunk/FreeOrion/default/specials.txt =================================================================== --- trunk/FreeOrion/default/specials.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/default/specials.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -245,7 +245,10 @@ location = And [ Planet Not Planet type = [Asteroids GasGiant] - Not ContainedBy Contains Capital + Not WithinStarlaneJumps 2 Contains And [ + Planet + OwnedBy AnyEmpire + ] ] effectsgroups = [ EffectsGroup @@ -272,13 +275,7 @@ EffectsGroup scope = Source - activation = AND [ - Turn high = 0 - Not WithinStarlaneJumps 1 Contains And [ - Planet - OwnedBy AnyEmpire - ] - ] + activation = Turn high = 0 effects = CreateShip "SM_GUARD_2" ] graphic = "icons/meter/detection.png" Modified: trunk/FreeOrion/default/species.txt =================================================================== --- trunk/FreeOrion/default/species.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/default/species.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -2175,16 +2175,6 @@ ADVANCED_FOCUS_EFFECTS ''' EffectsGroup scope = Source - activation = Focus "FOCUS_PROTECTION" - accountinglabel = "FOCUS_PROTECTION_LABEL" - effects = [ - SetMaxTroops Value + 25 - SetMaxDefense Value + 25 - SetMaxShield Value + 25 - ] - - EffectsGroup - scope = Source activation = Focus "FOCUS_STEALTH" effects = SetStealth Value + 15 @@ -2410,45 +2400,155 @@ ''' ''' BAD_GROUND_TROOPS -'''EffectsGroup +'''[[BASIC_GROUND_TROOPS]] + +EffectsGroup scope = Source - activation = Not OwnedBy AnyEmpire accountinglabel = "BAD_TROOPS_LABEL" - effects = SetMaxTroops Value + 1 + effects = SetMaxTroops Value * .5 + + [[PROTECTION_FOCUS]] ''' AVERAGE_GROUND_TROOPS -'''EffectsGroup +'''[[BASIC_GROUND_TROOPS]] + +EffectsGroup scope = Source - activation = Not OwnedBy AnyEmpire accountinglabel = "AVERAGE_TROOPS_LABEL" - effects = SetMaxTroops Value + 5 + effects = SetMaxTroops Value * 1 + + [[PROTECTION_FOCUS]] ''' GOOD_GROUND_TROOPS -'''EffectsGroup +'''[[BASIC_GROUND_TROOPS]] + +EffectsGroup scope = Source - activation = Not OwnedBy AnyEmpire accountinglabel = "GOOD_TROOPS_LABEL" - effects = SetMaxTroops Value + 15 + effects = SetMaxTroops Value * 1.5 + + [[PROTECTION_FOCUS]] ''' GREAT_GROUND_TROOPS -'''EffectsGroup +'''[[BASIC_GROUND_TROOPS]] + +EffectsGroup scope = Source - activation = Not OwnedBy AnyEmpire accountinglabel = "GREAT_TROOPS_LABEL" - effects = SetMaxTroops Value + 25 + effects = SetMaxTroops Value * 2 + + [[PROTECTION_FOCUS]] ''' ULTIMATE_GROUND_TROOPS +'''[[BASIC_GROUND_TROOPS]] + +EffectsGroup + scope = Source + accountinglabel = "ULTIMATE_TROOPS_LABEL" + effects = SetMaxTroops Value * 3 + + [[PROTECTION_FOCUS]] +''' + +BASIC_GROUND_TROOPS '''EffectsGroup + scope = OwnedBy TheEmpire Source.Owner + activation = NOT OwnerHasTech "DEF_GARRISON_1" + stackinggroup = "BASIC_TROOPS_STACK" + accountinglabel = "DEF_ROOT_DEFENSE" + effects = SetMaxTroops Value + 2 + +EffectsGroup + scope = OwnedBy TheEmpire Source.Owner + activation = AND [ + OwnerHasTech "DEF_GARRISON_1" + NOT OwnerHasTech "DEF_GARRISON_2" + ] + stackinggroup = "BASIC_TROOPS_STACK" + accountinglabel = "DEF_GARRISON_1" + effects = SetMaxTroops Value + 5 + +EffectsGroup + scope = OwnedBy TheEmpire Source.Owner + activation = AND [ + OwnerHasTech "DEF_GARRISON_2" + NOT OwnerHasTech "DEF_GARRISON_3" + ] + stackinggroup = "BASIC_TROOPS_STACK" + accountinglabel = "DEF_GARRISON_2" + effects = SetMaxTroops Value + 10 + +EffectsGroup + scope = OwnedBy TheEmpire Source.Owner + activation = AND [ + OwnerHasTech "DEF_GARRISON_3" + NOT OwnerHasTech "DEF_GARRISON_4" + ] + stackinggroup = "BASIC_TROOPS_STACK" + accountinglabel = "DEF_GARRISON_3" + effects = SetMaxTroops Value + 15 + +EffectsGroup + scope = OwnedBy TheEmpire Source.Owner + activation = OwnerHasTech "DEF_GARRISON_4" + stackinggroup = "BASIC_TROOPS_STACK" + accountinglabel = "DEF_GARRISON_4" + effects = SetMaxTroops Value + 20 + +EffectsGroup + scope = AND [ + OwnedBy TheEmpire Source.Owner + Planet Population high = 0 + ] + stackinggroup = "OUTPOST_TROOPS_STACK" + accountinglabel = "OUTPOST_TROOP_LABEL" + effects = SetMaxTroops Value * .5 + +EffectsGroup + scope = And [ + Contains Building name = "BLD_IMPERIAL_PALACE" + OwnedBy TheEmpire Source.Owner + ] + activation = OwnerHasTech "DEF_ROOT_DEFENSE" + stackinggroup = "PALACE_TROOPS_STACK" + accountinglabel = "BLD_IMPERIAL_PALACE" + effects = SetMaxTroops Value + 3 + +EffectsGroup + scope = AND [ + Source + Homeworld name = Source.Species + OwnedBy TheEmpire Source.Owner + ] + stackinggroup = "HOMEWORLD_TROOPS_STACK" + accountinglabel = "HOMEWORLD_LABEL" + effects = SetMaxTroops Value + 2 + +EffectsGroup scope = Source activation = Not OwnedBy AnyEmpire - accountinglabel = "ULTIMATE_TROOPS_LABEL" - effects = SetMaxTroops Value + 50 + stackinggroup = "BASIC_TROOPS_STACK" + accountinglabel = "INDEPENDENT_TROOP_LABEL" + effects = SetMaxTroops Value + 8 + ''' +PROTECTION_FOCUS +''' EffectsGroup + scope = Source + activation = Focus "FOCUS_PROTECTION" + accountinglabel = "FOCUS_PROTECTION_LABEL" + effects = [ + SetMaxTroops Value * 2 + SetMaxDefense Value + 25 + SetMaxShield Value + 25 + ] +''' + //##### D E T E C T I O N #####// BAD_DETECTION Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2012-11-27 09:29:24 UTC (rev 5469) +++ trunk/FreeOrion/default/techs.txt 2012-11-27 18:09:40 UTC (rev 5470) @@ -48,11 +48,6 @@ researchcost = 1 researchturns = 1 unlock = Item type = ShipPart name = "SH_DEFENSE_GRID" - effectsgroups = - EffectsGroup - scope = OwnedBy TheEmpire Source.Owner - activation = NOT OwnerHasTech "DEF_GARRISON_1" - effects = SetMaxTroops Value + 5 graphic = "" Tech @@ -61,15 +56,10 @@ short_description = "TROOPS_SHORT_DESC" techtype = Application category = "DEFENSE_CATEGORY" - researchcost = 2 - researchturns = 2 + researchcost = 5 + researchturns = 3 prerequisites = "DEF_ROOT_DEFENSE" - effectsgroups = - EffectsGroup - scope = OwnedBy TheEmpire Source.Owner - activation = NOT OwnerHasTech "DEF_GARRISON_2" - effects = SetMaxTroops Value + 10 - graphic = "" + graphic = "icons/tech/troops.png" Tech Name ="DEF_GARRISON_2" @@ -77,15 +67,10 @@ short_description = "TROOPS_SHORT_DESC" techtype = Application category = "DEFENSE_CATEGORY" - researchcost = 5 + researchcost = 15 researchturns = 5 prerequisites = "DEF_GARRISON_1" - effectsgroups = - EffectsGroup - scope = OwnedBy TheEmpire Source.Owner - activation = NOT OwnerHasTech "DEF_GARRISON_3" - effects = SetMaxTroops Value + 20 - graphic = "" + graphic = "icons/tech/troops.png" Tech Name ="DEF_GARRISON_3" @@ -93,15 +78,10 @@ short_description = "TROOPS_SHORT_DESC" techtype = Application category = "DEFENSE_CATEGORY" - researchcost = 15 + researchcost = 50 researchturns = 8 prerequisites = "DEF_GARRISON_2" - effectsgroups = - EffectsGroup - scope = OwnedBy TheEmpire Source.Owner - activation = NOT OwnerHasTech "DEF_GARRISON_4" - effects = SetMaxTroops Value + 40 - graphic = "" + graphic = "icons/tech/troops.png" Tech Name ="DEF_GARRISON_4" @@ -109,14 +89,10 @@ short_description = "TROOPS_SHORT_DESC" techtype = Application category = "DEFENSE_CATEGORY" - researchcost = 40 - researchturns = 15 + researchcost = 150 + researchturns = 12 prerequisites = "DEF_GARRISON_3" - effectsgroups = - EffectsGroup - scope = OwnedBy TheEmpire Source.Owner - effects = SetMaxTroops Value + 80 - graphic = "" + graphic = "icons/tech/troops.png" Tech name = "DEF_DEFENSE_NET" |