diff --git a/mods/mw/rules/faction_baron/defense_baron.yaml b/mods/mw/rules/faction_baron/defense_baron.yaml index 24e6c40..ab4f4da 100644 --- a/mods/mw/rules/faction_baron/defense_baron.yaml +++ b/mods/mw/rules/faction_baron/defense_baron.yaml @@ -1,3 +1,51 @@ +GUNNEW: + Inherits: ^MWDefense + Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@Hitshape: ^1x1Shape + Valued: + Cost: 1400 + CustomSellValue: + Value: 700 + Tooltip: + Name: Gunpowder Cannon + Building: + Health: + HP: 40000 + Armor: + Type: HeavyBuilding + RevealsShroud: + Range: 6c0 + WithBuildingBib: + Palette: bibs + HasMinibib: Yes + Turreted: + TurnSpeed: 12 + InitialFacing: 56 + -WithSpriteBody: + WithEmbeddedTurretSpriteBody: + Armament: + Weapon: cannonboulder + LocalOffset: 512,0,212 + MuzzleSequence: muzzle + AttackTurreted: + WithMuzzleOverlay: + -WithDeathAnimation: + RenderSprites: + Image: gunnew + PlayerPalette: raplayer + DetectCloaked: + Range: 3c0 + BodyOrientation: + QuantizedFacings: 32 + Selectable: + Bounds: 25,25,0,0 + SelectionDecorations: + ThrowsShrapnel@SMALL: + Weapons: SmallStone1, SmallStone2, LargeStone1 + Pieces: 2, 3 + Range: 0c512, 3c0 + Targetable@CombatRole: + TargetTypes: Defenses SAMNEW: Inherits: ^MWDefense Inherits@AUTOTARGET: ^AutoTargetAir diff --git a/mods/mw/rules/faction_baron/scaffolds_baron.yaml b/mods/mw/rules/faction_baron/scaffolds_baron.yaml index 10d33e1..86ea9a3 100644 --- a/mods/mw/rules/faction_baron/scaffolds_baron.yaml +++ b/mods/mw/rules/faction_baron/scaffolds_baron.yaml @@ -1,3 +1,62 @@ +GUNNEW.scaff: + Inherits: ^1x1SITE + Inherits@Hitshape: ^1x1Shape + Armor: + Type: HeavyBuilding + RenderSprites: + PlayerPalette: raplayer + Image: gunnew + CustomSellValue: + Value: 700 + Valued: + Cost: 1300 + Tooltip: + Name: Construction Site (Gunpowder Cannon) + Buildable: + Description: The early Cannon uses gunpowder to throw a large boulder. \nIt's most effectively used against large targets.\n Strong vs Cavalry and Spectral Units\n Weak vs Infantry\n\n + BuildPaletteOrder: 60 + Queue: MMilitary.Nod + IconPalette: raicon + BuildDurationModifier: 60 + BuildDuration: 1000 + Health: + HP: 20000 + RevealsShroud: + Range: 4c0 + WithBuildingBib: + Palette: bibs + HasMinibib: Yes + Selectable: + Bounds: 25,25,0,0 + SelectionDecorations: + WithSpriteBody: + RequiresCondition: inactive + DebugTransformOnCondition@Finsihed: + RequiresCondition: (Construct >= 8) + IntoActor: GUNNEW + ReadyAudio: + ConstructionProgress@Construct: + FullCapacity: 8 + WithIdleOverlay@base1: + Sequence: make1 + RequiresCondition: Construct > 2 && Construct < 3 + WithIdleOverlay@base2: + Sequence: make2 + RequiresCondition: Construct >= 3 && Construct < 4 + WithIdleOverlay@base3: + Sequence: make3 + RequiresCondition: Construct >= 4 && Construct < 5 + WithIdleOverlay@base4: + Sequence: make4 + RequiresCondition: Construct >= 5 && Construct < 6 + WithIdleOverlay@base5: + Sequence: make5 + RequiresCondition: Construct >= 6 && Construct < 7 + WithIdleOverlay@base6: + Sequence: make6 + RequiresCondition: Construct >= 7 + WithRangeCircle: + Range: 7c0 HANDNEW.scaff: Inherits: ^2x3SITE Inherits@Hitshape: ^2x2Shape @@ -543,4 +602,4 @@ SAMNEW.scaff: Sequence: make5 RequiresCondition: Construct >= 6 WithRangeCircle@Air: - Range: 8c0 \ No newline at end of file + Range: 10c0 \ No newline at end of file diff --git a/mods/mw/rules/faction_king/defense_king.yaml b/mods/mw/rules/faction_king/defense_king.yaml index 0180cf2..788186d 100644 --- a/mods/mw/rules/faction_king/defense_king.yaml +++ b/mods/mw/rules/faction_king/defense_king.yaml @@ -1,3 +1,82 @@ +GTWNEW: + Inherits: ^MWDefense + Inherits@AUTOTARGET: ^AutoTargetGround + Inherits@Hitshape: ^1x1Shape + EditorTilesetFilter: + Categories: Defense + WithDeathAnimation: + DeathSequencePalette: raplayer + RenderSprites: + PlayerPalette: raplayer + Valued: + Cost: 1200 + CustomSellValue: + Value: 600 + Tooltip: + Name: Guard Tower + Building: + Footprint: x + Dimensions: 1,1 + Health: + HP: 40000 + RevealsShroud: + Range: 7c0 + WithBuildingBib: + Palette: bibs + HasMinibib: Yes + WithIdleOverlay: + AttackTurreted: + Armaments: primary, secondary + BodyOrientation: + QuantizedFacings: 8 + DetectCloaked: + Range: 3c0 + Armament@ARMONE: + Weapon: bownarrowtower + LocalOffset: 0,0,427 + Turret: primary + Name: primary + FireDelay: 5 + WithSpriteTurret@SPRITURRONE: + Sequence: turretidle + Turret: primary + WithTurretAttackAnimation@SPRITURRONE: + Turret: primary + Sequence: shoot + Armament: primary + Turreted@TURRONE: + Turret: primary + TurnSpeed: 100 + Offset: -170,-170,500 + Armament@ARMTWO: + Weapon: bownarrowtower + LocalOffset: 0,0,427 + Turret: secondary + FireDelay: 17 + Name: secondary + WithSpriteTurret@SPRITURRTWO: + Sequence: turretidle + Turret: secondary + WithTurretAttackAnimation@SPRITURRTWO: + Turret: secondary + Armament: secondary + Sequence: shoot + Delay: 12 + Turreted@TURRTWO: + Turret: secondary + TurnSpeed: 100 + Offset: 170,170,500 + Armor: + Type: HeavyBuilding + Selectable: + Bounds: 24,48,0,-10 + SelectionDecorations: + ThrowsShrapnel@SMALL: + Weapons: SmallWood1, SmallWood2, SmallWood3, LargeWood1 + Pieces: 2, 3 + Range: 0c512, 3c0 + Targetable@CombatRole: + TargetTypes: Defenses BATO: Inherits: ^MWDefense Inherits@AUTOTARGET: ^AutoTargetAll diff --git a/mods/mw/rules/faction_king/scaffolds_king.yaml b/mods/mw/rules/faction_king/scaffolds_king.yaml index 9390527..b879016 100644 --- a/mods/mw/rules/faction_king/scaffolds_king.yaml +++ b/mods/mw/rules/faction_king/scaffolds_king.yaml @@ -1,3 +1,62 @@ +GTWNEW.scaff: + Inherits: ^1x1SITE + Inherits@Hitshape: ^1x1Shape + Armor: + Type: HeavyBuilding + RenderSprites: + PlayerPalette: raplayer + Image: gtwnew + CustomSellValue: + Value: 600 + Valued: + Cost: 1100 + Tooltip: + Name: Construction Site ( Guard Tower) + Buildable: + Description: A wooden tower, stationed with 2 archers.\n Strong vs Infantry, Light Cavalry\n Weak vs Siege weapons and Heavy Cavalry \n Cannot target Aircraft\n\n + BuildPaletteOrder: 60 + Queue: MMilitary.GDI + BuildDurationModifier: 60 + IconPalette: raicon + BuildDuration: 1000 + Health: + HP: 20000 + RevealsShroud: + Range: 4c0 + WithBuildingBib: + Palette: bibs + HasMinibib: Yes + Selectable: + Bounds: 24,48,0,-10 + SelectionDecorations: + WithSpriteBody: + RequiresCondition: inactive + DebugTransformOnCondition@Finsihed: + RequiresCondition: (Construct >= 8) + IntoActor: GTWNEW + ReadyAudio: + ConstructionProgress@Construct: + FullCapacity: 8 + WithIdleOverlay@base1: + Sequence: make1 + RequiresCondition: Construct > 1 && Construct < 3 + WithIdleOverlay@base2: + Sequence: make2 + RequiresCondition: Construct >= 3 && Construct < 4 + WithIdleOverlay@base3: + Sequence: make3 + RequiresCondition: Construct >= 4 && Construct < 5 + WithIdleOverlay@base4: + Sequence: make4 + RequiresCondition: Construct >= 5 && Construct < 6 + WithIdleOverlay@base5: + Sequence: make5 + RequiresCondition: Construct >= 6 && Construct < 7 + WithIdleOverlay@base6: + Sequence: make6 + RequiresCondition: Construct >= 7 + WithRangeCircle: + Range: 7c0 NUKENEW.scaff: Inherits: ^2x2SITE Inherits@Hitshape: ^2x2Shape @@ -611,8 +670,8 @@ BATO.scaff: Sequence: make6 RequiresCondition: Construct >= 10 WithRangeCircle: - Range: 8c0 + Range: 7c0 Color: FFFF0080 WithRangeCircle@Air: - Range: 10c0 - Color: FFFF0080 \ No newline at end of file + Range: 8c0 + Color: FF6400 \ No newline at end of file diff --git a/mods/mw/rules/faction_shared/defense_shared.yaml b/mods/mw/rules/faction_shared/defense_shared.yaml index 35c59cc..8f5d211 100644 --- a/mods/mw/rules/faction_shared/defense_shared.yaml +++ b/mods/mw/rules/faction_shared/defense_shared.yaml @@ -1,130 +1,3 @@ -GTWNEW: - Inherits: ^MWDefense - Inherits@AUTOTARGET: ^AutoTargetGround - Inherits@Hitshape: ^1x1Shape - EditorTilesetFilter: - Categories: Defense - WithDeathAnimation: - DeathSequencePalette: raplayer - RenderSprites: - PlayerPalette: raplayer - Valued: - Cost: 1200 - CustomSellValue: - Value: 600 - Tooltip: - Name: Guard Tower - Building: - Footprint: x - Dimensions: 1,1 - Health: - HP: 40000 - RevealsShroud: - Range: 7c0 - WithBuildingBib: - Palette: bibs - HasMinibib: Yes - WithIdleOverlay: - AttackTurreted: - Armaments: primary, secondary - BodyOrientation: - QuantizedFacings: 8 - DetectCloaked: - Range: 3c0 - Armament@ARMONE: - Weapon: bownarrowtower - LocalOffset: 0,0,427 - Turret: primary - Name: primary - FireDelay: 5 - WithSpriteTurret@SPRITURRONE: - Sequence: turretidle - Turret: primary - WithTurretAttackAnimation@SPRITURRONE: - Turret: primary - Sequence: shoot - Armament: primary - Turreted@TURRONE: - Turret: primary - TurnSpeed: 100 - Offset: -170,-170,500 - Armament@ARMTWO: - Weapon: bownarrowtower - LocalOffset: 0,0,427 - Turret: secondary - FireDelay: 17 - Name: secondary - WithSpriteTurret@SPRITURRTWO: - Sequence: turretidle - Turret: secondary - WithTurretAttackAnimation@SPRITURRTWO: - Turret: secondary - Armament: secondary - Sequence: shoot - Delay: 12 - Turreted@TURRTWO: - Turret: secondary - TurnSpeed: 100 - Offset: 170,170,500 - Armor: - Type: HeavyBuilding - Selectable: - Bounds: 24,48,0,-10 - SelectionDecorations - ThrowsShrapnel@SMALL: - Weapons: SmallWood1, SmallWood2, SmallWood3, LargeWood1 - Pieces: 2, 3 - Range: 0c512, 3c0 - Targetable@CombatRole: - TargetTypes: Defenses -GUNNEW: - Inherits: ^MWDefense - Inherits@AUTOTARGET: ^AutoTargetGround - Inherits@Hitshape: ^1x1Shape - Valued: - Cost: 1400 - CustomSellValue: - Value: 700 - Tooltip: - Name: Gunpowder Cannon - Building: - Health: - HP: 40000 - Armor: - Type: HeavyBuilding - RevealsShroud: - Range: 6c0 - WithBuildingBib: - Palette: bibs - HasMinibib: Yes - Turreted: - TurnSpeed: 12 - InitialFacing: 56 - -WithSpriteBody: - WithEmbeddedTurretSpriteBody: - Armament: - Weapon: cannonboulder - LocalOffset: 512,0,212 - MuzzleSequence: muzzle - AttackTurreted: - WithMuzzleOverlay: - -WithDeathAnimation: - RenderSprites: - Image: gunnew - PlayerPalette: raplayer - DetectCloaked: - Range: 3c0 - BodyOrientation: - QuantizedFacings: 32 - Selectable: - Bounds: 25,25,0,0 - SelectionDecorations: - ThrowsShrapnel@SMALL: - Weapons: SmallStone1, SmallStone2, LargeStone1 - Pieces: 2, 3 - Range: 0c512, 3c0 - Targetable@CombatRole: - TargetTypes: Defenses CSTLWLL: Inherits: ^Wall Inherits@Hitshape: ^1x1Shape diff --git a/mods/mw/rules/faction_shared/scaffolds_shared.yaml b/mods/mw/rules/faction_shared/scaffolds_shared.yaml index 073590d..946334c 100644 --- a/mods/mw/rules/faction_shared/scaffolds_shared.yaml +++ b/mods/mw/rules/faction_shared/scaffolds_shared.yaml @@ -236,125 +236,6 @@ SILOTWO.scaff: WithIdleOverlay@base6: Sequence: make6 RequiresCondition: Construct >= 8 -GTWNEW.scaff: - Inherits: ^1x1SITE - Inherits@Hitshape: ^1x1Shape - Armor: - Type: HeavyBuilding - RenderSprites: - PlayerPalette: raplayer - Image: gtwnew - CustomSellValue: - Value: 600 - Valued: - Cost: 1200 - Tooltip: - Name: Construction Site ( Guard Tower) - Buildable: - Description: A wooden tower, stationed with 2 archers.\n Strong vs Infantry, Light Cavalry\n Weak vs Siege weapons and Heavy Cavalry \n Cannot target Aircraft\n\n - BuildPaletteOrder: 60 - Queue: MMilitary.GDI, MMilitary.Nod - BuildDurationModifier: 60 - IconPalette: raicon - BuildDuration: 1000 - Health: - HP: 20000 - RevealsShroud: - Range: 4c0 - WithBuildingBib: - Palette: bibs - HasMinibib: Yes - Selectable: - Bounds: 24,48,0,-10 - SelectionDecorations: - WithSpriteBody: - RequiresCondition: inactive - DebugTransformOnCondition@Finsihed: - RequiresCondition: (Construct >= 8) - IntoActor: GTWNEW - ReadyAudio: - ConstructionProgress@Construct: - FullCapacity: 8 - WithIdleOverlay@base1: - Sequence: make1 - RequiresCondition: Construct > 1 && Construct < 3 - WithIdleOverlay@base2: - Sequence: make2 - RequiresCondition: Construct >= 3 && Construct < 4 - WithIdleOverlay@base3: - Sequence: make3 - RequiresCondition: Construct >= 4 && Construct < 5 - WithIdleOverlay@base4: - Sequence: make4 - RequiresCondition: Construct >= 5 && Construct < 6 - WithIdleOverlay@base5: - Sequence: make5 - RequiresCondition: Construct >= 6 && Construct < 7 - WithIdleOverlay@base6: - Sequence: make6 - RequiresCondition: Construct >= 7 - WithRangeCircle: - Range: 7c0 -GUNNEW.scaff: - Inherits: ^1x1SITE - Inherits@Hitshape: ^1x1Shape - Armor: - Type: HeavyBuilding - RenderSprites: - PlayerPalette: raplayer - Image: gunnew - CustomSellValue: - Value: 700 - Valued: - Cost: 1400 - Tooltip: - Name: Construction Site (Gunpowder Cannon) - Buildable: - Description: The early Cannon uses gunpowder to throw a large boulder. \nIt's most effectively used against large targets.\n Strong vs Cavalry and Spectral Units\n Weak vs Infantry\n\n - BuildPaletteOrder: 70 - Prerequisites: barracks - Queue: MMilitary.GDI, MMilitary.Nod - IconPalette: raicon - BuildDurationModifier: 40 - BuildDuration: 1200 - Health: - HP: 20000 - RevealsShroud: - Range: 4c0 - WithBuildingBib: - Palette: bibs - HasMinibib: Yes - Selectable: - Bounds: 25,25,0,0 - SelectionDecorations: - WithSpriteBody: - RequiresCondition: inactive - DebugTransformOnCondition@Finsihed: - RequiresCondition: (Construct >= 8) - IntoActor: GUNNEW - ReadyAudio: - ConstructionProgress@Construct: - FullCapacity: 8 - WithIdleOverlay@base1: - Sequence: make1 - RequiresCondition: Construct > 2 && Construct < 3 - WithIdleOverlay@base2: - Sequence: make2 - RequiresCondition: Construct >= 3 && Construct < 4 - WithIdleOverlay@base3: - Sequence: make3 - RequiresCondition: Construct >= 4 && Construct < 5 - WithIdleOverlay@base4: - Sequence: make4 - RequiresCondition: Construct >= 5 && Construct < 6 - WithIdleOverlay@base5: - Sequence: make5 - RequiresCondition: Construct >= 6 && Construct < 7 - WithIdleOverlay@base6: - Sequence: make6 - RequiresCondition: Construct >= 7 - WithRangeCircle: - Range: 7c0 CSTLWLL.scaff: Inherits: ^1x1SITEWALL Inherits@Hitshape: ^1x1Shape diff --git a/mods/mw/weapons/MWWeaponsranged.yaml b/mods/mw/weapons/MWWeaponsranged.yaml index d63b3f8..fab7e67 100644 --- a/mods/mw/weapons/MWWeaponsranged.yaml +++ b/mods/mw/weapons/MWWeaponsranged.yaml @@ -1136,7 +1136,7 @@ BowNArrowTower: Image: e4arrow Palette: ra Warhead@1Dam: SpreadDamage - Spread: 256 + Spread: 126 InvalidTargets: Wall, Air ValidTargets: Ground Damage: 2600 @@ -1145,10 +1145,10 @@ BowNArrowTower: Light: 75 Heavy: 65 Concrete: 15 - Knight: 15 - LightCavalry: 60 - MediumCavalry: 30 - HeavyCavalry: 12 + Knight: 25 + LightCavalry: 70 + MediumCavalry: 45 + HeavyCavalry: 25 HeavyBuilding: 35 Spectral: 15 DamageTypes: DefaultDeath @@ -1229,21 +1229,21 @@ CannonBoulder: LaunchAngle: 86 Palette: ra Warhead@1Dam: SpreadDamage - Spread: 128 - Damage: 9500 + Spread: 256 + Damage: 8500 ValidTargets: Ground InvalidTargets: Air Versus: - Leather: 20 - Light: 20 - Heavy: 20 - Concrete: 35 - Knight: 65 + Leather: 50 + Light: 40 + Heavy: 30 + Concrete: 20 + Knight: 35 LightCavalry: 100 MediumCavalry: 100 HeavyCavalry: 100 - HeavyBuilding: 45 - Spectral: 75 + HeavyBuilding: 40 + Spectral: 20 DamageTypes: DefaultDeath Warhead@2Smu: LeaveSmudge SmudgeType: Crater @@ -1449,7 +1449,7 @@ HighTribuchetBoulder: InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep StationBalistaAG: ReloadDelay: 45 - Range: 8c0 + Range: 7c0 MinRange: 1c0 Report: Balista01.aud TargetActorCenter: true @@ -1484,7 +1484,7 @@ StationBalistaAG: Explosions: smokey StationBalistaAA: ReloadDelay: 45 - Range: 10c0 + Range: 8c0 MinRange: 1c512 Report: Balista01.aud ValidTargets: Air @@ -1534,8 +1534,8 @@ SamBallista: Image: smbllbolt Palette: ra Warhead@1Dam: SpreadDamage - Spread: 512 - Damage: 3825 + Spread: 415 + Damage: 4000 ValidTargets: Air InvalidTargets: Ground Versus: