overkill: make loot items configurable

Moves relevant monster item code to a shared function.

diff --git a/mutators.cfg b/mutators.cfg
index 5559fbf43dd1056d60b68f705f2ea1fd5b2150d7..8521d811c9c883b7cea48d9d10028bc2470d612d 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -66,6 +66,10 @@ set g_overkill_filter_armorbig 1
 set g_overkill_filter_armormega 0
 set g_overkill_blaster_keepdamage 0 "allow secondary fire to hurt players"
 set g_overkill_blaster_keepforce 0 "allow secondary fire to push players"
+set g_overkill_loot_player "armor_small" "on player death a random loot item from this space-separated list is dropped, \"random\" drops any allowed normal item, \"\" disables loot items"
+set g_overkill_loot_player_time 5 "lifetime of loot items, <= 0 disables loot items"
+set g_overkill_loot_monster "armor_small" "on monster death a random loot item from this space-separated list is dropped, \"random\" drops any allowed normal item, \"\" disables loot items"
+set g_overkill_loot_monster_time 5 "lifetime of loot items, <= 0 disables loot items"
 
 
 // =========

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 5ce983e18308461e7ee38da535de15dc65a30a70..b44c922de3191c2890699759c9e5d4df58d2c1c2 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -51,34 +51,15 @@ void monster_dropitem(entity this, entity attacker)
        MUTATOR_CALLHOOK(MonsterDropItem, this, itemlist, attacker);
        itemlist = M_ARGV(1, string);
 
-       if(itemlist == "")
-               return;
-
-       RandomSelection_Init();
-       FOREACH_WORD(itemlist, true,
-       {
-               string item = it;
-
-               FOREACH(Weapons, it != WEP_Null && !(it.spawnflags & WEP_FLAG_MUTATORBLOCKED),
-               {
-                       if(it.netname == item || (item == "random" && (it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & WEP_FLAG_HIDDEN) && !(it.spawnflags & WEP_FLAG_SUPERWEAPON)))
-                               RandomSelection_AddEnt(it, 1, 1);
-               });
-               FOREACH(Items, Item_IsDefinitionAllowed(it),
-               {
-                       if(it.netname == item || (item == "random" && (it.spawnflags & ITEM_FLAG_NORMAL) && !it.instanceOfPowerup))
-                               RandomSelection_AddEnt(it, 1, 1);
-               });
-       });
-
-       if(!RandomSelection_chosen_ent)
+       entity loot_itemdef = Item_RandomFromList(itemlist);
+       if (!loot_itemdef)
                return;
 
        entity e = spawn();
        e.monster_item = true;
        ITEM_SET_LOOT(e, true);
        e.colormap = this.colormap;
-       e.itemdef = RandomSelection_chosen_ent;
+       e.itemdef = loot_itemdef;
        setorigin(e, CENTER_OR_VIEWOFS(this));
        e.velocity = randomvec() * 175 + '0 0 325';
        e.lifetime = max(0, autocvar_g_monsters_drop_time);

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 00bdd1c0e222948aefa62afd97c05035e058f3d5..fd8a8bdc2d00a6415dfea7b58490fb4eb2e652a9 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -8,6 +8,10 @@ bool autocvar_g_overkill_powerups_replace;
 bool autocvar_g_overkill_itemwaypoints = true;
 bool autocvar_g_overkill_blaster_keepforce = false;
 bool autocvar_g_overkill_blaster_keepdamage = false;
+string autocvar_g_overkill_loot_player = "armor_small";
+float  autocvar_g_overkill_loot_player_time = 5;
+string autocvar_g_overkill_loot_monster = "armor_small";
+float  autocvar_g_overkill_loot_monster_time = 5;
 
 .Weapon ok_lastwep[MAX_WEAPONSLOTS];
 
@@ -78,13 +82,22 @@ MUTATOR_HOOKFUNCTION(ok, Damage_Calculate, CBC_ORDER_LAST)
        }
 }
 
