Also fix ogre grenade attack

diff --git a/monsters.cfg b/monsters.cfg
index 793f3e1197f0a28f565892383a1fe3611650dd16..bff42f5b81179bfc847c85598792ee38bfe3a74b 100644 (file)
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -47,7 +47,11 @@ 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.3 "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 damage push"
+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"
 
 // Fiend
 set g_monster_demon 1 "Enable Fiends"

diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh
index 0735b6c6b73ba99f95501a54061c27d3cdeb01a0..d2ed41d026bc5f114a329c3d989c58c534f38dd6 100644 (file)
--- a/qcsrc/common/deathtypes.qh
+++ b/qcsrc/common/deathtypes.qh
@@ -27,6 +27,7 @@
        DEATHTYPE(DEATH_MONSTER_HKNIGHT_SPIKE,  DEATH_SELF_MON_HKNIGHT_SPIKE,           NO_MSG,                                            NORMAL_POS) \
        DEATHTYPE(DEATH_MONSTER_KNIGHT,                 DEATH_SELF_MON_KNIGHT,                          NO_MSG,                                            NORMAL_POS) \
        DEATHTYPE(DEATH_MONSTER_OGRE_CHAINSAW,  DEATH_SELF_MON_OGRE_CHAINSAW,           NO_MSG,                                            NORMAL_POS) \
+       DEATHTYPE(DEATH_MONSTER_OGRE_GRENADE,   DEATH_SELF_MON_OGRE_GRENADE,            NO_MSG,                                            NORMAL_POS) \
        DEATHTYPE(DEATH_MONSTER_OGRE_UZI,               DEATH_SELF_MON_OGRE_UZI,                        NO_MSG,                                            NORMAL_POS) \
        DEATHTYPE(DEATH_MONSTER_MAGE,                   DEATH_SELF_MON_MAGE,                            NO_MSG,                                            NORMAL_POS) \
        DEATHTYPE(DEATH_MONSTER_SHAMBLER_CLAW,  DEATH_SELF_MON_SHAMBLER_CLAW,           NO_MSG,                                            NORMAL_POS) \

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index f594ee76c91e4df78d41173ea28c4f3017878d83..f136d2f9234e69145fbb19a7fa7cde20e8b933f8 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -238,6 +238,7 @@ void Send_Notification_WOVA(
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_HKNIGHT_SPIKE,   2, 1, "s1 s2loc spree_lost", "s1",               "notify_death",                 _("^BG%s^K1 was cursed by a Hell-Knight%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_KNIGHT,              2, 1, "s1 s2loc spree_lost", "s1",           "notify_death",                 _("^BG%s^K1 was sliced up by a Knight%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_OGRE_CHAINSAW,   2, 1, "s1 s2loc spree_lost", "s1",               "notify_death",                 _("^BG%s^K1 was cut down by an Ogre%s%s\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_OGRE_GRENADE,    2, 1, "s1 s2loc spree_lost", "s1",               "notify_death",                 _("^BG%s^K1 almost dodged the Ogre grenade%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_OGRE_UZI,            2, 1, "s1 s2loc spree_lost", "s1",           "notify_death",                 _("^BG%s^K1 was nailed by an Ogre%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_MAGE,                2, 1, "s1 s2loc spree_lost", "s1",           "notify_death",                 _("^BG%s^K1 was exploded by a Mage%s%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_MON_SHAMBLER_CLAW,   2, 1, "s1 s2loc spree_lost", "s1",               "notify_death",                 _("^BG%s^K1's innards became outwards by a Shambler%s%s\n"), "") \
@@ -578,6 +579,7 @@ void Send_Notification_WOVA(
        MSG_MULTI_NOTIF(1, DEATH_SELF_MON_HKNIGHT_SPIKE,                 INFO_DEATH_SELF_MON_HKNIGHT_SPIKE,                     CENTER_DEATH_SELF_MONSTER) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_MON_KNIGHT,                                INFO_DEATH_SELF_MON_KNIGHT,                            CENTER_DEATH_SELF_MONSTER) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_MON_OGRE_CHAINSAW,                 INFO_DEATH_SELF_MON_OGRE_CHAINSAW,                     CENTER_DEATH_SELF_MONSTER) \
+       MSG_MULTI_NOTIF(1, DEATH_SELF_MON_OGRE_GRENADE,                  INFO_DEATH_SELF_MON_OGRE_GRENADE,                      CENTER_DEATH_SELF_MONSTER) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_MON_OGRE_UZI,                              INFO_DEATH_SELF_MON_OGRE_UZI,                          CENTER_DEATH_SELF_MONSTER) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_MON_MAGE,                                  INFO_DEATH_SELF_MON_MAGE,                                      CENTER_DEATH_SELF_MONSTER) \
        MSG_MULTI_NOTIF(1, DEATH_SELF_MON_SHAMBLER_CLAW,                 INFO_DEATH_SELF_MON_SHAMBLER_CLAW,                     CENTER_DEATH_SELF_MONSTER) \

