Merge branch 'master' into Mario/monsters

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

diff --git a/monsters.cfg b/monsters.cfg
index 05f6fca8a8f878a4460b767298dc760307b8d0d9..8fe16f3715e531a3d63f3b8e9d019e9e2c35c8f1 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -126,7 +126,7 @@ 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
@@ -170,7 +170,6 @@ 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
@@ -179,4 +178,5 @@ 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_armor_blockpercent 0.5
 // }}}