From cd156475945bfc973ae9e7b188f99927b7bc4963 Mon Sep 17 00:00:00 2001 From: devapromix Date: Thu, 15 Jul 2021 16:31:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BB=D0=B8=D0=B4=D0=B5=D1=80=20=D0=9B=D0=BE=D1=80?= =?UTF-8?q?=D0=B4.=20Fixed=20#20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/DisciplesRL.Creatures.pas | 42 ++++++++++++++++++++--- sources/Scenes/DisciplesRL.Scene.Hire.pas | 2 +- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/sources/DisciplesRL.Creatures.pas b/sources/DisciplesRL.Creatures.pas index b7ea8b8..592598c 100644 --- a/sources/DisciplesRL.Creatures.pas +++ b/sources/DisciplesRL.Creatures.pas @@ -78,6 +78,8 @@ interface crArchmage, // The Empire Thief Leader crThief, + // The Empire Lord Leader + crWarlord, // The Empire Fighters crSquire, // The Empire Ranged Attack Units @@ -97,6 +99,8 @@ interface crLichQueen, // Undead Hordes Thief Leader crThug, + // Undead Hordes Lord Leader + crDominator, // Undead Hordes Fighters crFighter, // Undead Hordes Ranged Attack Units @@ -116,6 +120,8 @@ interface crArchDevil, // Legions Of The Damned Thief Leader crRipper, + // Legions Of The Damned Lord Leader + crChieftain, // Legions Of The Damned Fighters crPossessed, // Legions Of The Damned Ranged Attack Units @@ -151,6 +157,7 @@ interface LeaderScout: set of TCreatureEnum = [crRanger, crNosferat, crCounselor]; LeaderMage: set of TCreatureEnum = [crArchmage, crLichQueen, crArchDevil]; LeaderThief: set of TCreatureEnum = [crThief, crThug, crRipper]; + LeaderLord: set of TCreatureEnum = [crWarlord, crDominator, crChieftain]; type TReachEnum = (reAny, reAdj, reAll); @@ -167,7 +174,7 @@ interface TRaceCharGroup = (cgGuardian, cgLeaders, cgCharacters); type - TRaceCharKind = (ckWarrior, ckScout, ckMage, ckThief, ck1, ck2); + TRaceCharKind = (ckWarrior, ckScout, ckMage, ckThief, ckLord, ck2); type TLeaderWarriorActVar = (avRest, avRitual, avWar3); @@ -197,21 +204,21 @@ interface // The Empire Capital Guardian ((crNone, crNone, crMyzrael, crNone, crNone, crNone), // The Empire Leaders - (crPegasusKnight, crRanger, crArchmage, crThief, crNone, crNone), // ), + (crPegasusKnight, crRanger, crArchmage, crThief, crWarlord, crNone), // ), // The Empire Characters (crSquire, crArcher, crAcolyte, crApprentice, crNone, crNone)), // // // Undead Hordes Capital Guardian ((crNone, crNone, crAshgan, crNone, crNone, crNone), // Undead Hordes Leaders - (crDeathKnight, crNosferat, crLichQueen, crThug, crNone, crNone), // + (crDeathKnight, crNosferat, crLichQueen, crThug, crDominator, crNone), // // Undead Hordes Characters (crFighter, crGhost, crInitiate, crWyvern, crNone, crNone)), // // // Legions Of The Damned Capital Guardian ((crNone, crNone, crAshkael, crNone, crNone, crNone), // Legions Of The Damned Leaders - (crDuke, crCounselor, crRipper, crArchDevil, crNone, crNone), // + (crDuke, crCounselor, crRipper, crArchDevil, crChieftain, crNone), // // Legions Of The Damned Characters (crPossessed, crGargoyle, crDevil, crCultist, crNone, crNone)) // // @@ -553,6 +560,15 @@ implementation Damage: 30; Armor: 0; Heal: 0; SourceEnum: seWeapon; ReachEnum: reAny; Gold: 0; Sound: (mmHumHit, mmHumDeath, mmDaggerAttack); Gender: cgMale; AttackEnum: atDagger;), + // Warlord + (Race: reTheEmpire; SubRace: reHuman; ResEnum: reArchmage; Size: szSmall; + Name: ('Полководец', 'Полководца'); + Description: ('Полевой полководец короля служит', + 'Империи верой и правдой и беспощад-', 'но расправляется с ее врагами.'); + HitPoints: 120; Initiative: 55; ChancesToHit: 80; Leadership: 1; Level: 1; + Damage: 40; Armor: 0; Heal: 0; SourceEnum: seWeapon; ReachEnum: reAdj; + Gold: 0; Sound: (mmHumHit, mmHumDeath, mmSwordAttack); Gender: cgMale; + AttackEnum: atLongSword;), // Squire (Race: reTheEmpire; SubRace: reHuman; ResEnum: reSquire; Size: szSmall; Name: ('Сквайр', 'Сквайра'); @@ -639,6 +655,15 @@ implementation SourceEnum: seWeapon; ReachEnum: reAny; Gold: 0; Sound: (mmHumHit, mmHumDeath, mmDaggerAttack); Gender: cgMale; AttackEnum: atDaggerOfShadows;), + // Dominator + (Race: reUndeadHordes; SubRace: reUndead; ResEnum: reArchmage; + Size: szSmall; Name: ('Доминатор', 'Доминатораа'); + Description: ('Погибшие полководцы Империи возвра-', + 'щены Мортис к жизни для того, чтобы', 'сеять вокруг смерть и разрушения.'); + HitPoints: 125; Initiative: 50; ChancesToHit: 80; Leadership: 1; Level: 1; + Damage: 35; Armor: 0; Heal: 0; SourceEnum: seWeapon; ReachEnum: reAdj; + Gold: 0; Sound: (mmHumHit, mmHumDeath, mmSwordAttack); Gender: cgMale; + AttackEnum: atLongSword;), // Fighter (Race: reUndeadHordes; SubRace: reUndead; ResEnum: reSquire; Size: szSmall; Name: ('Воин', 'Воина'); Description: ('Услышав зов Мортис, безропотно', @@ -720,6 +745,15 @@ implementation Armor: 0; Heal: 0; SourceEnum: seWeapon; ReachEnum: reAny; Gold: 0; Sound: (mmHumHit, mmHumDeath, mmDaggerAttack); Gender: cgMale; AttackEnum: atFireDagger;), + // Chieftain + (Race: reLegionsOfTheDamned; SubRace: reHeretic; ResEnum: reArchmage; + Size: szSmall; Name: ('Атаман', 'Атамана'); + Description: ('Яростные Атаманы всегда идут впереди', + 'отрядов демонов и ведут адские', 'когорты в бой.'); HitPoints: 110; + Initiative: 50; ChancesToHit: 80; Leadership: 1; Level: 1; Damage: 45; + Armor: 0; Heal: 0; SourceEnum: seWeapon; ReachEnum: reAdj; Gold: 0; + Sound: (mmHumHit, mmHumDeath, mmSwordAttack); Gender: cgMale; + AttackEnum: atLongSword;), // Possessed (Race: reLegionsOfTheDamned; SubRace: reHeretic; ResEnum: reSquire; Size: szSmall; Name: ('Одержимый', 'Одержимого'); diff --git a/sources/Scenes/DisciplesRL.Scene.Hire.pas b/sources/Scenes/DisciplesRL.Scene.Hire.pas index cd0dc31..5ac0579 100644 --- a/sources/Scenes/DisciplesRL.Scene.Hire.pas +++ b/sources/Scenes/DisciplesRL.Scene.Hire.pas @@ -1222,7 +1222,7 @@ procedure TSceneHire.Update(var Key: Word); case SubScene of stLeader, stCharacter: begin - FF := CurrentIndex in [0 .. 3]; + FF := CurrentIndex in [0 .. 4]; case Key of K_ESCAPE: Back;