Merge branch 'master' into Mario/monsters

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

diff --git a/monsters.cfg b/monsters.cfg
index 1c87a716da1773d8dcbcac3a15e603464bcc59d7..054bd8a0cb425f5cff5ec8d54b456255fcf14d47 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -68,21 +68,21 @@ set g_monster_wyvern_speed_stop 300
 set g_monster_wyvern_speed_walk 120
 // }}}
 // {{{ #5: Shambler
-set g_monster_shambler_attack_claw_damage 60
-set g_monster_shambler_attack_lightning_damage 25
-set g_monster_shambler_attack_lightning_damage_zap 15
-set g_monster_shambler_attack_lightning_force 100
-set g_monster_shambler_attack_lightning_radius 50
-set g_monster_shambler_attack_lightning_radius_zap 250
-set g_monster_shambler_attack_lightning_speed 1000
-set g_monster_shambler_attack_lightning_speed_up 150
-set g_monster_shambler_attack_smash_damage 50
-set g_monster_shambler_attack_smash_range 0
-set g_monster_shambler_damageforcescale 0.100000001
-set g_monster_shambler_health 650
-set g_monster_shambler_speed_run 320
-set g_monster_shambler_speed_stop 300
-set g_monster_shambler_speed_walk 150
+set g_monster_golem_attack_claw_damage 60
+set g_monster_golem_attack_lightning_damage 25
+set g_monster_golem_attack_lightning_damage_zap 15
+set g_monster_golem_attack_lightning_force 100
+set g_monster_golem_attack_lightning_radius 50
+set g_monster_golem_attack_lightning_radius_zap 250
+set g_monster_golem_attack_lightning_speed 1000
+set g_monster_golem_attack_lightning_speed_up 150
+set g_monster_golem_attack_smash_damage 50
+set g_monster_golem_attack_smash_range 0
+set g_monster_golem_damageforcescale 0.100000001
+set g_monster_golem_health 650
+set g_monster_golem_speed_run 320
+set g_monster_golem_speed_stop 300
+set g_monster_golem_speed_walk 150
 // }}}
 
 // {{{ Misc
@@ -96,6 +96,7 @@ set g_monsters_drop_time 10
 set g_monsters_ignoretraces 1
 set g_monsters_lineofsight 1
 set g_monsters_owners 1
+set g_monsters_playerclip_collisions 0
 set g_monsters_teams 1
 set g_monsters_score_kill 0
 set g_monsters_score_spawned 0
@@ -111,4 +112,7 @@ set g_monsters_respawn_delay 20
 set g_monsters_max 20
 set g_monsters_max_perplayer 0
 set g_monsters_armor_blockpercent 0.5
+set g_monsters_damageforcescale 0.8
+set g_monsters_quake_resize 1
+set g_monsters_healthbars 0
 // }}}