Commit 977f7928 authored by brabox's avatar brabox

Gob Caves now use PB armor

ResourceArmor is now obsolete so this commit also includes some work to neatly tie that up.
parent cafe0124
......@@ -144,6 +144,7 @@ Goblins
--- healing unlocked at level 2 (was 3).
- Giant Expansion range increased to 580 (from 500).
- Gorkil's Totem Pole now also provides fear and terror immunity for nearby units.
- Goblin Cave now uses the Armorset of a Production Building instead of that of a Resource Building.
- Angmar
......
......@@ -3143,7 +3143,7 @@ Armor FortressExpansionArmor
End
;------------------------------------------------------------------------------
Armor StructureArmor ; NOTE - This is replaced by Technology and Factory Armor (Old values)
Armor StructureArmor ; NOTE - All structures that don't either use Technology or Factory Armor, use this.
Armor = DEFAULT 60% ; this sets the level for all nonspecified damage types ; Changed from 75%
Armor = CRUSH 1% ; horseman damage
Armor = SLASH 40% ; soldier damage Changed from 75%
......@@ -3228,7 +3228,7 @@ Armor FactoryHeavyArmor
End
;------------------------------------------------------------------------------
Armor ResourceArmor
Armor ResourceArmor ; NOTE - This Armor is no longer used in multiplayer (as of 2.02 v7.1.0) [BraBox]
Armor = DEFAULT 50% ; this sets the level for all nonspecified damage types
Armor = CRUSH 1% ; horseman damage
Armor = SLASH 50% ; soldier damage
......
......@@ -42,7 +42,6 @@
#define WILD_EVIL_UNIT_FILTER +GoblinCaveTroll_FromTrollLair +CaveTroll_Slaved +GoblinCaveTroll +FireDrake_Slaved +WildFortressFireDrake +WildFireDrake +WildBabyDrake +GoblinArcher +GoblinFighter +GoblinSpiderRider +WildBannerGoblin +WildBannerMarauder +WildMarauderSwordBanner +WildBannerSpiderRider +WildMarauder +WildMarauderSwords +WildSpiderlingHordeMember +WildBannerSpiderling +WildSpiderling_Slaved +WildSpiderling ;,; +WildSpiderling_Summoned
#define ALLFACTION_EVIL_UNIT_FILTER +AngmarInfantryBanner +AngmarBannerDireSnowTroll +AngmarBannerHillTroll +AngmarBannerOrcWarrior +AngmarBannerSnowTroll +AngmarBannerWolfRider +AngmarDarkDunedain_Summoned +AngmarDarkDunedain +AngmarDireWolf_Slaved +AngmarDireWolf +HillTroll_Slaved +AngmarHillTroll +AngmarNecroAcolyte_Summoned +AngmarNecroAcolyte +AngmarNecromancerBanner +AngmarOrcWarrior_Summoned +AngmarOrcWarrior +AngmarDarkRanger_Summoned +AngmarDarkRanger +RhudaurSlinger_Summoned +AngmarRhudaurSlinger +RhudaurSlinger_Creep +RhudaurSpearman_Summoned +AngmarRhudaurSpearman +RhudaurSpearman_Creep +SnowTroll_Slaved +AngmarSnowTroll +AngmarThrallMaster +AngmarThrallMasterBanner +AngmarThrallMasterAxeBanner +AngmarThrallMasterWolfBanner +AngmarWolfRider +IsengardBeserker +IsengardBannerOrc +IsengardWargRider +IsengardFanatic +IsengardFighter +IsengardPikeman +IsengardUrukCrossbow +IsengardWargPack +IsengardWargRiderBanner +IsengardWildman_Summoned +IsengardWildman +IsengardWildmanAxe +MordorAttackTroll_Summoned +MordorAttackTroll +MordorDrummerTroll +MordorHaradrimArcherMumakil +MordorHaradrimArcher +MordorHaradrimRiderBanner +MordorHaradrimRider +MordorArcherBarricade_Slaved +MordorArcher_Slaved +MordorArcher +MordorBannerOrc +MordorBlackOrc +MordorBlackRider +MordorBlackRiderMounted +EvilMenBlackRider +MordorCorsairBanner +MordorCorsairsOfUmbar +MordorEasterling +MordorFighter_Summoned +MordorFighter +MordorGoblinArcherBarricade_Slaved +MordorGoblinArcher_Slaved +MordorGoblinArcher +MordorGoblinSwordsman_Slaved +MordorGoblinSwordsman +MordorOrcScout_Unit +MordorCaveTroll_Summoned +MordorMountainTroll +GoblinCaveTroll_FromTrollLair +CaveTroll_Slaved +GoblinCaveTroll +FireDrake_Slaved +WildFortressFireDrake +WildFireDrake +WildBabyDrake +GoblinArcher +GoblinFighter +GoblinSpiderRider +WildBannerGoblin +WildBannerMarauder +WildMarauderSwordBanner +WildBannerSpiderRider +WildMarauder +WildMarauderSwords +WildSpiderlingHordeMember +WildBannerSpiderling +WildSpiderling_Summoned +WildSpiderling_Slaved +WildSpiderling
#define MINI_HERO_FILTER +DwarvenZerker +DwarvenZerkerHorde +NoldorWarrior +NoldorWarriorHorde +GondorKnightsofDol +GondorKnightsofDolHorde +WildBabyDrake +WildBabyDrakeHorde +MordorBlackRider +MordorBlackRiderHorde +IsengardFanatic +IsengardBerserkerHorde
#define RESOURCE_ARMOR_BUILDINGS +GoblinCave
#define FACTORY_ARMOR_BUILDINGS +GondorBarracks +GondorArcherRange +GondorStable +GondorWorkshop +ElvenBarracks +ElvenGreenPasture +DwarfBarracks +DwarvenArcheryRange +DwarvenSiegeWorks +AngmarBarracks +AngmarDen +AngmarHallofTwilight +IsengardTavern +IsengardSiegeWorks +IsengardWargPit +IsengardWargSentry +MordorTavern +MordorOrcPit +MordorSiegeWorks +MordorTrollCage +WildSpiderPit +MordorHaradrimPalace +MordorMumakilPen
#define TECHNOLOGY_ARMOR_BUILDINGS +WildTreasureTrove +AngmarForgeWorks +IsengardArmory +EregionForge +GondorForge +GondorMarketPlace
#define STRUCTURE_ARMOR_BUILDINGS +GondorFarm +DwarvenMineShaft +ElvenMallornTree +IsengardFurnace +MordorSlaughterHouse +ArnorFarm +GoblinFissure +WildMineShaft +AngmarMill +DwarvenStatue +DwarvenHearth +ElvenStatue +ElvenMirrorOfGaladriel +GondorHeroStatue +GondorStatue +GondorWell
......
......@@ -239,7 +239,7 @@ Object GoblinCave
ArmorSet
Conditions = None
Armor = ResourceArmor
Armor = FactoryArmor ;,; ResourceArmor
End
WeaponSet
......
......@@ -2009,7 +2009,6 @@ Weapon RohanArcherBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -2047,7 +2046,6 @@ Weapon RohanArcherBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -2718,7 +2716,6 @@ Weapon RohanElvenBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -3200,7 +3197,6 @@ Weapon RohirrimBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -5077,7 +5073,6 @@ Weapon GondorArcherBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -5117,7 +5112,6 @@ Weapon GondorArcherBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -5283,7 +5277,6 @@ Weapon GondorRangerBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -5322,7 +5315,6 @@ Weapon GondorRangerBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -8069,7 +8061,6 @@ Weapon DwarvenArcherBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -8108,7 +8099,6 @@ Weapon DwarvenArcherBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -9619,7 +9609,6 @@ Weapon IsengardArcherBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -12767,7 +12756,6 @@ Weapon MordorArcherBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -12807,7 +12795,6 @@ Weapon MordorArcherBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -13082,7 +13069,6 @@ Weapon HaradrimBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -13123,7 +13109,6 @@ Weapon HaradrimBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -18513,7 +18498,6 @@ Weapon WildSpiderRiderBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -21036,7 +21020,6 @@ Weapon GoblinArcherBowFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
......@@ -21076,7 +21059,6 @@ Weapon GoblinArcherBowBombardFireWarhead
DeathType = BURNED
AcceptDamageAdd = No
DamageScalar = 25% ALL -STRUCTURE
DamageScalar = FIRE_ARROW_SCALAR_VS_RESOURCE_BUILDINGS ANY RESOURCE_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_PRODUCTION_BUILDINGS ANY FACTORY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_TECHNOLOGY_BUILDINGS ANY TECHNOLOGY_ARMOR_BUILDINGS ;,;
DamageScalar = FIRE_ARROW_SCALAR_VS_STRUCTURE_ARMOR_BUILDINGS ANY STRUCTURE_ARMOR_BUILDINGS ;,;
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