Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / monsters.cfg

diff --git a/monsters.cfg b/monsters.cfg
index 55c1667157730e4ce98069ade87de433caf9a757..8fe16f3715e531a3d63f3b8e9d019e9e2c35c8f1 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -4,8 +4,8 @@ set g_monster_brute_attack_grenade_damage 40
 set g_monster_brute_attack_grenade_edgedamage 20
 set g_monster_brute_attack_grenade_force 15
 set g_monster_brute_attack_grenade_radius 200
-set g_monster_brute_attack_grenade_speed 1900
-set g_monster_brute_attack_grenade_speed_up 225
+set g_monster_brute_attack_grenade_speed 1400
+set g_monster_brute_attack_grenade_speed_up 150
 set g_monster_brute_attack_uzi_bullets 3
 set g_monster_brute_attack_uzi_chance 0.1
 set g_monster_brute_attack_uzi_damage 10
@@ -109,16 +109,24 @@ set g_monster_mage_attack_grenade_speed 150
 set g_monster_mage_attack_grenade_speed_up 95
 set g_monster_mage_attack_melee_damage 30
 set g_monster_mage_attack_melee_delay 0.7
+set g_monster_mage_attack_spike_accel 400
 set g_monster_mage_attack_spike_damage 30
+set g_monster_mage_attack_spike_decel 400
 set g_monster_mage_attack_spike_delay 2
 set g_monster_mage_attack_spike_radius 60
+set g_monster_mage_attack_spike_smart 1
+set g_monster_mage_attack_spike_smart_mindist 600
+set g_monster_mage_attack_spike_smart_trace_max 2500
+set g_monster_mage_attack_spike_smart_trace_min 1000
+set g_monster_mage_attack_spike_speed_max 370
+set g_monster_mage_attack_spike_turnrate 0.65
 set g_monster_mage_heal_allies 15
 set g_monster_mage_heal_delay 1.5
 set g_monster_mage_heal_minhealth 250
 set g_monster_mage_heal_range 200
 set g_monster_mage_heal_self 35
 set g_monster_mage_health 200
-set g_monster_mage_shield_blockpercent 40
+set g_monster_mage_shield_blockpercent 0.8
 set g_monster_mage_shield_delay 7
 set g_monster_mage_shield_time 3
 set g_monster_mage_speed_run 75
@@ -162,17 +170,13 @@ set g_monsters_owners 1
 set g_monsters_teams 1
 set g_monsters_spawnshieldtime 2
 set g_monsters_typefrag 1
-set g_monsters_healthbars 1
 set g_monsters_target_range 2000
 set g_monsters_target_infront 0
+set g_monsters_attack_range 120
 set g_monsters_respawn 1
 set g_monsters_respawn_delay 20
 set g_monsters_score_kill 1
 set g_monsters_max 20
 set g_monsters_max_perplayer 0
-set g_monsters_skill_easy 2
-set g_monsters_skill_normal 4
-set g_monsters_skill_hard 5
-set g_monsters_skill_insane 7
-set g_monsters_skill_nightmare 10
+set g_monsters_armor_blockpercent 0.5
 // }}}