Commit 38a72070 authored by Jean Miraak's avatar Jean Miraak 💬 Committed by brabox

(!526) Torches Upgrade in clan steading

parent 9c9feb81
- Isengard Torches upgrade is now researched when the Clan Steading is built (similar to soul freeze, spiked collars and venom sacks)
......@@ -13930,10 +13930,35 @@ CommandButton Command_PurchaseUpgradeIsengardHeavyArmorTier4
LacksPrerequisiteLabel = TOOLTIP:LackIsengardHeavyArmor
End
CommandButton Command_PurchaseTechnologyIsengardTorches ;,;
Command = PLAYER_UPGRADE
Upgrade = Upgrade_TechnologyIsengardTorches
Options = CANCELABLE
TextLabel = CONTROLBAR:PurchaseTechnologyIsengardTorches
ButtonImage = BIArmory_Torches
ButtonBorderType = UPGRADE
DescriptLabel = CONTROLBAR:ToolTipPurchaseTechnologyIsengardTorches
Radial = Yes
InPalantir = Yes
End
CommandButton Command_PurchaseUpgradeIsengardTorches
Command = OBJECT_UPGRADE
Options = OK_FOR_MULTI_SELECT CANCELABLE
Options = NEED_UPGRADE OK_FOR_MULTI_SELECT CANCELABLE ;,; Added NEED_UPGRADE
Upgrade = Upgrade_IsengardTorches
NeededUpgrade = Upgrade_TechnologyIsengardTorches ;,;
TextLabel = CONTROLBAR:PurchaseUpgradeIsengardTorches
ButtonImage = BIArmory_Torches
ButtonBorderType = UPGRADE
DescriptLabel = CONTROLBAR:ToolTipPurchaseUpgradeIsengardTorches
InPalantir = Yes
LacksPrerequisiteLabel = TOOLTIP:LackIsengardTorches
End
CommandButton Command_PurchaseUpgradeIsengardTorchesInn ;,;
Command = OBJECT_UPGRADE
Options = OK_FOR_MULTI_SELECT CANCELABLE
Upgrade = Upgrade_IsengardTorchesInn
TextLabel = CONTROLBAR:PurchaseUpgradeIsengardTorches
ButtonImage = BIArmory_Torches
ButtonBorderType = UPGRADE
......
......@@ -267,7 +267,7 @@ End
CommandSet IsengardWildmanHordeCommandSet_Inn ;;.;; Added for 2.02 - has torch upgrade but not HA or BC upgrades
1 = Command_ToggleStance
2 = Command_SpecialAbilityWildmanPillage
3 = Command_PurchaseUpgradeIsengardTorches
3 = Command_PurchaseUpgradeIsengardTorchesInn ;,; Command_PurchaseUpgradeIsengardTorches
12 = Command_CaptureBuilding
13 = Command_AttackMove
14 = Command_Stop
......@@ -316,7 +316,7 @@ End
CommandSet AngmarWildmanHordeCommandSet
1 = Command_ToggleStance
2 = Command_SpecialAbilityWildmanPillage
3 = Command_PurchaseUpgradeIsengardTorches
3 = Command_PurchaseUpgradeIsengardTorchesInn ;,; Command_PurchaseUpgradeIsengardTorches
4 = Command_PurchaseUpgradeAngmarDarkIronArmorTier1 ;,;Command_PurchaseUpgradeAngmarDarkIronArmor
;,; 5 = Command_PurchaseUpgradeAngmarBasicTraining
5 = Command_PurchaseUpgradeAngmarBasicTraining ;,; Added in v5.1
......@@ -5528,24 +5528,24 @@ End ; DONT REMOVE THIS - TO HERE - NEEDED FOR SKIRMISH AND MP - SSMITH 10
CommandSet IsengardTavernCommandSetLevel1 ; Added to Isengard for BFME2 Expansion
1 = Command_ConstructIsengardWildmanHorde
2 = Command_ConstructIsengardWildmanAxeHorde
; 3 = Command_PurchaseTechnologyMordorHeavyArmor
5 = Command_UpgradeIsengardTavernLevel2
2 = Command_PurchaseTechnologyIsengardTorches ;,; Command_ConstructIsengardWildmanAxeHorde
3 = Command_ConstructIsengardWildmanAxeHorde ;,; Command_PurchaseTechnologyMordorHeavyArmor
4 = Command_UpgradeIsengardTavernLevel2
6 = Command_Sell
End
CommandSet IsengardTavernCommandSetLevel2 ; Added to Isengard for BFME2 Expansion
1 = Command_ConstructIsengardWildmanHorde
2 = Command_ConstructIsengardWildmanAxeHorde
; 3 = Command_PurchaseTechnologyMordorHeavyArmor
5 = Command_UpgradeIsengardTavernLevel3
2 = Command_PurchaseTechnologyIsengardTorches ;,; Command_ConstructIsengardWildmanAxeHorde
3 = Command_ConstructIsengardWildmanAxeHorde ;,; Command_PurchaseTechnologyMordorHeavyArmor
4 = Command_UpgradeIsengardTavernLevel3
6 = Command_Sell
End
CommandSet IsengardTavernCommandSetLevel3 ; Added to Isengard for BFME2 Expansion
1 = Command_ConstructIsengardWildmanHorde
2 = Command_ConstructIsengardWildmanAxeHorde
; 3 = Command_PurchaseTechnologyMordorHeavyArmor
2 = Command_PurchaseTechnologyIsengardTorches ;,; Command_ConstructIsengardWildmanAxeHorde
3 = Command_ConstructIsengardWildmanAxeHorde ;,; Command_PurchaseTechnologyMordorHeavyArmor
6 = Command_Sell
End
......
......@@ -2005,6 +2005,19 @@ NewEvaEvent UpgradeHorseShieldsReady
End
End
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
NewEvaEvent UpgradeTorchesReady ;,;
Priority = EVA_UPGRADE_COMPLETE_PRIORITY
TimeBetweenEventsMS = EVA_UPGRADE_COMPLETE_TIME_BETWEEN_EVENTS
ExpirationTimeMS = EVA_UPGRADE_COMPLETE_EXPIRATION_TIME
CountAsJumpToLocation = No ; This is basically a global event
SideSound
Side = Isengard
Sound = CampOrcUpgradeTorches
End
End
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
NewEvaEvent UpgradeSpikedCollarReady
Priority = EVA_UPGRADE_COMPLETE_PRIORITY
......
......@@ -4417,8 +4417,8 @@
#define ISENGARD_TECH_HEAVY_ARMOR_BUILDCOST 1000
#define ISENGARD_TECH_HEAVY_ARMOR_BUILDTIME 30 ;;,;; 15
#define ISENGARD_TECH_TORCHES_BUILDCOST 1000
#define ISENGARD_TECH_TORCHES_BUILDTIME 15
#define ISENGARD_TECH_TORCHES_BUILDCOST 0 ;,; 1000
#define ISENGARD_TECH_TORCHES_BUILDTIME 1 ;,; 15
;-----
#define ISENGARD_PERSONAL_BASIC_TRAINING_BUILDCOST 100 ;,; 150 ;;,;; 200 ;;.;; 300
......
......@@ -969,6 +969,10 @@ ChildObject IsengardWildmanHordeInn IsengardWildmanHorde
MeleeAttackLeashDistance = 50 ;;,;; 25; How far the hordes can move from the center of the horde when melee attacking.
End
Behavior = StatusBitsUpgrade ModuleTag_ProductionLegality ;,;
TriggeredBy = Upgrade_IsengardTorchesInn
End
End
;------------------------------------------------------------------------------
......@@ -1041,6 +1045,10 @@ ChildObject AngmarWildmanHordeInn IsengardWildmanHorde
LevelCap = 2
End
Behavior = StatusBitsUpgrade ModuleTag_ProductionLegality ;,;
TriggeredBy = Upgrade_IsengardTorchesInn
End
End
;------------------------------------------------------------------------------
......
......@@ -347,6 +347,16 @@ Object IsengardTavern
ExitDelay = STANDARD_HORDE_EXIT_DELAY
UseReturnToFormation = No
End
Behavior = GrantUpgradeCreate ModuleTag_ActLikeAnOldUpgrade ;,;
UpgradeToGrant = Upgrade_IsengardTavernTechUpgrade
GiveOnBuildComplete = Yes
End
Behavior = DoCommandUpgrade ModuleTag_UpgradeTorches ;,;
TriggeredBy = Upgrade_IsengardTavernTechUpgrade
GetUpgradeCommandButtonName = Command_PurchaseTechnologyIsengardTorches
End
Behavior = SubObjectsUpgrade ModuleTag_HideAll
TriggeredBy = Upgrade_StructureLevel1
......
......@@ -3568,6 +3568,14 @@ Upgrade Upgrade_IsengardHeavyArmor
StrategicIcon = AptStrategicUnitUpgradeArmor
End
Upgrade Upgrade_TechnologyIsengardTorches ;,;
DisplayName = UPGRADE:IsengardTorchesUpgrade
Type = PLAYER
BuildCost = ISENGARD_TECH_TORCHES_BUILDCOST
BuildTime = ISENGARD_TECH_TORCHES_BUILDTIME
ResearchCompleteEvaEvent = UpgradeTorchesReady
End
Upgrade Upgrade_IsengardTorches
DisplayName = UPGRADE:IsengardTorchesUpgrade
Tooltip = TOOLTIP:IsengardTorches
......@@ -3575,6 +3583,21 @@ Upgrade Upgrade_IsengardTorches
BuildCost = ISENGARD_PERSONAL_TORCHES_BUILDCOST
BuildTime = ISENGARD_PERSONAL_TORCHES_BUILDTIME
ResearchSound = UpgradeTorchMS ;CampOrcUpgradeTorches
ButtonImage = BuildingNoArt ;,;
Cursor = WeaponUpgrade ;,;
RequiredObjectFilter = NONE +IsengardTavern ;,;
StrategicIcon = AptStrategicUnitUpgradeBlade ;;,;; Added for WotR mode
End
Upgrade Upgrade_IsengardTorchesInn ;,;
DisplayName = UPGRADE:IsengardTorchesUpgrade
Tooltip = TOOLTIP:IsengardTorches
Type = OBJECT
BuildCost = ISENGARD_PERSONAL_TORCHES_BUILDCOST
BuildTime = ISENGARD_PERSONAL_TORCHES_BUILDTIME
ResearchSound = UpgradeTorchMS ;CampOrcUpgradeTorches
ButtonImage = BuildingNoArt
Cursor = WeaponUpgrade
StrategicIcon = AptStrategicUnitUpgradeBlade ;;,;; Added for WotR mode
End
......@@ -3678,6 +3701,12 @@ Upgrade Upgrade_IsengardArmoryLevel3
End
//-------IsengardTavern---------
Upgrade Upgrade_IsengardTavernTechUpgrade ;,;
Type = OBJECT
BuildCost = 0
BuildTime = 0
End
Upgrade Upgrade_IsengardTavernLevel2
Type = OBJECT
BuildCost = ISENGARD_TAVERN_LVL2_UPGRADE_COST
......
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