From c5fc703e55aee93a00a936a9c25b7ce5da3d6377 Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Tue, 31 Oct 2017 08:23:48 +0200 Subject: [PATCH] terrorscythe is using `MagicEffect*` now --- script/_default/items/terrorscythe.dat | 7 +++++++ src/game/gears/meleeweapon_terrorscythe.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/script/_default/items/terrorscythe.dat b/script/_default/items/terrorscythe.dat index 391ea1f..db0a978 100644 --- a/script/_default/items/terrorscythe.dat +++ b/script/_default/items/terrorscythe.dat @@ -21,6 +21,11 @@ terrorscythe /* meleeweapon-> */ WieldedBitmapPos = 176, 48; EnchantmentPlusChance = 2; DamageFlags = SLASH; + MagicEffect = PANIC; + MagicEffectChance == 3; // this is !(RAND()%3) + MagicEffectDuration = { add: 200; rand: 100; } + MagicMessageCanSee == "@Hsp scythe terrifies @Edd."; + MagicMessageCannotSee == "The scythe terrifies @Edd."; Config BROKEN; { @@ -28,5 +33,7 @@ terrorscythe /* meleeweapon-> */ BitmapPos = 64, 128; WieldedBitmapPos = 160, 48; EnchantmentPlusChance = 4; + MagicEffectChance == 0; // broken items aren't magic + MagicEffect = 0; // just in case } } diff --git a/src/game/gears/meleeweapon_terrorscythe.cpp b/src/game/gears/meleeweapon_terrorscythe.cpp index 0a2b3a5..06d173e 100644 --- a/src/game/gears/meleeweapon_terrorscythe.cpp +++ b/src/game/gears/meleeweapon_terrorscythe.cpp @@ -1,14 +1,15 @@ #ifdef HEADER_PHASE ITEM(terrorscythe, meleeweapon) { - public: - virtual truth HitEffect(character*, character*, v2, int, int, truth); +//public: + //virtual truth HitEffect(character*, character*, v2, int, int, truth); }; #else +/* truth terrorscythe::HitEffect (character *Enemy, character* Hitter, v2 HitPos, int BodyPartIndex, int Direction, truth BlockedByArmour) { truth BaseSuccess = meleeweapon::HitEffect(Enemy, Hitter, HitPos, BodyPartIndex, Direction, BlockedByArmour); if (!IsBroken() && Enemy->IsEnabled() && !(RAND() % 3)) { @@ -26,6 +27,7 @@ truth terrorscythe::HitEffect (character *Enemy, character* Hitter, v2 HitPos, i } return BaseSuccess; } +*/ #endif -- 2.11.4.GIT