From: Mario Date: Wed, 28 Aug 2013 20:51:15 +0000 (+1000) Subject: Replace monsters config with a modified dumped config X-Git-Tag: xonotic-v0.8.0~241^2^2~152 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a441b45f695bcb5fd52a81c84d134a341d1d4166;p=xonotic%2Fxonotic-data.pk3dir.git Replace monsters config with a modified dumped config --- diff --git a/monsters.cfg b/monsters.cfg index a8fdef1a9..a2a77a508 100644 --- a/monsters.cfg +++ b/monsters.cfg @@ -1,200 +1,217 @@ -// Misc -set g_monsters 1 "Enable monsters (master switch)" -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 -set g_monsters_forcedrop 0 "Force all monsters to drop this item on death. Use g_monsters_drop_* cvars to change forced drop item" -set g_monsters_drop_time 10 "Amount of time before monster's dropped loot disappears" -set g_monsters_drop_type armor "Type of item to drop when forced. Possible values are: health, armor, ammo" -set g_monsters_drop_size medium "Size of the item monsters drop. Possible health/amor values are: small, medium, large. Possible ammo values are: shells, bullets, cells, rockets" -set g_monsters_owners 1 "Monsters will not attack their owners in team matches if set to 1" -set g_monsters_teams 1 -set g_monsters_spawnshieldtime 2 "Monsters will not take damage for this amount of seconds" -set g_monsters_typefrag 1 -set g_monsters_healthbars 1 "Show health bars above monsters" -set g_monsters_target_range 2000 -set g_monsters_target_infront 0 "Only find targets infront of the monster" -set g_monsters_respawn 1 "Enable monster respawning" -set g_monsters_respawn_delay 20 "Monsters respawn in this amount of seconds" -set g_monsters_score_kill 1 "Get this many points for killing a naturally spawned monster" -set g_monsters_max 20 "Global maximum player-spawned monsters" -set g_monsters_max_perplayer 0 "Maximum monsters per-player" -set g_monsters_skill_easy 2 "Monster easy skill level (used for skill based functions)" -set g_monsters_skill_normal 4 "Monster normal skill level (used for skill based functions)" -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)" - -// Brute -set g_monster_brute_health 300 "Brute health" -set g_monster_brute_attack_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 200 "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 40 "Brute grenade damage" -set g_monster_brute_attack_grenade_edgedamage 20 "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" +// {{{ #1: Brute +set g_monster_brute_attack_chainsaw_damage 15 +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_z 0 -set g_monster_brute_attack_grenade_spread 0 +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 +set g_monster_brute_attack_uzi_force 5 +set g_monster_brute_health 300 +set g_monster_brute_speed_run 200 +set g_monster_brute_speed_stop 300 +set g_monster_brute_speed_walk 100 -// Animus -set g_monster_animus_health 150 "Animus health" -set g_monster_animus_attack_jump_damage 80 "Animus jump attack damage" -set g_monster_animus_attack_melee_damage 45 "Animus melee attack damage" -set g_monster_animus_drop health "Animus drops this item on death" -set g_monster_animus_drop_size medium "Size of the item Animuses drop. Possible values are: small, medium, large" -set g_monster_animus_speed_walk 150 "Animus walk speed" -set g_monster_animus_speed_run 350 "Animus run speed" +set g_monster_brute_drop ammo +set g_monster_brute_drop_size bullets +// }}} +// {{{ #2: Animus +set g_monster_animus_attack_jump_damage 80 +set g_monster_animus_attack_melee_damage 45 +set g_monster_animus_health 150 +set g_monster_animus_speed_run 350 +set g_monster_animus_speed_stop 100 +set g_monster_animus_speed_walk 150 -// Shambler -set g_monster_shambler_health 500 "Shambler health" -set g_monster_shambler_attack_smash_damage 50 "Shambler smash attack damage" -set g_monster_shambler_attack_lightning_damage 15 "Shambler lightning attack damage per frame" -set g_monster_shambler_attack_claw_damage 50 "Shambler claw attack damage" -set g_monster_shambler_drop health "Shambler drops this item on death" -set g_monster_shambler_drop_size large "Size of the item Shamblers drop. Possible values are: small, medium, large" -set g_monster_shambler_speed_walk 100 "Shambler walk speed" -set g_monster_shambler_speed_run 150 "Shambler run speed" +set g_monster_animus_drop health +set g_monster_animus_drop_size medium +// }}} +// {{{ #3: Shambler +set g_monster_shambler_attack_claw_damage 50 +set g_monster_shambler_attack_lightning_damage 15 +set g_monster_shambler_attack_smash_damage 50 +set g_monster_shambler_health 500 +set g_monster_shambler_speed_run 150 +set g_monster_shambler_speed_stop 300 +set g_monster_shambler_speed_walk 100 -// Bruiser -set g_monster_bruiser_health 200 "Bruiser Health" -set g_monster_bruiser_drop armor "Bruiser drops this item on death" -set g_monster_bruiser_drop_size medium "Size of the item Bruisers drop. Possible values are: small, medium, large" -set g_monster_bruiser_attack_melee_damage 50 "Bruiser melee attack damage" -set g_monster_bruiser_speed_walk 40 "Bruiser walk speed" -set g_monster_bruiser_speed_run 360 "Bruiser run speed" +set g_monster_shambler_drop health +set g_monster_shambler_drop_size large +// }}} +// {{{ #4: Bruiser +set g_monster_bruiser_attack_melee_damage 50 +set g_monster_bruiser_health 200 +set g_monster_bruiser_speed_run 360 +set g_monster_bruiser_speed_stop 50 +set g_monster_bruiser_speed_walk 40 -// Wyvern -set g_monster_wyvern_health 95 "Wyvern health" -set g_monster_wyvern_drop ammo "Wyvern drops this item on death" -set g_monster_wyvern_drop_size cells "Size of the item Wyverns drop. Possible values are: small, medium, large" -set g_monster_wyvern_speed_stop 300 "Wyvern stop speed" -set g_monster_wyvern_speed_walk 40 "Wyvern walk speed" -set g_monster_wyvern_speed_run 120 "Wyvern run speed" -set g_monster_wyvern_attack_fireball_damagetime 3 "How long the enemy will burn if it's within fireball radius" -set g_monster_wyvern_attack_fireball_damage 30 "Wyvern fireball projectile damage" -set g_monster_wyvern_attack_fireball_edgedamage 20 "Wyvern fireball indirect hit damage" -set g_monster_wyvern_attack_fireball_force 50 "Wyvern fireball projectile push force" -set g_monster_wyvern_attack_fireball_radius 120 "Wyvern fireball projectile damage radius" -set g_monster_wyvern_attack_fireball_speed 900 "Wyvern fireball projectile speed" +set g_monster_bruiser_drop armor +set g_monster_bruiser_drop_size medium +// }}} +// {{{ #5: Wyvern +set g_monster_wyvern_attack_fireball_damage 30 +set g_monster_wyvern_attack_fireball_damagetime 3 +set g_monster_wyvern_attack_fireball_edgedamage 20 +set g_monster_wyvern_attack_fireball_force 50 +set g_monster_wyvern_attack_fireball_radius 120 +set g_monster_wyvern_attack_fireball_speed 900 +set g_monster_wyvern_health 95 +set g_monster_wyvern_speed_run 120 +set g_monster_wyvern_speed_stop 300 +set g_monster_wyvern_speed_walk 40 -// Cerberus -set g_monster_cerberus_health 100 "Cerberus health" -set g_monster_cerberus_attack_bite_damage 30 "Cerberus bite attack damage" -set g_monster_cerberus_attack_jump_damage 40 "Cerberus jump attack damage" -set g_monster_cerberus_drop health "Cerberus drops this item on death" -set g_monster_cerberus_drop_size small "Size of the item Cerberuss drop. Possible values are: small, medium, large" -set g_monster_cerberus_speed_walk 60 "Cerberus walk speed" -set g_monster_cerberus_speed_run 250 "Cerberus run speed" +set g_monster_wyvern_drop ammo +set g_monster_wyvern_drop_size cells +// }}} +// {{{ #6: Cerberus +set g_monster_cerberus_attack_bite_damage 30 +set g_monster_cerberus_attack_jump_damage 40 +set g_monster_cerberus_health 100 +set g_monster_cerberus_speed_run 250 +set g_monster_cerberus_speed_stop 50 +set g_monster_cerberus_speed_walk 60 -// Slime -set g_monster_slime_health 80 "Slime health" +set g_monster_cerberus_drop health +set g_monster_cerberus_drop_size small +// }}} +// {{{ #7: Slime set g_monster_slime_attack_explode_damage 250 -set g_monster_slime_drop ammo "Slime drops this item when it explodes" -set g_monster_slime_drop_size rockets "Size of the item Slime drops. Possible values are: small, medium, large" -set g_monster_slime_speed_walk 20 "Slime walk speed" -set g_monster_slime_speed_run 400 "Slime run speed" +set g_monster_slime_health 80 +set g_monster_slime_speed_run 400 +set g_monster_slime_speed_stop 20 +set g_monster_slime_speed_walk 20 -// Knight -set g_monster_knight_health 300 "Knight health" -set g_monster_knight_drop armor "Knight drops this item on death" -set g_monster_knight_drop_size medium "Size of the item Knights drop. Possible values are: small, medium, large" -set g_monster_knight_attack_inferno_damage 40 "Knight inferno damage" -set g_monster_knight_attack_inferno_chance 0.4 "Knight inferno attack chance" -set g_monster_knight_attack_inferno_damagetime 3 "How long the inferno should burn the player" -set g_monster_knight_attack_fireball_damage 30 "Knight fireball projectile damage" -set g_monster_knight_attack_fireball_edgedamage 10 "Knight fireball indirect hit damage" -set g_monster_knight_attack_fireball_force 50 "Knight fireball projectile push force" -set g_monster_knight_attack_fireball_radius 70 "Knight fireball projectile damage radius" -set g_monster_knight_attack_fireball_speed 600 "Knight fireball projectile speed" -set g_monster_knight_attack_fireball_spread 0 "Knight fireball projectile spread" -set g_monster_knight_attack_fireball_chance 0.3 "Chance for Knight to throw a fireball" +set g_monster_slime_drop ammo +set g_monster_slime_drop_size rockets +// }}} +// {{{ #8: Knight +set g_monster_knight_attack_fireball_chance 0.3 +set g_monster_knight_attack_fireball_damage 30 set g_monster_knight_attack_fireball_damagetime 1 -set g_monster_knight_attack_jump_chance 0.2 "Chance for Knight to jump at the player (always 1 if enemy is further than _dist)" -set g_monster_knight_attack_jump_damage 25 "Knight jump attack damage" -set g_monster_knight_attack_jump_distance 500 "Knight will prioritise jumping if the enemy is this far away" -set g_monster_knight_attack_melee_damage 20 "Knight melee attack damage" -set g_monster_knight_attack_spike_damage 20 "Knight spike projectile damage" -set g_monster_knight_attack_spike_edgedamage 10 "Knight spike projectile indirect hit damage" -set g_monster_knight_attack_spike_radius 20 "Knight spike projectile damage radius" -set g_monster_knight_attack_spike_force 5 "Knight spike projectile force" -set g_monster_knight_attack_spike_chance 0.5 "Knight spike attack chance" -set g_monster_knight_attack_speed_walk 75 "Knight walk speed" -set g_monster_knight_attack_speed_run 150 "Knight run speed" +set g_monster_knight_attack_fireball_edgedamage 10 +set g_monster_knight_attack_fireball_force 50 +set g_monster_knight_attack_fireball_radius 70 +set g_monster_knight_attack_inferno_chance 0.4 +set g_monster_knight_attack_inferno_damage 40 +set g_monster_knight_attack_inferno_damagetime 3 +set g_monster_knight_attack_jump_chance 0.2 +set g_monster_knight_attack_jump_damage 25 +set g_monster_knight_attack_jump_distance 500 +set g_monster_knight_attack_melee_damage 20 +set g_monster_knight_attack_spike_chance 0.5 +set g_monster_knight_attack_spike_damage 20 +set g_monster_knight_attack_spike_edgedamage 10 +set g_monster_knight_attack_spike_force 5 +set g_monster_knight_attack_spike_radius 20 +set g_monster_knight_health 300 +set g_monster_knight_speed_run 150 +set g_monster_knight_speed_stop 100 +set g_monster_knight_speed_walk 75 -// Stingray -set g_monster_stingray_health 115 "Stingray health" -set g_monster_stingray_attack_bite_damage 25 "Stingray bite attack damage" +set g_monster_knight_drop armor +set g_monster_knight_drop_size medium +// }}} +// {{{ #9: Stingray +set g_monster_stingray_attack_bite_damage 25 set g_monster_stingray_attack_bite_delay 0.5 -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_health 115 +set g_monster_stingray_speed_run 200 set g_monster_stingray_speed_stop 10 -set g_monster_stingray_speed_walk 40 "Stingray walk speed" -set g_monster_stingray_speed_run 200 "Stingray run speed" +set g_monster_stingray_speed_walk 40 + +set g_monster_stingray_drop health +set g_monster_stingray_drop_size small +// }}} +// {{{ #10: Mage +set g_monster_mage_attack_grenade_chance 30 +set g_monster_mage_attack_grenade_damage 25 +set g_monster_mage_attack_grenade_edgedamage 20 +set g_monster_mage_attack_grenade_force 170 +set g_monster_mage_attack_grenade_lifetime 5 +set g_monster_mage_attack_grenade_radius 100 +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_damage 30 +set g_monster_mage_attack_spike_delay 2 +set g_monster_mage_attack_spike_radius 60 +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_delay 7 +set g_monster_mage_shield_time 3 +set g_monster_mage_speed_run 75 +set g_monster_mage_speed_stop 50 +set g_monster_mage_speed_walk 50 -// Mage -set g_monster_mage_health 200 "Mage health" -set g_monster_mage_attack_spike_damage 30 "Mage homing spike explosion damage" -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 35 "Amount of health Mage will regenerate every attack when its low on health" -set g_monster_mage_heal_allies 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" -set g_monster_mage_heal_delay 1.5 "Delay between healing bursts" -set g_monster_mage_shield_blockpercent 40 "% of damage inflicted on Mage if using a force field" -set g_monster_mage_shield_delay 7 "Refire for Mage force shield" -set g_monster_mage_shield_time 3 "Amount of time Mage force field lasts" -set g_monster_mage_attack_grenade_damage 25 "Mage fake item grenade attack damage" -set g_monster_mage_attack_grenade_edgedamage 20 "Mage fake item grenade attack edge damage" -set g_monster_mage_attack_grenade_radius 100 "Mage fake item grenade attack explosion radius" -set g_monster_mage_attack_grenade_lifetime 5 "Mage fake item grenade life time" -set g_monster_mage_attack_grenade_speed 150 "Mage fake item grenade forward speed" -set g_monster_mage_attack_grenade_speed_up 95 "Mage fake item grenade upwards speed" -set g_monster_mage_attack_grenade_force 170 "Mage fake item grenade damage knockback" -set g_monster_mage_attack_grenade_chance 30 "% chance of Mage attack being fake item grenade" -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_walk 50 "Mage walk speed" -set g_monster_mage_speed_run 75 "Mage run speed" +set g_monster_mage_drop health +set g_monster_mage_drop_size medium +// }}} +// {{{ #11: Zombie +set g_monster_zombie_attack_leap_damage 50 +set g_monster_zombie_attack_leap_delay 1.5 +set g_monster_zombie_attack_leap_force 55 +set g_monster_zombie_attack_leap_speed 500 +set g_monster_zombie_attack_melee_damage 40 +set g_monster_zombie_attack_melee_delay 1.2 +set g_monster_zombie_health 150 +set g_monster_zombie_speed_run 400 +set g_monster_zombie_speed_stop 100 +set g_monster_zombie_speed_walk 150 -// Zombie -set g_monster_zombie_attack_leap_damage 50 "Damage when zombie performs an attack leap" -set g_monster_zombie_attack_leap_delay 1.5 "Delay after zombie attack leap" -set g_monster_zombie_attack_leap_force 55 "Force of zombie attack leap" -set g_monster_zombie_attack_leap_range 96 "Range of zombie attack leap" -set g_monster_zombie_attack_leap_speed 500 "The speed of a zombie attack leap" -set g_monster_zombie_attack_melee_damage 40 "Damage when zombie hits from a standing position" -set g_monster_zombie_attack_melee_delay 1.2 "Delay after a zombie hits from a standing position" -set g_monster_zombie_health 150 "Zombie health" -set g_monster_zombie_speed_walk 150 "Zombie walk speed" -set g_monster_zombie_speed_run 400 "Zombie run speed" -set g_monster_zombie_speed_stop 100 "Speed at which zombie stops" -set g_monster_zombie_drop health "Zombie drops this item on death" -set g_monster_zombie_drop_size large "Size of the item zombies drop. Possible values are: small, medium, large" +set g_monster_zombie_drop health +set g_monster_zombie_drop_size large +// }}} +// {{{ #12: Spider +set g_monster_spider_attack_bite_damage 35 +set g_monster_spider_attack_bite_delay 1.2 +set g_monster_spider_attack_type 0 +set g_monster_spider_attack_web_damagetime 2 +set g_monster_spider_attack_web_delay 1.5 +set g_monster_spider_attack_web_speed 1000 +set g_monster_spider_attack_web_speed_up 150 +set g_monster_spider_health 160 +set g_monster_spider_speed_run 400 +set g_monster_spider_speed_stop 100 +set g_monster_spider_speed_walk 150 -// Spider -set g_monster_spider_attack_type 0 "Spider attack type (0 = ice, 1 = fire, ...)" -set g_monster_spider_attack_bite_damage 35 "Damage when spider hits from a standing position" -set g_monster_spider_attack_bite_delay 1.2 "Delay after a spider hits from a standing position" -set g_monster_spider_attack_web_damagetime 2 "Spider fire attack burn time" -set g_monster_spider_attack_web_speed 1000 "Spider web fly speed" -set g_monster_spider_attack_web_speed_up 150 "Spider web upwards fly speed" -set g_monster_spider_attack_web_delay 1.5 "Delay after spider attack web" -set g_monster_spider_health 160 "Spider health" -set g_monster_spider_speed_walk 150 "Spider walk speed" -set g_monster_spider_speed_run 400 "Spider run speed" -set g_monster_spider_speed_stop 100 "Speed at which spider stops" -set g_monster_spider_drop health "Spider drops this item on death" -set g_monster_spider_drop_size large "Size of the item spiders drop. Possible values are: small, medium, large" +set g_monster_spider_drop health +set g_monster_spider_drop_size large +// }}} + +// {{{ Misc +set g_monsters 1 +set g_monsters_think_delay 0.1 +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 +set g_monsters_forcedrop 0 +set g_monsters_drop_time 10 +set g_monsters_drop_type armor "Type of item to drop when forced. Possible values are: health, armor, ammo" +set g_monsters_drop_size medium "Size of the item monsters drop. Possible health/amor values are: small, medium, large. Possible ammo values are: shells, bullets, cells, rockets" +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_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 +// }}} diff --git a/qcsrc/common/monsters/monster/animus.qc b/qcsrc/common/monsters/monster/animus.qc index 09bb41a5a..05abfe023 100644 --- a/qcsrc/common/monsters/monster/animus.qc +++ b/qcsrc/common/monsters/monster/animus.qc @@ -13,6 +13,7 @@ REGISTER_MONSTER( MON_ADD_CVAR(monster, health) \ MON_ADD_CVAR(monster, attack_jump_damage) \ MON_ADD_CVAR(monster, attack_melee_damage) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -92,7 +93,7 @@ float m_animus(float req) { case MR_THINK: { - monster_move(MON_CVAR(animus, speed_run), MON_CVAR(animus, speed_walk), 100, animus_anim_run, animus_anim_walk, animus_anim_stand); + monster_move(MON_CVAR(animus, speed_run), MON_CVAR(animus, speed_walk), MON_CVAR(animus, speed_stop), animus_anim_run, animus_anim_walk, animus_anim_stand); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/bruiser.qc b/qcsrc/common/monsters/monster/bruiser.qc index b7cd36fe5..ce23074cd 100644 --- a/qcsrc/common/monsters/monster/bruiser.qc +++ b/qcsrc/common/monsters/monster/bruiser.qc @@ -12,6 +12,7 @@ REGISTER_MONSTER( #define BRUISER_SETTINGS(monster) \ MON_ADD_CVAR(monster, health) \ MON_ADD_CVAR(monster, attack_melee_damage) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -74,7 +75,7 @@ float m_bruiser(float req) { case MR_THINK: { - monster_move(MON_CVAR(bruiser, speed_run), MON_CVAR(bruiser, speed_walk), 50, bruiser_anim_run, bruiser_anim_walk, bruiser_anim_stand); + monster_move(MON_CVAR(bruiser, speed_run), MON_CVAR(bruiser, speed_walk), MON_CVAR(bruiser, speed_stop), bruiser_anim_run, bruiser_anim_walk, bruiser_anim_stand); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/brute.qc b/qcsrc/common/monsters/monster/brute.qc index 5b6ad3e5a..d744166d8 100644 --- a/qcsrc/common/monsters/monster/brute.qc +++ b/qcsrc/common/monsters/monster/brute.qc @@ -22,6 +22,7 @@ REGISTER_MONSTER( MON_ADD_CVAR(monster, attack_grenade_radius) \ MON_ADD_CVAR(monster, attack_grenade_speed) \ MON_ADD_CVAR(monster, attack_grenade_speed_up) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -205,7 +206,7 @@ float m_brute(float req) { case MR_THINK: { - monster_move(MON_CVAR(brute, speed_run), MON_CVAR(brute, speed_walk), 300, brute_anim_run, brute_anim_walk, brute_anim_idle); + monster_move(MON_CVAR(brute, speed_run), MON_CVAR(brute, speed_walk), MON_CVAR(brute, speed_stop), brute_anim_run, brute_anim_walk, brute_anim_idle); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/cerberus.qc b/qcsrc/common/monsters/monster/cerberus.qc index e10ce3552..1b851d073 100644 --- a/qcsrc/common/monsters/monster/cerberus.qc +++ b/qcsrc/common/monsters/monster/cerberus.qc @@ -13,6 +13,7 @@ REGISTER_MONSTER( MON_ADD_CVAR(monster, health) \ MON_ADD_CVAR(monster, attack_bite_damage) \ MON_ADD_CVAR(monster, attack_jump_damage) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -85,7 +86,7 @@ float m_cerberus(float req) { case MR_THINK: { - monster_move(MON_CVAR(cerberus, speed_run), MON_CVAR(cerberus, speed_walk), 50, cerberus_anim_run, cerberus_anim_walk, cerberus_anim_idle); + monster_move(MON_CVAR(cerberus, speed_run), MON_CVAR(cerberus, speed_walk), MON_CVAR(cerberus, speed_stop), cerberus_anim_run, cerberus_anim_walk, cerberus_anim_idle); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/knight.qc b/qcsrc/common/monsters/monster/knight.qc index 38629c54c..c841bc09e 100644 --- a/qcsrc/common/monsters/monster/knight.qc +++ b/qcsrc/common/monsters/monster/knight.qc @@ -29,6 +29,7 @@ REGISTER_MONSTER( MON_ADD_CVAR(monster, attack_jump_damage) \ MON_ADD_CVAR(monster, attack_jump_distance) \ MON_ADD_CVAR(monster, attack_jump_chance) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -277,7 +278,7 @@ float m_knight(float req) { case MR_THINK: { - monster_move(MON_CVAR(knight, speed_run), MON_CVAR(knight, speed_walk), 100, knight_anim_run, knight_anim_walk, knight_anim_stand); + monster_move(MON_CVAR(knight, speed_run), MON_CVAR(knight, speed_walk), MON_CVAR(knight, speed_stop), knight_anim_run, knight_anim_walk, knight_anim_stand); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 4a9162a21..00d333497 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -32,6 +32,7 @@ REGISTER_MONSTER( MON_ADD_CVAR(monster, shield_time) \ MON_ADD_CVAR(monster, shield_delay) \ MON_ADD_CVAR(monster, shield_blockpercent) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -401,7 +402,7 @@ float m_mage(float req) if(random() < 0.5) mage_shield(); - monster_move(MON_CVAR(mage, speed_run), MON_CVAR(mage, speed_walk), 50, mage_anim_walk, mage_anim_run, mage_anim_idle); + monster_move(MON_CVAR(mage, speed_run), MON_CVAR(mage, speed_walk), MON_CVAR(mage, speed_stop), mage_anim_walk, mage_anim_run, mage_anim_idle); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc index 50d7f6332..387c98f00 100644 --- a/qcsrc/common/monsters/monster/shambler.qc +++ b/qcsrc/common/monsters/monster/shambler.qc @@ -14,6 +14,7 @@ REGISTER_MONSTER( MON_ADD_CVAR(monster, attack_smash_damage) \ MON_ADD_CVAR(monster, attack_claw_damage) \ MON_ADD_CVAR(monster, attack_lightning_damage) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -123,7 +124,7 @@ float m_shambler(float req) { case MR_THINK: { - monster_move(MON_CVAR(shambler, speed_run), MON_CVAR(shambler, speed_walk), 300, shambler_anim_run, shambler_anim_walk, shambler_anim_stand); + monster_move(MON_CVAR(shambler, speed_run), MON_CVAR(shambler, speed_walk), MON_CVAR(shambler, speed_stop), shambler_anim_run, shambler_anim_walk, shambler_anim_stand); return TRUE; } case MR_DEATH: diff --git a/qcsrc/common/monsters/monster/slime.qc b/qcsrc/common/monsters/monster/slime.qc index c9eadcc96..a973c3d50 100644 --- a/qcsrc/common/monsters/monster/slime.qc +++ b/qcsrc/common/monsters/monster/slime.qc @@ -12,6 +12,7 @@ REGISTER_MONSTER( #define SLIME_SETTINGS(monster) \ MON_ADD_CVAR(monster, health) \ MON_ADD_CVAR(monster, attack_explode_damage) \ + MON_ADD_CVAR(monster, speed_stop) \ MON_ADD_CVAR(monster, speed_run) \ MON_ADD_CVAR(monster, speed_walk) @@ -104,7 +105,7 @@ float m_slime(float req) { case MR_THINK: { - monster_move(MON_CVAR(slime, speed_run), MON_CVAR(slime, speed_walk), 20, slime_anim_walk, slime_anim_walk, slime_anim_idle); + monster_move(MON_CVAR(slime, speed_run), MON_CVAR(slime, speed_walk), MON_CVAR(slime, speed_stop), slime_anim_walk, slime_anim_walk, slime_anim_idle); return TRUE; } case MR_DEATH: