Merge branch 'master' into Mario/monsters

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

diff --git a/monsters.cfg b/monsters.cfg
index fd9e198f65f23683cd708795c4bef334e0fc07f6..78adbcfa611c4f345c08442bc28d6d75d888da13 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -25,24 +25,24 @@ 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 "ogre animus shambler bruiser wyvern cerberus slime knight fish mage zombie spider" "monsters not listed here will spawn as bruisers"
+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"
 
-// Ogre
-set g_monster_ogre 1 "Enable Ogres"
-set g_monster_ogre_health 200 "Ogre health"
-set g_monster_ogre_chainsaw_damage 15 "Ogre chainsaw damage (hits multiple times)"
-set g_monster_ogre_drop ammo "Ogre drops this item on death"
-set g_monster_ogre_drop_size bullets "Size of the item Ogres drop. Possible values are: small, medium, large"
-set g_monster_ogre_speed_walk 100 "Ogre walk speed"
-set g_monster_ogre_speed_run 150 "Ogre run speed"
-set g_monster_ogre_attack_uzi_bullets 3 "Number of machine gun bullets Ogre fires"
-set g_monster_ogre_attack_uzi_chance 0.1 "Chance for Ogre to fire machine gun"
-set g_monster_ogre_attack_uzi_damage 10 "Ogre machine gun damage per bullet"
-set g_monster_ogre_attack_uzi_force 5 "Ogre machine gun knockback"
-set g_monster_ogre_attack_grenade_damage 50 "Ogre grenade damage"
-set g_monster_ogre_attack_grenade_edgedamage 25 "Ogre grenade indirect hit damage"
-set g_monster_ogre_attack_grenade_radius 200 "Ogre grenade explosion radius"
-set g_monster_ogre_attack_grenade_force 15 "Ogre grenade knockback"
+// Brute
+set g_monster_brute 1 "Enable Brutes"
+set g_monster_brute_health 200 "Brute health"
+set g_monster_brute_chainsaw_damage 15 "Brute chainsaw damage (hits multiple times)"
+set g_monster_brute_drop ammo "Brute drops this item on death"
+set g_monster_brute_drop_size bullets "Size of the item Brutes drop. Possible values are: small, medium, large"
+set g_monster_brute_speed_walk 100 "Brute walk speed"
+set g_monster_brute_speed_run 150 "Brute run speed"
+set g_monster_brute_attack_uzi_bullets 3 "Number of machine gun bullets Brute fires"
+set g_monster_brute_attack_uzi_chance 0.1 "Chance for Brute to fire machine gun"
+set g_monster_brute_attack_uzi_damage 10 "Brute machine gun damage per bullet"
+set g_monster_brute_attack_uzi_force 5 "Brute machine gun knockback"
+set g_monster_brute_attack_grenade_damage 50 "Brute grenade damage"
+set g_monster_brute_attack_grenade_edgedamage 25 "Brute grenade indirect hit damage"
+set g_monster_brute_attack_grenade_radius 200 "Brute grenade explosion radius"
+set g_monster_brute_attack_grenade_force 15 "Brute grenade knockback"
 
 // Animus
 set g_monster_animus 1 "Enable Animuses"
@@ -90,7 +90,7 @@ set g_monster_wyvern_fireball_radius 70 "Wyvern fireball projectile damage radiu
 set g_monster_wyvern_fireball_speed 400 "Wyvern fireball projectile speed"
 
 // Cerberus
-set g_monster_cerberus 1 "Enable Cerberuss"
+set g_monster_cerberus 1 "Enable Cerberuses"
 set g_monster_cerberus_health 25 "Cerberus health"
 set g_monster_cerberus_bite_damage 15 "Cerberus bite attack damage"
 set g_monster_cerberus_attack_jump_damage 30 "Cerberus jump attack damage"
@@ -134,14 +134,14 @@ set g_monster_knight_spike_chance 0.5 "Knight spike attack chance"
 set g_monster_knight_speed_walk 75 "Knight walk speed"
 set g_monster_knight_speed_run 150 "Knight run speed"
 
-// Rotfish
-set g_monster_fish 1 "Enable Rotfish"
-set g_monster_fish_health 25 "Rotfish health"
-set g_monster_fish_damage 10 "Rotfish bite attack damage"
-set g_monster_fish_drop health "Rotfish drops this item on death"
-set g_monster_fish_drop_size small "Size of the item Rotfish drop. Possible values are: small, medium, large"
-set g_monster_fish_speed_walk 40 "Rotfish walk speed"
-set g_monster_fish_speed_run 70 "Rotfish run speed"
+// Stingray
+set g_monster_stingray 1 "Enable Stingray"
+set g_monster_stingray_health 25 "Stingray health"
+set g_monster_stingray_damage 10 "Stingray bite attack damage"
+set g_monster_stingray_drop health "Stingray drops this item on death"
+set g_monster_stingray_drop_size small "Size of the item Stingray drop. Possible values are: small, medium, large"
+set g_monster_stingray_speed_walk 40 "Stingray walk speed"
+set g_monster_stingray_speed_run 70 "Stingray run speed"
 
 // Mage
 set g_monster_mage 1 "Enable Mages"