-void ok_DropItem(entity this, entity attacker, entity e)
+void ok_DropItem(entity this, entity attacker, string itemlist, float itemlifetime)
 {
+       if (itemlifetime <= 0)
+               return;
+
+       entity loot_itemdef = Item_RandomFromList(itemlist);
+       if (!loot_itemdef)
+               return;
+
+       entity e = spawn();
        e.ok_item = true;
-       e.itemdef = ITEM_ArmorSmall;
+       e.itemdef = loot_itemdef;
        e.origin = this.origin + '0 0 32';
        e.velocity = '0 0 200' + normalize(attacker.origin - this.origin) * 500;
-       e.lifetime = 5;
+       e.lifetime = itemlifetime;
+       Item_Initialise(e);
 }
 
 MUTATOR_HOOKFUNCTION(ok, PlayerDies)
@@ -93,9 +106,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDies)
        entity frag_target = M_ARGV(2, entity);
 
        entity attacker = ((IS_PLAYER(frag_attacker)) ? frag_attacker : frag_target);
-       entity item = spawn();
-       ok_DropItem(frag_target, attacker, item);
-       Item_Initialise(item);
+       ok_DropItem(frag_target, attacker, autocvar_g_overkill_loot_player, autocvar_g_overkill_loot_player_time);
 
        for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
        {
@@ -110,9 +121,7 @@ MUTATOR_HOOKFUNCTION(ok, MonsterDropItem)
        entity mon = M_ARGV(0, entity);
        entity frag_attacker = M_ARGV(2, entity);
 
-       entity item = spawn();
-       ok_DropItem(mon, frag_attacker, item);
-       Item_Initialise(item);
+       ok_DropItem(mon, frag_attacker, autocvar_g_overkill_loot_monster, autocvar_g_overkill_loot_monster_time);
 
        M_ARGV(1, string) = ""; // item drops handled
 }

diff --git a/qcsrc/server/items/spawning.qc b/qcsrc/server/items/spawning.qc
index 52d32ffb98d5926203bc7e967938f421631c3ba9..0146c4a1be7d68d660696882d1df468a4eff6e73 100644 (file)
--- a/qcsrc/server/items/spawning.qc
+++ b/qcsrc/server/items/spawning.qc
@@ -65,6 +65,32 @@ bool Item_Initialise(entity item)
        return true;
 }
 
+/// Takes a space-separated list of netnames,
+/// returns the itemdef of one of them (or NULL if none are available).
+entity Item_RandomFromList(string itemlist)
+{
+       if(itemlist == "")
+               return NULL;
+
+       RandomSelection_Init();
+       FOREACH_WORD(itemlist, true,
+       {
+               string item = it;
+
+               FOREACH(Weapons, it != WEP_Null && !(it.spawnflags & WEP_FLAG_MUTATORBLOCKED),
+               {
+                       if(it.netname == item || (item == "random" && (it.spawnflags & WEP_FLAG_NORMAL) && !(it.spawnflags & WEP_FLAG_HIDDEN) && !(it.spawnflags & WEP_FLAG_SUPERWEAPON)))
+                               RandomSelection_AddEnt(it, 1, 1);
+               });
+               FOREACH(Items, Item_IsDefinitionAllowed(it),
+               {
+                       if(it.netname == item || (item == "random" && (it.spawnflags & ITEM_FLAG_NORMAL) && !it.instanceOfPowerup))
+                               RandomSelection_AddEnt(it, 1, 1);
+               });
+       });
+       return RandomSelection_chosen_ent;
+}
+
 
 // Compatibility spawn functions
 

diff --git a/qcsrc/server/items/spawning.qh b/qcsrc/server/items/spawning.qh
index 223eb57fbf500180fc5ffee3920fa38d37abcd33..97ff1bde5870842aca91a9397ce54750c9064fb6 100644 (file)
--- a/qcsrc/server/items/spawning.qh
+++ b/qcsrc/server/items/spawning.qh
@@ -29,6 +29,10 @@ bool Item_IsDefinitionAllowed(entity definition);
 /// permanent items only: noalign means the item is suspended (won't drop to floor)
 bool Item_Initialise(entity item);
 
+/// Takes a space-separated list of netnames,
+/// returns the itemdef of one of them (or NULL if none are available).
+entity Item_RandomFromList(string itemlist);
+
 /// \brief Returns whether the item is loot.
 /// \param[in] item Item to check.
 /// \return True if the item is loot, false otherwise.