Merge branch 'master' into Mario/monsters

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

diff --git a/monsters.cfg b/monsters.cfg
index 7423a323ef78e1ccc6523d9e6f37686e4c572567..65890643f28a0ae8a4329e8d45d87564b33b6957 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -1,6 +1,6 @@
 // Misc
 set g_monsters 1 "Enable monsters (master switch)"
-set g_monsters_think_delay 0.2 "Delay between monster think frames"
+set g_monsters_think_delay 0.1 "Delay between monster think frames"
 set g_monsters_skill 1 "Monster skill (affecting some of their attributes). 1 - easy, 2 - medium, 3 - hard, 4 - insane, 5 - nightmare"
 set g_monsters_miniboss_chance 5
 set g_monsters_miniboss_healthboost 100
@@ -25,7 +25,6 @@ set g_monsters_skill_normal 4 "Monster normal skill level (used for skill based
 set g_monsters_skill_hard 5 "Monster hard skill level (used for skill based functions)"
 set g_monsters_skill_insane 7 "Monster insane skill level (used for skill based functions)"
 set g_monsters_skill_nightmare 10 "Monster nightmare skill level (used for skill based functions)"
-set g_monsters_spawn_list "brute animus shambler bruiser wyvern cerberus slime knight stingray mage zombie spider" "monsters not listed here will spawn as bruisers"
 
 // Brute
 set g_monster_brute 1 "Enable Brutes"
@@ -145,7 +144,7 @@ set g_monster_stingray_speed_run 70 "Stingray run speed"
 
 // Mage
 set g_monster_mage 1 "Enable Mages"
-set g_monster_mage_health 400 "Mage health"
+set g_monster_mage_health 200 "Mage health"
 set g_monster_mage_drop health "Mage drops this item on death"
 set g_monster_mage_drop_size medium "Size of the item Mages drop. Possible values are: small, medium, large"
 set g_monster_mage_speed 50 "Mage move speed"
@@ -154,7 +153,7 @@ set g_monster_mage_attack_spike_radius 60 "Mage homing spike explosion radius"
 set g_monster_mage_attack_spike_delay 2 "Delay between Mage homing spike attacks"
 set g_monster_mage_attack_melee_damage 30 "Mage magic attack damage"
 set g_monster_mage_attack_melee_delay 0.7 "Delay between Mage melee attacks"
-set g_monster_mage_heal_self 50 "Amount of health Mage will regenerate every attack when its low on health"
+set g_monster_mage_heal_self 35 "Amount of health Mage will regenerate every attack when its low on health"
 set g_monster_mage_heal_friends 15 "Amount of health Mage will regenerate nearby friends"
 set g_monster_mage_heal_minhealth 250 "Health limit below which Mage will try to heal itself"
 set g_monster_mage_heal_range 200 "Maximum healing distance"