From: Mario Date: Thu, 2 Jun 2022 01:56:00 +0000 (+1000) Subject: Adjust frequency of mage's teleportation attack, update monster configuration to... X-Git-Tag: xonotic-v0.8.5~7^2~1^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e75c2485213b1e6f41f87caa88d89f8988a1b17;p=xonotic%2Fxonotic-data.pk3dir.git Adjust frequency of mage's teleportation attack, update monster configuration to include missing cvars --- diff --git a/monsters.cfg b/monsters.cfg index e7c4c79e5..3f94f9631 100644 --- a/monsters.cfg +++ b/monsters.cfg @@ -5,7 +5,7 @@ set g_monster_zombie_attack_leap_force 55 set g_monster_zombie_attack_leap_speed 500 set g_monster_zombie_attack_melee_damage 55 set g_monster_zombie_attack_melee_delay 1 -set g_monster_zombie_damageforcescale 0.550000012 +set g_monster_zombie_damageforcescale 0.55 set g_monster_zombie_health 200 set g_monster_zombie_speed_run 600 set g_monster_zombie_speed_stop 100 @@ -19,18 +19,20 @@ set g_monster_spider_attack_web_delay 3 set g_monster_spider_attack_web_range 800 set g_monster_spider_attack_web_speed 1300 set g_monster_spider_attack_web_speed_up 150 -set g_monster_spider_damageforcescale 0.600000024 +set g_monster_spider_damageforcescale 0.6 set g_monster_spider_health 180 set g_monster_spider_speed_run 500 set g_monster_spider_speed_stop 100 set g_monster_spider_speed_walk 400 // }}} // {{{ #3: Mage +set g_monster_mage_attack_push_chance 0.7 set g_monster_mage_attack_push_damage 25 set g_monster_mage_attack_push_delay 1 set g_monster_mage_attack_push_force 300 set g_monster_mage_attack_push_radius 150 set g_monster_mage_attack_spike_accel 480 +set g_monster_mage_attack_spike_chance 0.45 set g_monster_mage_attack_spike_damage 45 set g_monster_mage_attack_spike_decel 480 set g_monster_mage_attack_spike_delay 2 @@ -41,6 +43,10 @@ set g_monster_mage_attack_spike_smart_trace_max 2500 set g_monster_mage_attack_spike_smart_trace_min 1000 set g_monster_mage_attack_spike_speed_max 370 set g_monster_mage_attack_spike_turnrate 0.65 +set g_monster_mage_attack_teleport_chance 0.1 +set g_monster_mage_attack_teleport_delay 5 +set g_monster_mage_attack_teleport_random 0.4 +set g_monster_mage_attack_teleport_random_range 1200 set g_monster_mage_damageforcescale 0.5 set g_monster_mage_heal_allies 20 set g_monster_mage_heal_delay 1.5 @@ -62,7 +68,7 @@ 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 1200 -set g_monster_wyvern_damageforcescale 0.600000024 +set g_monster_wyvern_damageforcescale 0.6 set g_monster_wyvern_health 150 set g_monster_wyvern_speed_run 250 set g_monster_wyvern_speed_stop 300 @@ -80,7 +86,7 @@ set g_monster_golem_attack_lightning_speed_up 150 set g_monster_golem_attack_smash_damage 50 set g_monster_golem_attack_smash_force 100 set g_monster_golem_attack_smash_range 200 -set g_monster_golem_damageforcescale 0.100000001 +set g_monster_golem_damageforcescale 0.1 set g_monster_golem_health 650 set g_monster_golem_speed_run 320 set g_monster_golem_speed_stop 300 diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 22cb9fef9..8cfa77e65 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -1,6 +1,40 @@ #include "mage.qh" #ifdef SVQC +float autocvar_g_monster_mage_health; +float autocvar_g_monster_mage_damageforcescale = 0.5; +float autocvar_g_monster_mage_attack_spike_damage; +float autocvar_g_monster_mage_attack_spike_radius; +float autocvar_g_monster_mage_attack_spike_delay; +float autocvar_g_monster_mage_attack_spike_accel; +float autocvar_g_monster_mage_attack_spike_decel; +float autocvar_g_monster_mage_attack_spike_chance = 0.45; +float autocvar_g_monster_mage_attack_spike_turnrate; +float autocvar_g_monster_mage_attack_spike_speed_max; +float autocvar_g_monster_mage_attack_spike_smart; +float autocvar_g_monster_mage_attack_spike_smart_trace_min; +float autocvar_g_monster_mage_attack_spike_smart_trace_max; +float autocvar_g_monster_mage_attack_spike_smart_mindist; +float autocvar_g_monster_mage_attack_push_chance = 0.7; +float autocvar_g_monster_mage_attack_push_damage; +float autocvar_g_monster_mage_attack_push_radius; +float autocvar_g_monster_mage_attack_push_delay; +float autocvar_g_monster_mage_attack_push_force; +float autocvar_g_monster_mage_attack_teleport_chance = 0.2; +float autocvar_g_monster_mage_attack_teleport_delay = 2; +float autocvar_g_monster_mage_attack_teleport_random = 0.4; +float autocvar_g_monster_mage_attack_teleport_random_range = 1200; +float autocvar_g_monster_mage_heal_self; +float autocvar_g_monster_mage_heal_allies; +float autocvar_g_monster_mage_heal_minhealth; +float autocvar_g_monster_mage_heal_range; +float autocvar_g_monster_mage_heal_delay; +float autocvar_g_monster_mage_shield_time; +float autocvar_g_monster_mage_shield_delay; +float autocvar_g_monster_mage_shield_blockpercent; +float autocvar_g_monster_mage_speed_stop; +float autocvar_g_monster_mage_speed_run; +float autocvar_g_monster_mage_speed_walk; SOUND(MageSpike_FIRE, W_Sound("electro_fire")); void M_Mage_Attack_Spike(entity this, vector dir); @@ -40,41 +74,6 @@ ENDCLASS(OffhandMageTeleport) OffhandMageTeleport OFFHAND_MAGE_TELEPORT; STATIC_INIT(OFFHAND_MAGE_TELEPORT) { OFFHAND_MAGE_TELEPORT = NEW(OffhandMageTeleport); } -float autocvar_g_monster_mage_health; -float autocvar_g_monster_mage_damageforcescale = 0.5; -float autocvar_g_monster_mage_attack_spike_damage; -float autocvar_g_monster_mage_attack_spike_radius; -float autocvar_g_monster_mage_attack_spike_delay; -float autocvar_g_monster_mage_attack_spike_accel; -float autocvar_g_monster_mage_attack_spike_decel; -float autocvar_g_monster_mage_attack_spike_chance = 0.45; -float autocvar_g_monster_mage_attack_spike_turnrate; -float autocvar_g_monster_mage_attack_spike_speed_max; -float autocvar_g_monster_mage_attack_spike_smart; -float autocvar_g_monster_mage_attack_spike_smart_trace_min; -float autocvar_g_monster_mage_attack_spike_smart_trace_max; -float autocvar_g_monster_mage_attack_spike_smart_mindist; -float autocvar_g_monster_mage_attack_push_chance = 0.7; -float autocvar_g_monster_mage_attack_push_damage; -float autocvar_g_monster_mage_attack_push_radius; -float autocvar_g_monster_mage_attack_push_delay; -float autocvar_g_monster_mage_attack_push_force; -float autocvar_g_monster_mage_attack_teleport_chance = 0.2; -float autocvar_g_monster_mage_attack_teleport_delay = 2; -float autocvar_g_monster_mage_attack_teleport_random = 0.4; -float autocvar_g_monster_mage_attack_teleport_random_range = 1200; -float autocvar_g_monster_mage_heal_self; -float autocvar_g_monster_mage_heal_allies; -float autocvar_g_monster_mage_heal_minhealth; -float autocvar_g_monster_mage_heal_range; -float autocvar_g_monster_mage_heal_delay; -float autocvar_g_monster_mage_shield_time; -float autocvar_g_monster_mage_shield_delay; -float autocvar_g_monster_mage_shield_blockpercent; -float autocvar_g_monster_mage_speed_stop; -float autocvar_g_monster_mage_speed_run; -float autocvar_g_monster_mage_speed_walk; - void M_Mage_Defend_Heal(entity this); void M_Mage_Defend_Shield(entity this); diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index dafe36d59..0d0936eab 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -5,17 +5,20 @@ #endif #ifdef SVQC - -.float spider_web_delay; - +float autocvar_g_monster_spider_health; +float autocvar_g_monster_spider_damageforcescale = 0.6; +float autocvar_g_monster_spider_attack_bite_damage; +float autocvar_g_monster_spider_attack_bite_delay; float autocvar_g_monster_spider_attack_web_damagetime; float autocvar_g_monster_spider_attack_web_speed; float autocvar_g_monster_spider_attack_web_speed_up; float autocvar_g_monster_spider_attack_web_delay; float autocvar_g_monster_spider_attack_web_range = 800; +float autocvar_g_monster_spider_speed_stop; +float autocvar_g_monster_spider_speed_run; +float autocvar_g_monster_spider_speed_walk; -float autocvar_g_monster_spider_attack_bite_damage; -float autocvar_g_monster_spider_attack_bite_delay; +.float spider_web_delay; void M_Spider_Attack_Web(entity this); @@ -75,12 +78,6 @@ METHOD(SpiderAttack, wr_think, void(SpiderAttack thiswep, entity actor, .entity } } -float autocvar_g_monster_spider_health; -float autocvar_g_monster_spider_damageforcescale = 0.6; -float autocvar_g_monster_spider_speed_stop; -float autocvar_g_monster_spider_speed_run; -float autocvar_g_monster_spider_speed_walk; - void M_Spider_Attack_Web_Explode(entity this) { if(this) diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index 783c2fd34..3b48c67e7 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -1,13 +1,17 @@ #include "wyvern.qh" #ifdef SVQC - +float autocvar_g_monster_wyvern_health; +float autocvar_g_monster_wyvern_damageforcescale = 0.6; float autocvar_g_monster_wyvern_attack_fireball_damage; float autocvar_g_monster_wyvern_attack_fireball_edgedamage; float autocvar_g_monster_wyvern_attack_fireball_damagetime; float autocvar_g_monster_wyvern_attack_fireball_force; float autocvar_g_monster_wyvern_attack_fireball_radius; float autocvar_g_monster_wyvern_attack_fireball_speed; +float autocvar_g_monster_wyvern_speed_stop; +float autocvar_g_monster_wyvern_speed_run; +float autocvar_g_monster_wyvern_speed_walk; void M_Wyvern_Attack_Fireball_Explode(entity this); void M_Wyvern_Attack_Fireball_Touch(entity this, entity toucher); @@ -51,12 +55,6 @@ METHOD(WyvernAttack, wr_checkammo1, bool(WyvernAttack this, entity actor, .entit return true; } -float autocvar_g_monster_wyvern_health; -float autocvar_g_monster_wyvern_damageforcescale = 0.6; -float autocvar_g_monster_wyvern_speed_stop; -float autocvar_g_monster_wyvern_speed_run; -float autocvar_g_monster_wyvern_speed_walk; - void M_Wyvern_Attack_Fireball_Explode(entity this) { Send_Effect(EFFECT_FIREBALL_EXPLODE, this.origin, '0 0 0', 1);