← Back to branch summary

~armagetronad-ap/armagetronad/BattleMania

« back to all changes in this revision

Viewing changes to src/special/attack/interact.php

  • Committer: zodiacsohma1 at gmail
  • Date: 2014-02-18 03:47:30 UTC
  • Revision ID: zodiacsohma1@gmail.com-20140218034730-ab9n3fc1u1oflwow
Updated battle_mania.cfg and mode_2.cfg with improved settings.
Fixed the mistake with attacks.php in showing the list of all attacks to users.
Added a attack trigger to ensure attacks will not interact with team-mates.
Fixed the mistake in the game mode counter (was 3 rounds instead of 2).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/special/attack/interact.php
74
74
            if (($killed_record->experience->level <= 15) && ($killer_record->experience->level > 50)) return;
75
75
        }
76
76
 
77
 
        if (Base::$base->game_mode == 3)
 
77
        if (Base::$base->game_mode == 2)    //  stop attacks between team mates during CTF mode
 
78
        {
 
79
            if ($attacker->team == $target->team)
 
80
                return;
 
81
        }
 
82
        elseif (Base::$base->game_mode == 3)
 
83
        {
78
84
            if (KillTheKingInteract($attacker, $target->player, $attack))
79
85
                return;
 
86
        }
80
87
 
81
88
        switch ($attack->log)
82
89
        {