Improve target_init support.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / compat / quake3.qc

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 4fc33badcce733aabb9448dd034739ad74537478..7e934f3d52296e97a310e6b3dfe692a6f5a37857 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -82,11 +82,55 @@ void target_init_verify(entity this)
                        }
 }
 
+void target_init_use(entity this, entity actor, entity trigger)
+{
+       if (!(this.spawnflags & 1))
+       {
+               SetResourceAmount(actor, RESOURCE_ARMOR, start_armorvalue);
+               actor.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot;
+       }
+
+       if (!(this.spawnflags & 2))
+       {
+               SetResourceAmount(actor, RESOURCE_HEALTH, start_health);
+               actor.pauserothealth_finished = time + autocvar_g_balance_pause_health_rot;
+               actor.pauseregen_finished = time + autocvar_g_balance_pause_health_regen;
+       }
+
+       if (!(this.spawnflags & 4))
+       {
+               SetResourceAmount(actor, RESOURCE_SHELLS, start_ammo_shells);
+               SetResourceAmount(actor, RESOURCE_BULLETS, start_ammo_nails);
+               SetResourceAmount(actor, RESOURCE_ROCKETS, start_ammo_rockets);
+               SetResourceAmount(actor, RESOURCE_CELLS, start_ammo_cells);
+               SetResourceAmount(actor, RESOURCE_PLASMA, start_ammo_plasma);
+               SetResourceAmount(actor, RESOURCE_FUEL, start_ammo_fuel);
+
+               actor.weapons = start_weapons;
+               if (this.spawnflags & 32)
+               {
+                       // TODO
+               }
+       }
+
+       if (!(this.spawnflags & 8))
+       {
+               actor.strength_finished = 0;
+               actor.invincible_finished = 0;
+               actor.buffs = 0;
+       }
+
+       if (!(this.spawnflags & 16))
+       {
+               // We don't have holdables.
+       }
+
+       SUB_UseTargets(this, actor, trigger);
+}
+
 spawnfunc(target_init)
 {
-       this.spawnflags = 0; // remove all weapons except the ones listed below
-       this.netname = "shotgun"; // keep these weapons through the remove trigger
-       spawnfunc_target_items(this);
+       this.use = target_init_use;
        InitializeEntity(this, target_init_verify, INITPRIO_FINDTARGET);
 }
 
@@ -95,27 +139,31 @@ void target_give_init(entity this)
 {
        IL_EACH(g_items, it.targetname == this.target,
        {
-               if (it.classname == "weapon_rocketlauncher" || it.classname == "weapon_devastator") {
+               if (it.classname == "weapon_devastator") {
                        this.ammo_rockets += it.count * WEP_CVAR(devastator, ammo);
                        this.netname = cons(this.netname, "devastator");
                }
-               else if (it.classname == "weapon_lightning") {
+               else if (it.classname == "weapon_vortex") {
+                       this.ammo_cells += it.count * WEP_CVAR_PRI(vortex, ammo); // WEAPONTODO
+                       this.netname = cons(this.netname, "vortex");
+               }
+               else if (it.classname == "weapon_electro") {
                        this.ammo_cells += it.count * WEP_CVAR_PRI(electro, ammo); // WEAPONTODO
                        this.netname = cons(this.netname, "electro");
                }
-               else if (it.classname == "weapon_plasmagun") {
+               else if (it.classname == "weapon_hagar") {
                        this.ammo_rockets += it.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
                        this.netname = cons(this.netname, "hagar");
                }
-               else if (it.classname == "weapon_bfg") {
+               else if (it.classname == "weapon_crylink") {
                        this.ammo_cells += it.count * WEP_CVAR_PRI(crylink, ammo);
                        this.netname = cons(this.netname, "crylink");
                }
-               else if (it.classname == "weapon_grenadelauncher" || it.classname == "weapon_mortar") {
+               else if (it.classname == "weapon_mortar") {
                        this.ammo_rockets += it.count * WEP_CVAR_PRI(mortar, ammo); // WEAPONTODO
                        this.netname = cons(this.netname, "mortar");
                }
-               else if (it.classname == "item_armor_body")
+               else if (it.classname == "item_armor_mega")
                        this.armorvalue = 100;
                else if (it.classname == "item_health_mega")
                        this.health = 200;