Commit aa6b2d97 authored by Excelsior's avatar Excelsior

RB munitions pass out code.

parent 8935cc4e
......@@ -87,6 +87,7 @@ General Balance Changes
--- arm damage against Fortresses and Citadels halved;
--- arm health reduced to 4000 (was 10000, originally 2000).
- Disabled Ent rage from trained Ents and Treebeard.
- Production Buildings, Resource Buildings and Forges now benefit from Fortress Munitions upgrade (must be within wall building radius to benefit).
Sound Changes and Additions
......@@ -462,6 +463,7 @@ Dwarves
--- vision and stealth detection range increased to 200 (from 160);
--- now able to detect Gollum.
- Fortress Oil Casks damage radius increased to 250 to match that of Boiling Oil and Magma Cauldrons (was 200).
- Mineshaft attack damage reduced to 75 (from 120) to match that of other Resource Buildings.
Isengard
......@@ -530,6 +532,7 @@ Isengard
----- convert unpack (trigger) time reduced to 500ms (was 1200s).
----- ability trigger freeze time reduced to 1800ms (from 2500ms).
- Warg Pit level 3 upgrade now enables ranged attack.
- Furnace attack damage reduced to 75 (from 120) to match that of other Resource Buildings.
Mordor
......@@ -617,6 +620,7 @@ Mordor
----- can now be targeted on Monsters;
----- added new cast animation.
--- added several new animations (such as cheering, taunting, paralysed, splatted death and attack move) and improved existing ones.
- Slaughterhouse attack damage reduced to 75 (from 120) to match that of other Resource Buildings.
Goblins
......
......@@ -2680,6 +2680,7 @@
#define KEEP_BOW_DAMAGE 120
#define KEEP_BOW_UPGRADED_DAMAGE 20
#define RB_BOW_UPGRADED_DAMAGE 10 ;,;
#define KEEP_ARCHER_RANGE 250
#define KEEP_BOW_PREATTACKDELAY 5
......
......@@ -1186,7 +1186,7 @@ Object AngmarFortressCitadel
TriggeredBy = Upgrade_AngmarFortressIceMunitions
RefreshDelay = 2000
Range = ANGMAR_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; MEN_FORTRESS_WALL_EFFECTIVE_RADIUS
ObjectFilter = ANY +AngmarWallTowerSmall +AngmarTrollSlingWall +AngmarBarracks +AngmarDen +AngmarForgeWorks +AngmarHallofTwilight ;,; Added +AngmarBarracks +AngmarDen +AngmarForgeWorks +AngmarHallofTwilight
ObjectFilter = ANY +AngmarWallTowerSmall +AngmarTrollSlingWall +AngmarBarracks +AngmarDen +AngmarForgeWorks +AngmarHallofTwilight +AngmarMill ;,; Added +AngmarBarracks +AngmarDen +AngmarForgeWorks +AngmarHallofTwilight +AngmarMill
End
;----------------------------------------------------------------------------------
......
......@@ -241,7 +241,7 @@ Object AngmarMill
End
WeaponSet
Weapon = PRIMARY EvilStructureBow
Weapon = PRIMARY StructureMillBowAngmar ;,; EvilStructureBow
Conditions = PLAYER_UPGRADE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
......@@ -341,6 +341,15 @@ Object AngmarMill
ConflictsWith = Upgrade_EasyAIMultiPlayer
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_AngmarFortressIceMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_AngmarFortressIceMunitions
End
; Behavior = RebuildHoleExposeDie ModuleTag_ExposeDie
; ExemptStatus = SOLD
; HoleName = WildMineShaftHole
......
......@@ -910,7 +910,7 @@ Object IsengardFortressCitadel
TriggeredBy = Upgrade_IsengardFortressOrcfireMunitionsTrigger
RefreshDelay = 2000
Range = ISENGARD_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; 99999
ObjectFilter = ANY +IsengardArmory +IsengardWargPit +IsengardSiegeWorks
ObjectFilter = ANY +IsengardArmory +IsengardWargPit +IsengardSiegeWorks +IsengardFurnace +IsengardLumberMill
End
//Iron Plating Improvement
......
......@@ -8,6 +8,24 @@ ChildObject IsengardFurnace Furnace
KindOf = +LIVING_WORLD_BUILDING_MIRROR +ECONOMY_STRUCTURE
WeaponSet ;,;
Conditions = None
End
WeaponSet ;,;
Conditions = PLAYER_UPGRADE
Weapon = PRIMARY StructureRBBowEvil
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_EvilFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_EvilFortressFlamingMunitions
End
Body = StructureBody ModuleTag_05
MaxHealth = ISENGARD_FURNACE_HEALTH
MaxHealthDamaged = ISENGARD_FURNACE_HEALTH_DAMAGED
......
......@@ -11,6 +11,24 @@ ChildObject IsengardLumberMill LumberMill
KindOf = -AUTO_RALLYPOINT ;,; Added in v5.1
WeaponSet ;,;
Conditions = None
End
WeaponSet ;,;
Conditions = PLAYER_UPGRADE
Weapon = PRIMARY StructureRBBowEvil
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_EvilFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_EvilFortressFlamingMunitions
End
Body = StructureBody ModuleTag_05
MaxHealth = ISENGARD_LUMBERMILL_HEALTH
MaxHealthDamaged = ISENGARD_LUMBERMILL_HEALTH_DAMAGED
......
......@@ -744,7 +744,7 @@ Object MordorFortressCitadel
TriggeredBy = Upgrade_MordorFortressFireArrowsTrigger
RefreshDelay = 2000
Range = MORDOR_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; 99999
ObjectFilter = ANY +MordorBarricade +MordorHaradrimPalace ;,; Added MordorHaradrimPalace
ObjectFilter = ANY +MordorBarricade +MordorHaradrimPalace +MordorSlaughterHouse +MordorLumberMill ;,; Added MordorHaradrimPalace +MordorSlaughterHouse +MordorLumberMill
End
;----------------------------------------------------------------------------------
......
......@@ -11,6 +11,24 @@ ChildObject MordorLumberMill LumberMill
KindOf = -AUTO_RALLYPOINT ;,; Added in v5.1
WeaponSet ;,;
Conditions = None
End
WeaponSet ;,;
Conditions = PLAYER_UPGRADE
Weapon = PRIMARY StructureRBBowEvil
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_EvilFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_EvilFortressFlamingMunitions
End
Body = StructureBody ModuleTag_05
MaxHealth = MORDOR_LUMBERMILL_HEALTH
MaxHealthDamaged = MORDOR_LUMBERMILL_HEALTH_DAMAGED
......
......@@ -9,6 +9,24 @@ ChildObject MordorSlaughterHouse SlaughterHouse
KindOf = +LIVING_WORLD_BUILDING_MIRROR +ECONOMY_STRUCTURE
WeaponSet ;,;
Conditions = None
End
WeaponSet ;,;
Conditions = PLAYER_UPGRADE
Weapon = PRIMARY StructureRBBowEvil
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_EvilFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_EvilFortressFlamingMunitions
End
Body = ActiveBody ModuleTag_01
MaxHealth = MORDOR_SLAUGHTERHOUSE_HEALTH
MaxHealthDamaged = MORDOR_SLAUGHTERHOUSE_HEALTH_DAMAGED
......
......@@ -796,7 +796,7 @@ Object WildFortressCitadel
TriggeredBy = Upgrade_WildFortressFireArrowsTrigger
RefreshDelay = 2000
Range = MORDOR_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; 99999
ObjectFilter = ANY +WildTreasureTrove +GoblinCave
ObjectFilter = ANY +WildTreasureTrove +GoblinCave +WildMineShaft +WildLumberMill
End
;//Web Cocoon Upgrade
......
......@@ -11,6 +11,25 @@ ChildObject WildLumberMill LumberMill
KindOf = -AUTO_RALLYPOINT ;,; Added in v5.1
WeaponSet ;,;
Conditions = None
End
WeaponSet ;,;
Weapon = PRIMARY StructureRBBowEvil
Conditions = PLAYER_UPGRADE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_EvilFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_EvilFortressFlamingMunitions
End
Body = StructureBody ModuleTag_05
MaxHealth = WILD_LUMBERMILL_HEALTH
MaxHealthDamaged = WILD_LUMBERMILL_HEALTH_DAMAGED
......
......@@ -268,7 +268,7 @@ Object WildMineShaft
End
WeaponSet
Weapon = PRIMARY EvilStructureBow
Weapon = PRIMARY StructureRBBowEvil ;,; EvilStructureBow
Conditions = PLAYER_UPGRADE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
......@@ -390,6 +390,15 @@ Object WildMineShaft
ConflictsWith = Upgrade_EasyAIMultiPlayer
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_EvilFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_EvilFortressFlamingMunitions
End
Behavior = RebuildHoleExposeDie ModuleTag_ExposeDie
ExemptStatus = SOLD
HoleName = WildMineShaftHole
......
......@@ -1192,7 +1192,7 @@ Object DwarvenFortressCitadel
TriggeredBy = Upgrade_GoodFortressFlamingMunitionsTrigger
RefreshDelay = 2000
Range = DWARVEN_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; 99999
ObjectFilter = ANY +DwarvenSentryTower_Independent +DwarvenCastleWallTower +DwarvenWallCatapult +DwarvenWallTowerSmall +DwarfBarracks +DwarvenArcheryRange +DwarvenSiegeWorks ;,; Added +DwarfBarracks +DwarvenArcheryRange +DwarvenSiegeWorks ;;,;; Added +DwarvenCastleWallTower +DwarvenWallCatapult +DwarvenWallTowerSmall
ObjectFilter = ANY +DwarvenSentryTower_Independent +DwarvenCastleWallTower +DwarvenWallCatapult +DwarvenWallTowerSmall +DwarfBarracks +DwarvenArcheryRange +DwarvenSiegeWorks +DwarvenMineShaft ;,; Added +DwarfBarracks +DwarvenArcheryRange +DwarvenSiegeWorks +DwarvenMineShaft ;;,;; Added +DwarvenCastleWallTower +DwarvenWallCatapult +DwarvenWallTowerSmall
End
;----------------------------------------------------------------------------------
......
......@@ -448,7 +448,7 @@ ChildObject DwarvenMineShaft MineShaft_Interface
WeaponSet
Conditions = PLAYER_UPGRADE
Weapon = PRIMARY StructureAxeWeapon
Weapon = PRIMARY StructureMineshaftAxeWeaponDwarves ;,; StructureAxeWeapon
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
......@@ -474,6 +474,15 @@ ChildObject DwarvenMineShaft MineShaft_Interface
TriggeredBy = Upgrade_StructureLevel3
ConflictsWith = Upgrade_EasyAIMultiPlayer
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_GoodFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_GoodFortressFlamingMunitions
End
End
......
......@@ -853,7 +853,7 @@ Object ElvenCitadel
TriggeredBy = Upgrade_ElvenFortressFlamingMunitionsTrigger
RefreshDelay = 2000
Range = ELVEN_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; 99999
ObjectFilter = ANY +ElvenBarracks +ElvenGreenPasture +EregionForge
ObjectFilter = ANY +ElvenBarracks +ElvenGreenPasture +EregionForge +ElvenMallornTree
End
Behavior = PassiveAreaEffectBehavior ModuleTag_MysticFountainsHealing
......
......@@ -59,7 +59,7 @@ ChildObject GondorFarm FarmInterface
End
WeaponSet
Weapon = PRIMARY GondorStructureBow
Weapon = PRIMARY StructureFarmBowMen ;,; GondorStructureBow
Conditions = PLAYER_UPGRADE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
End
......@@ -130,6 +130,15 @@ ChildObject GondorFarm FarmInterface
TriggeredBy = Upgrade_StructureLevel3
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_GoodFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_GoodFortressFlamingMunitions
End
; Same as farm interface, except without the AUTO_RALLYPOINT
KindOf = PRELOAD STRUCTURE SELECTABLE IMMOBILE SCORE NEED_BASE_FOUNDATION CASTLE_KEEP FS_CASH_PRODUCER LIVING_WORLD_BUILDING_MIRROR ATTACK_NEEDS_LINE_OF_SIGHT CAN_ATTACK MADE_OF_STONE ECONOMY_STRUCTURE IGNORE_FOR_VICTORY
......
......@@ -928,7 +928,7 @@ Object MenFortressCitadel
TriggeredBy = Upgrade_GoodFortressFlamingMunitionsTrigger
RefreshDelay = 2000
Range = MEN_FORTRESS_WALL_EFFECTIVE_RADIUS ;;,;; 99999
ObjectFilter = ANY +GondorSentryTower +GondorSentryTower_Independant +GondorCastleWallTower +GondorTrebuchetWall +MenWallTowerSmall +GondorBarracks +GondorArcherRange +GondorStable +GondorForge ;,; Added +GondorBarracks +GondorArcherRange +GondorStable +GondorForge ;;,;; Added +GondorCastleWallTower +GondorTrebuchetWall +MenWallTowerSmall
ObjectFilter = ANY +GondorSentryTower +GondorSentryTower_Independant +GondorCastleWallTower +GondorTrebuchetWall +MenWallTowerSmall +GondorBarracks +GondorArcherRange +GondorStable +GondorForge +GondorFarm ;,; Added +GondorBarracks +GondorArcherRange +GondorStable +GondorForge +GondorFarm ;;,;; Added +GondorCastleWallTower +GondorTrebuchetWall +MenWallTowerSmall
End
Behavior = AttributeModifierAuraUpdate ModuleTag_TowerArmorEnabler ;,;
......
......@@ -1179,6 +1179,21 @@ ChildObject ElvenLorienArcher_Slaved ElvenLorienArcher
UseSlaverAsControlForEvaObjectSightedEvents = No ; Not a creep
End
Behavior = WeaponSetUpgrade ModuleTag_FlamingMunitions ;,;
TriggeredBy = Upgrade_StructureLevel3 Upgrade_GoodFortressFlamingMunitions
RequiresAllTriggers = Yes
End
Behavior = StatusBitsUpgrade ModuleTag_FakeOut ;,;
TriggeredBy = Upgrade_GoodFortressFlamingMunitions
End
Behavior = SubObjectsUpgrade SilverthornArrows_Upgrade ;,;
TriggeredBy = Upgrade_GoodFortressFlamingMunitions
ShowSubObjects = FireArowTip ArrowNock ; yes, it's a typo.
HideSubObjects = arrow
End
Behavior = SlowDeathBehavior ModuleTag_05 ; overriden to be faster, so we fall with the barricade rubble.
DeathTypes = ALL -KNOCKBACK
SinkDelay = 10
......
This diff is collapsed.
......@@ -57396,55 +57396,55 @@ END
CONTROLBAR:TooltipUpgradeIsengardWargPitLevel3
//"+25% Faster Build Speed"
"+25% Faster Build Speed \n Adds defensive Arrow Tower "
"+25% Faster Build Speed \n Adds defensive Arrow Tower"
End
CONTROLBAR:ToolTipPurchaseUpgradeMenFortressFlamingMunitions
//"Adds fire damage to all attached towers and trebuchets"
//"Adds fire damage to all attached Towers, Trebuchets and nearby Lone Towers"
"Adds Fire damage to all attached Towers and Trebuchets, as well as to nearby Production Buildings, Forges and Lone Towers"
"Adds Fire damage to all attached Towers and Trebuchets, as well as to nearby Production Buildings, Resource Buildings, Forges and Lone Towers"
END
CONTROLBAR:ToolTipPurchaseUpgradeDwarvenFortressFlamingMunitions
//"Adds fire damage to all attached towers and catapults"
//"Adds forged blades to all attached towers and fire damage to all attached catapults"
//"Adds Forged Blades to all attached Towers and nearby Lone Towers and fire damage to all attached catapults"
"Adds Forged Blades to all attached Towers and Fire damage to all attached Catapults \n Adds Forged Blades / Fire damage to nearby Production Buildings, Forges and Lone Towers"
"Adds Forged Blades to all attached Towers and Fire damage to all attached Catapults \n Adds Forged Blades / Fire damage to nearby Production Buildings, Resource Buildings, Forges and Lone Towers"
END
CONTROLBAR:ToolTipPurchaseUpgradeSummonedStructureFlamingMunitions
//"Adds forged blades to all attached towers and fire damage to all attached catapults"
//"Adds Forged Blades to all attached Towers and nearby Lone Towers and fire damage to all attached catapults"
"Adds Forged Blades to all attached Towers and Fire damage to all attached Catapults \n Adds Forged Blades / Fire damage to nearby Production Buildings, Forges and Lone Towers"
"Adds Forged Blades to all attached Towers and Fire damage to all attached Catapults \n Adds Forged Blades / Fire damage to nearby Production Buildings, Resource Buildings, Forges and Lone Towers"
END
CONTROLBAR:ToolTipPurchaseUpgradeElvenFortressFlamingMunitions
//"Adds Silverthorn Arrows to all attached Watchtowers"
"Adds Silverthorn Arrows to all attached Watchtowers, as well as to nearby Production Buildings and Forges.
"Adds Silverthorn Arrows to all attached Watchtowers, as well as to nearby Production Buildings, Resource Buildings and Forges"
END
CONTROLBAR:ToolTipPurchaseUpgradeAngmarFortressIceMunitions
//"Adds frost damage to all attached Towers and Stone Throwers"
"Adds Frost damage to all attached Towers and Stone Throwers, as well as to nearby Production Buildings and Forges"
"Adds Frost damage to all attached Towers and Stone Throwers, as well as to nearby Production Buildings, Resource Buildings and Forges"
END
CONTROLBAR:ToolTipPurchaseUpgradeIsengardFortressOrcfireMunitions
//"Arms defensive towers with Fire Arrows"
//"Arms defensive Towers with Fire Arrows"
//"Adds fire damage to all attached Towers and Ballistae"
"Adds Fire damage to all attached Towers and Ballistae, as well as to nearby Production Buildings and Forges"
"Adds Fire damage to all attached Towers and Ballistae, as well as to nearby Production Buildings, Resource Buildings and Forges"
END
CONTROLBAR:ToolTipPurchaseUpgradeWildFortressFireArrows
//"Equips your Arrow Dens with Fire Arrows"
//"Adds fire damage to all attached Arrow Dens"
"Adds Fire damage to all attached Arrow Dens, as well as to nearby Production Buildings and Forges within"
"Adds Fire damage to all attached Arrow Dens, as well as to nearby Production Buildings, Resource Buildings and Forges"
END
CONTROLBAR:ToolTipPurchaseUpgradeMordorFortressFireArrows
//"Equips Barricades with Fire Arrows"
//"Equips attached Barricades and nearby Summoned Barricades with Fire Arrows"
"Adds Fire damage to all attached Barricades, nearby Haradrim Palaces and Summoned Barricades"
"Adds Fire damage to all attached Barricades, as well as to nearby Production Buildings, Resource Buildings and Summoned Barricades"
END
//========================= VERSION STRINGS ========== ;;,;;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment