diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-14 00:26:49 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-14 00:26:49 -0600 |
| commit | 39ccb932b39ec342ce940fc990ed09052f81b7eb (patch) | |
| tree | d532de9fd8fffe36fc1aa6b421ba0a6de5676c05 /world/map/conf/magic-procedures.sex | |
| parent | 10846f235e6c3a531f1b4691785556b5d5ac68cd (diff) | |
| parent | 29ddbded7eb9666df30e67f25fcbee467bbd124f (diff) | |
| download | serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.tar.gz serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.tar.bz2 serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.tar.xz serverdata-39ccb932b39ec342ce940fc990ed09052f81b7eb.zip | |
Merge pull request #203 from mekolat/fightclub-fix
Fightclub fix
Diffstat (limited to 'world/map/conf/magic-procedures.sex')
| -rw-r--r-- | world/map/conf/magic-procedures.sex | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/world/map/conf/magic-procedures.sex b/world/map/conf/magic-procedures.sex index e9ec7aae..e510ec3f 100644 --- a/world/map/conf/magic-procedures.sex +++ b/world/map/conf/magic-procedures.sex @@ -280,26 +280,35 @@ (PROCEDURE install_melee_spell (charges base_delay attack_animation) (CALL install_attack_spell charges base_delay 1 attack_animation)) -(PROCEDURE fightclub_check (healing) +(PROCEDURE fightclub_check (onSelf onTarget) (IF (&& (is_in (location caster) (@+ (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) - (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) - (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")))) + (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1) + (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1))) (|| (== (script_int caster "$@Duel_NoMagic") 1) (!= (script_int caster "@Duel_Fighter") 1))) (ABORT)) - (IF (== healing 1) + (IF (== onSelf 1) (IF (&& (== (substr (location caster) 2 5) "009-7") (not (is_in (location caster) (@+ (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) - (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) - (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")))))) + (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1) + (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1))))) + (ABORT))) + (IF (== onTarget 1) + (IF (&& + (!= (pc target) caster) + (is_in (location (pc target)) + (@+ + (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) + (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 1) + (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 1)))) (ABORT)))) (PROCEDURE summon_spell (mob_id count delay lifetime control_level school) @@ -312,8 +321,8 @@ (is_in (location caster) (@+ (@ "009-7.gat" (- (script_int caster "$@fightclub_x1") 2) (- (script_int caster "$@fightclub_y1") 2)) - (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 2) - (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 2))) 1 2)) + (+ (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) 5) + (+ (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")) 5))) 1 2)) caster mob_id (if_then_else |