diff --git a/resources/assets/zscript/actors/hxdd/hexen2/players/assassinplayer.zs b/resources/assets/zscript/actors/hxdd/hexen2/players/assassinplayer.zs index 36ce686..022a6fe 100644 --- a/resources/assets/zscript/actors/hxdd/hexen2/players/assassinplayer.zs +++ b/resources/assets/zscript/actors/hxdd/hexen2/players/assassinplayer.zs @@ -6,29 +6,22 @@ class HX2AssassinPlayer : HXDDHexenIIPlayerPawn Default { - Health 100; - PainChance 255; - Radius 16; - Height 56; - Speed 1; +NOSKIN +NODAMAGETHRUST +PLAYERPAWN.NOTHRUSTWHENINVUL PainSound "Hexen2PlayerFemalePain"; RadiusDamageFactor 0.25; - Player.JumpZ 9; - Player.Viewheight 41; Player.SpawnClass "Assassin"; Player.DisplayName "Assassin"; Player.SoundClass "hexen2female"; Player.ScoreIcon "FITEFACE"; Player.HealRadiusType "Health"; + Player.JumpZ 9; + Player.Viewheight 41; Player.HexenArmor 10, 15, 25, 5, 20; //Player.StartItem "Mana1"; //Player.StartItem "Mana2"; Player.StartItem "AWeapPunchDagger"; - Player.ForwardMove 1.08, 1.2; - Player.SideMove 1.125, 1.475; Player.Portrait "P_FWALK1"; Player.WeaponSlot 1, "AWeapPunchDagger"; Player.WeaponSlot 2, "AWeapCrossbow"; diff --git a/resources/assets/zscript/actors/hxdd/hexen2/players/crusaderplayer.zs b/resources/assets/zscript/actors/hxdd/hexen2/players/crusaderplayer.zs index fa2edf5..43d55b0 100644 --- a/resources/assets/zscript/actors/hxdd/hexen2/players/crusaderplayer.zs +++ b/resources/assets/zscript/actors/hxdd/hexen2/players/crusaderplayer.zs @@ -4,23 +4,18 @@ class HX2CrusaderPlayer : HXDDHexenIIPlayerPawn { Default { - Health 100; - PainChance 255; - Radius 16; - Height 56; - Speed 1; +NOSKIN +NODAMAGETHRUST +PLAYERPAWN.NOTHRUSTWHENINVUL PainSound "Hexen2PlayerMalePain"; RadiusDamageFactor 0.25; - Player.JumpZ 9; - Player.Viewheight 41; Player.SpawnClass "Crusader"; Player.DisplayName "Crusader"; Player.SoundClass "hexen2male"; Player.ScoreIcon "FITEFACE"; Player.HealRadiusType "Armor"; + Player.JumpZ 9; + Player.Viewheight 41; Player.HexenArmor 10, 20, 15, 25, 5; //Player.StartItem "Mana1"; //Player.StartItem "Mana2"; diff --git a/resources/assets/zscript/actors/hxdd/hexen2/players/necromancerplayer.zs b/resources/assets/zscript/actors/hxdd/hexen2/players/necromancerplayer.zs index 564795c..8c1d566 100644 --- a/resources/assets/zscript/actors/hxdd/hexen2/players/necromancerplayer.zs +++ b/resources/assets/zscript/actors/hxdd/hexen2/players/necromancerplayer.zs @@ -6,31 +6,23 @@ class HX2NecromancerPlayer : HXDDHexenIIPlayerPawn { Default { - Health 100; - ReactionTime 0; - PainChance 255; - Radius 16; - Height 56; - Speed 1; +NOSKIN +NODAMAGETHRUST +PLAYERPAWN.NOTHRUSTWHENINVUL PainSound "Hexen2PlayerMalePain"; RadiusDamageFactor 0.25; - Player.JumpZ 9; - Player.Viewheight 41; Player.SpawnClass "Necromancer"; Player.DisplayName "Necromancer"; Player.SoundClass "hexen2male"; Player.ScoreIcon "MAGEFACE"; Player.InvulnerabilityMode "Reflective"; Player.HealRadiusType "Mana"; + Player.JumpZ 9; + Player.Viewheight 41; Player.HexenArmor 5, 5, 15, 10, 25; //Player.StartItem "Mana1"; //Player.StartItem "Mana2"; Player.StartItem "NWeapSickle"; - Player.ForwardMove 0.88, 0.92; - Player.SideMove 0.875, 0.925; Player.Portrait "P_MWALK1"; Player.WeaponSlot 1, "NWeapSickle"; Player.WeaponSlot 2, "NWeapMagicMissile"; diff --git a/resources/assets/zscript/actors/hxdd/hexen2/players/paladinplayer.zs b/resources/assets/zscript/actors/hxdd/hexen2/players/paladinplayer.zs index fb7d1da..44e7c87 100644 --- a/resources/assets/zscript/actors/hxdd/hexen2/players/paladinplayer.zs +++ b/resources/assets/zscript/actors/hxdd/hexen2/players/paladinplayer.zs @@ -2,23 +2,18 @@ class HX2PaladinPlayer : HXDDHexenIIPlayerPawn { Default { - Health 100; - PainChance 255; - Radius 16; - Height 56; - Speed 1; +NOSKIN +NODAMAGETHRUST +PLAYERPAWN.NOTHRUSTWHENINVUL PainSound "Hexen2PlayerMalePain"; RadiusDamageFactor 0.25; - Player.JumpZ 9; - Player.Viewheight 41; Player.SpawnClass "Paladin"; Player.DisplayName "Paladin"; Player.SoundClass "hexen2male"; Player.ScoreIcon "FITEFACE"; Player.HealRadiusType "Armor"; + Player.JumpZ 9; + Player.Viewheight 41; Player.HexenArmor 15, 25, 10, 20, 5; //Player.StartItem "Mana1"; //Player.StartItem "Mana2"; diff --git a/resources/assets/zscript/actors/hxdd/hexen2/players/succubusplayer.zs b/resources/assets/zscript/actors/hxdd/hexen2/players/succubusplayer.zs index 9006294..e387a30 100644 --- a/resources/assets/zscript/actors/hxdd/hexen2/players/succubusplayer.zs +++ b/resources/assets/zscript/actors/hxdd/hexen2/players/succubusplayer.zs @@ -4,29 +4,22 @@ class HX2SuccubusPlayer : HXDDHexenIIPlayerPawn { Default { - Health 100; - PainChance 255; - Radius 16; - Height 56; - Speed 1; +NOSKIN +NODAMAGETHRUST +PLAYERPAWN.NOTHRUSTWHENINVUL PainSound "Hexen2PlayerFemalePain"; RadiusDamageFactor 0.25; - Player.JumpZ 9; - Player.Viewheight 48; Player.SpawnClass "Succubus"; Player.DisplayName "Demoness"; Player.SoundClass "hexen2female"; Player.ScoreIcon "FITEFACE"; Player.HealRadiusType "Health"; + Player.JumpZ 9; + Player.Viewheight 48; Player.HexenArmor 0, 5, 15, 10, 25; //Player.StartItem "Mana1"; //Player.StartItem "Mana2"; Player.StartItem "SWeapBloodRain"; - Player.ForwardMove 0.88, 0.92; - Player.SideMove 0.875, 0.925; Player.Portrait "P_FWALK1"; Player.WeaponSlot 1, "SWeapBloodRain"; Player.WeaponSlot 2, "SWeapAcidRune"; diff --git a/resources/assets/zscript/actors/hxdd/shared/player/hxddplayerpawn.zs b/resources/assets/zscript/actors/hxdd/shared/player/hxddplayerpawn.zs index 4df9cb1..2aed797 100644 --- a/resources/assets/zscript/actors/hxdd/shared/player/hxddplayerpawn.zs +++ b/resources/assets/zscript/actors/hxdd/shared/player/hxddplayerpawn.zs @@ -1,13 +1,4 @@ -class HXDDPlayerPawn : PlayerPawn { - override void BeginPlay() { - Super.BeginPlay(); - } - - virtual void OnExperienceBonus(double experience) {} - virtual void OnKill(Actor target, double experience) {} -} - -class HXDDHexenIIPlayerPawn : HXDDPlayerPawn { +class HXDDHexenIIPlayerPawn : PlayerPawn { // Arrays cannot be passed in a property due to limitations. String Weapon1AnimationSetClass; int Weapon1AnimationSetIndex; @@ -30,6 +21,16 @@ class HXDDHexenIIPlayerPawn : HXDDPlayerPawn { property HasJumpAnimation: HasJumpAnimation; Default { + Health 100; + PainChance 255; + Radius 16; + Height 56; + + //Speed (200.0 / 320.0); + Speed 1; + Player.ForwardMove 1, 1; + Player.SideMove 0.8, 0.8; + HXDDHexenIIPlayerPawn.HasJumpAnimation true; }