diff --git a/qcsrc/server/monsters/monster/ogre.qc b/qcsrc/server/monsters/monster/ogre.qc
index fb67de9b927084662c1d0be4dd66a56c4e444db6..af2005bbfaf542904b93d6d64b6c1aff722b5eae 100644 (file)
--- a/qcsrc/server/monsters/monster/ogre.qc
+++ b/qcsrc/server/monsters/monster/ogre.qc
@@ -19,6 +19,10 @@ float autocvar_g_monster_ogre_attack_uzi_bullets;
 float autocvar_g_monster_ogre_attack_uzi_damage;
 float autocvar_g_monster_ogre_attack_uzi_force;
 float autocvar_g_monster_ogre_attack_uzi_chance;
+float autocvar_g_monster_ogre_attack_grenade_damage;
+float autocvar_g_monster_ogre_attack_grenade_edgedamage;
+float autocvar_g_monster_ogre_attack_grenade_force;
+float autocvar_g_monster_ogre_attack_grenade_radius;
 
 // animations
 const float ogre_anim_idle             = 0;
@@ -99,9 +103,92 @@ void ogre_uzi ()
        self.monster_delayedattack = ogre_uzi_fire;
 }
 
+void ogre_grenade_explode()
+{
+       pointparticles(particleeffectnum("grenade_explode"), self.origin, '0 0 0', 1);
+       sound(self, CH_SHOTS, "weapons/grenade_impact.wav", VOL_BASE, ATTN_NORM);
+
+       self.event_damage = func_null;
+       self.takedamage = DAMAGE_NO;
+
+       if(self.movetype == MOVETYPE_NONE)
+               self.velocity = self.oldvelocity;
+
+       RadiusDamage (self, self.realowner, autocvar_g_monster_ogre_attack_grenade_damage, autocvar_g_monster_ogre_attack_grenade_edgedamage, autocvar_g_monster_ogre_attack_grenade_radius, world, autocvar_g_monster_ogre_attack_grenade_force, self.projectiledeathtype, other);
+
+       remove (self);
+}
+
+void ogre_grenade_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+{
+       if (self.health <= 0)
+               return;
+               
+       if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
+               return; // g_projectiles_damage says to halt
+               
+       self.health = self.health - damage;
+       
+       if (self.health <= 0)
+               W_PrepareExplosionByDamage(attacker, self.use);
+}
+
+void ogre_grenade_touch (void)
+{
+       PROJECTILE_TOUCH;
+       
+       self.use ();
+}
+
+void ogre_grenade_think()
+{
+       self.nextthink = time;
+       if (time > self.cnt)
+       {
+               other = world;
+               W_Grenade_Explode ();
+               return;
+       }
+}
+
 void ogre_gl ()
 {
-       W_Grenade_Attack2();
+       entity gren;
+
+       W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 4, "weapons/grenade_fire.wav", CH_WEAPON_A, autocvar_g_monster_ogre_attack_grenade_damage);
+       w_shotdir = v_forward; // no TrueAim for grenades please
+
+       gren = spawn ();
+       gren.owner = gren.realowner = self;
+       gren.classname = "grenade";
+       gren.bot_dodge = TRUE;
+       gren.bot_dodgerating = autocvar_g_monster_ogre_attack_grenade_damage;
+       gren.movetype = MOVETYPE_BOUNCE;
+       PROJECTILE_MAKETRIGGER(gren);
+       gren.projectiledeathtype = DEATH_MONSTER_OGRE_GRENADE;
+       setorigin(gren, w_shotorg);
+       setsize(gren, '-3 -3 -3', '3 3 3');
+
+       gren.cnt = time + 5;
+       gren.nextthink = time;
+       gren.think = ogre_grenade_think;
+       gren.use = ogre_grenade_explode;
+       gren.touch = ogre_grenade_touch;
+
+       gren.takedamage = DAMAGE_YES;
+       gren.health = autocvar_g_balance_grenadelauncher_primary_health;
+       gren.damageforcescale = autocvar_g_balance_grenadelauncher_primary_damageforcescale;
+       gren.event_damage = ogre_grenade_damage;
+       gren.damagedbycontents = TRUE;
+       gren.missile_flags = MIF_SPLASH | MIF_ARC;
+       W_SETUPPROJECTILEVELOCITY_UP(gren, g_balance_grenadelauncher_primary);
+
+       gren.angles = vectoangles (gren.velocity);
+       gren.flags = FL_PROJECTILE;
+
+       CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE);
+       
+       
        monsters_setframe(ogre_anim_pain);
        self.attack_finished_single = time + 0.8;
 }