X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=371d1640d2762a183d4ee6e1865cbdda1b4ba350;hb=723fe3aa08556fdde679753c0afde734853f34e5;hp=1a6faa16fa5209a5eacd8f327a9cbcfb83f24c22;hpb=7e81470d4e18121c8ea577752929e657c33494e2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 1a6faa16f..371d1640d 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -3,38 +3,58 @@ #include "hmg.qh" #include "rpc.qh" +string autocvar_g_overkill; + bool autocvar_g_overkill_powerups_replace; bool autocvar_g_overkill_itemwaypoints = true; -bool autocvar_g_overkill_filter_healthmega; -bool autocvar_g_overkill_filter_armormedium; -bool autocvar_g_overkill_filter_armorbig; -bool autocvar_g_overkill_filter_armormega; - -.float ok_item; - .Weapon ok_lastwep[MAX_WEAPONSLOTS]; -void ok_Initialize(); - -REGISTER_MUTATOR(ok, cvar("g_overkill") && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill") +REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill") { MUTATOR_ONADD { - ok_Initialize(); + precache_all_playermodels("models/ok_player/*.dpm"); + + if (autocvar_g_overkill_filter_healthmega) + { + ITEM_HealthMega.spawnflags |= ITEM_FLAG_MUTATORBLOCKED; + } + if (autocvar_g_overkill_filter_armormedium) + { + ITEM_ArmorMedium.spawnflags |= ITEM_FLAG_MUTATORBLOCKED; + } + if (autocvar_g_overkill_filter_armorbig) + { + ITEM_ArmorBig.spawnflags |= ITEM_FLAG_MUTATORBLOCKED; + } + if (autocvar_g_overkill_filter_armormega) + { + ITEM_ArmorMega.spawnflags |= ITEM_FLAG_MUTATORBLOCKED; + } + + WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; + WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; + + //WEP_SHOTGUN.mdl = "ok_shotgun"; + //WEP_MACHINEGUN.mdl = "ok_mg"; + //WEP_VORTEX.mdl = "ok_sniper"; } MUTATOR_ONREMOVE { + ITEM_HealthMega.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED; + ITEM_ArmorMedium.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED; + ITEM_ArmorBig.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED; + ITEM_ArmorMega.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED; + WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED; WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED; } } void W_Blaster_Attack(entity, .entity, float, float, float, float, float, float, float, float, float, float); -spawnfunc(weapon_hmg); -spawnfunc(weapon_rpc); MUTATOR_HOOKFUNCTION(ok, Damage_Calculate, CBC_ORDER_LAST) { @@ -59,20 +79,10 @@ MUTATOR_HOOKFUNCTION(ok, Damage_Calculate, CBC_ORDER_LAST) void ok_DropItem(entity this, entity targ) { - entity e = new(droppedweapon); // hax + entity e = spawn(); e.ok_item = true; - e.noalign = true; - e.pickup_anyway = true; - e.spawnfunc_checked = true; - spawnfunc_item_armor_small(e); - if (!wasfreed(e)) { // might have been blocked by a mutator - set_movetype(e, MOVETYPE_TOSS); - e.gravity = 1; - e.reset = SUB_Remove; - setorigin(e, this.origin + '0 0 32'); - e.velocity = '0 0 200' + normalize(targ.origin - this.origin) * 500; - SUB_SetFade(e, time + 5, 1); - } + Item_InitializeLoot(e, "item_armor_small", this.origin + '0 0 32', + '0 0 200' + normalize(targ.origin - this.origin) * 500, 5); } MUTATOR_HOOKFUNCTION(ok, PlayerDies) @@ -110,54 +120,6 @@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCurrentWeapon) return true; } -MUTATOR_HOOKFUNCTION(ok, PlayerPreThink) -{ - if(game_stopped) - return; - - entity player = M_ARGV(0, entity); - - if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player)) - return; - - if(PHYS_INPUT_BUTTON_ATCK2(player)) - if( !forbidWeaponUse(player) - || (round_handler_IsActive() && !round_handler_IsRoundStarted()) ) - if(time >= player.jump_interval) - { - player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player); - makevectors(player.v_angle); - - for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) - { - .entity weaponentity = weaponentities[slot]; - - if(player.(weaponentity).m_weapon == WEP_Null && slot != 0) - continue; - - Weapon oldwep = player.(weaponentity).m_weapon; - player.(weaponentity).m_weapon = WEP_BLASTER; - W_Blaster_Attack( - player, - weaponentity, - WEP_BLASTER.m_id | HITTYPE_SECONDARY, - WEP_CVAR_SEC(vaporizer, shotangle), - WEP_CVAR_SEC(vaporizer, damage), - WEP_CVAR_SEC(vaporizer, edgedamage), - WEP_CVAR_SEC(vaporizer, radius), - WEP_CVAR_SEC(vaporizer, force), - WEP_CVAR_SEC(vaporizer, speed), - WEP_CVAR_SEC(vaporizer, spread), - WEP_CVAR_SEC(vaporizer, delay), - WEP_CVAR_SEC(vaporizer, lifetime) - ); - player.(weaponentity).m_weapon = oldwep; - } - } - - PHYS_INPUT_BUTTON_ATCK2(player) = false; -} - MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect) { entity player = M_ARGV(0, entity); @@ -196,7 +158,7 @@ MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn) setorigin(wep, ent.origin); setmodel(wep, MDL_OK_HMG); wep.ok_item = true; - wep.noalign = ent.noalign; + wep.noalign = Item_ShouldKeepPosition(ent); wep.cnt = ent.cnt; wep.team = ent.team; wep.respawntime = g_pickup_respawntime_superweapon; @@ -206,13 +168,13 @@ MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn) wep.nextthink = time + 0.1; return true; } - else if(ent.classname == "item_invincible") + else if(ent.classname == "item_shield") { entity wep = new(weapon_rpc); setorigin(wep, ent.origin); setmodel(wep, MDL_OK_RPC); wep.ok_item = true; - wep.noalign = ent.noalign; + wep.noalign = Item_ShouldKeepPosition(ent); wep.cnt = ent.cnt; wep.team = ent.team; wep.respawntime = g_pickup_respawntime_superweapon; @@ -260,14 +222,6 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) if(item.ok_item) return false; - switch(item.itemdef) - { - case ITEM_HealthMega: return autocvar_g_overkill_filter_healthmega; - case ITEM_ArmorMedium: return autocvar_g_overkill_filter_armormedium; - case ITEM_ArmorBig: return autocvar_g_overkill_filter_armorbig; - case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega; - } - return true; } @@ -304,25 +258,3 @@ MUTATOR_HOOKFUNCTION(ok, SetModname) return true; } -void ok_SetCvars() -{ - // hack to force overkill playermodels - cvar_settemp("sv_defaultcharacter", "1"); - cvar_settemp("sv_defaultplayermodel", "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm"); - cvar_settemp("sv_defaultplayermodel_red", "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm"); - cvar_settemp("sv_defaultplayermodel_blue", "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm"); -} - -void ok_Initialize() -{ - ok_SetCvars(); - - precache_all_playermodels("models/ok_player/*.dpm"); - - WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; - WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; - - //WEP_SHOTGUN.mdl = "ok_shotgun"; - //WEP_MACHINEGUN.mdl = "ok_mg"; - //WEP_VORTEX.mdl = "ok_sniper"; -}