From dca461716d4204384f9bbf8826c05045d59832c7 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 23 Feb 2013 02:49:58 +1100 Subject: [PATCH] Remove runematch gamemode --- gamemodes.cfg | 65 --------------- gfx/menu/luminos/gametype_rune.tga | Bin 19036 -> 0 bytes gfx/menu/wickedx/gametype_rune.tga | Bin 19036 -> 0 bytes gfx/menu/xaw/gametype_rune.tga | Bin 18820 -> 0 bytes qcsrc/common/mapinfo.qc | 4 - qcsrc/common/mapinfo.qh | 3 - .../menu/xonotic/dialog_multiplayer_create.c | 1 - qcsrc/menu/xonotic/util.qc | 1 - qcsrc/server/arena.qc | 2 +- qcsrc/server/{ => attic}/runematch.qc | 0 qcsrc/server/autocvars.qh | 45 ---------- qcsrc/server/cl_client.qc | 31 ------- qcsrc/server/cl_physics.qc | 14 ---- qcsrc/server/cl_player.qc | 1 - qcsrc/server/cl_weaponsystem.qc | 15 ---- qcsrc/server/defs.qh | 6 -- qcsrc/server/g_damage.qc | 78 +----------------- qcsrc/server/g_triggers.qc | 11 --- qcsrc/server/g_world.qc | 3 - qcsrc/server/miscfunctions.qc | 7 +- qcsrc/server/mutators/base.qh | 2 +- qcsrc/server/progs.src | 2 +- qcsrc/server/sv_main.qc | 2 - qcsrc/server/teamplay.qc | 9 -- 24 files changed, 5 insertions(+), 297 deletions(-) delete mode 100644 gfx/menu/luminos/gametype_rune.tga delete mode 100644 gfx/menu/wickedx/gametype_rune.tga delete mode 100644 gfx/menu/xaw/gametype_rune.tga rename qcsrc/server/{ => attic}/runematch.qc (100%) diff --git a/gamemodes.cfg b/gamemodes.cfg index 6cff7e5a42..a0b8a80d2f 100644 --- a/gamemodes.cfg +++ b/gamemodes.cfg @@ -26,7 +26,6 @@ alias cl_hook_gamestart_dm alias cl_hook_gamestart_tdm alias cl_hook_gamestart_dom alias cl_hook_gamestart_ctf -alias cl_hook_gamestart_rune alias cl_hook_gamestart_lms alias cl_hook_gamestart_arena alias cl_hook_gamestart_ca @@ -48,7 +47,6 @@ alias sv_hook_gamestart_dm alias sv_hook_gamestart_tdm alias sv_hook_gamestart_dom alias sv_hook_gamestart_ctf -alias sv_hook_gamestart_rune alias sv_hook_gamestart_lms alias sv_hook_gamestart_arena alias sv_hook_gamestart_ca @@ -79,8 +77,6 @@ seta g_arena_point_limit -1 "Arena point limit overriding the mapinfo specified seta g_arena_point_leadlimit -1 "Arena point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_domination_point_limit -1 "Domination point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_domination_point_leadlimit -1 "Domination point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" -seta g_runematch_point_limit -1 "Runematch point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" -seta g_runematch_point_leadlimit -1 "Runematch point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_keyhunt_point_limit -1 "Keyhunt point limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_keyhunt_point_leadlimit -1 "Keyhunt point lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" seta g_race_laps_limit -1 "Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)" @@ -105,9 +101,6 @@ set g_dom_weapon_stay 0 set g_lms_respawn_delay 0 set g_lms_respawn_waves 0 set g_lms_weapon_stay 0 -set g_rune_respawn_delay 0 -set g_rune_respawn_waves 0 -set g_rune_weapon_stay 0 set g_tdm_respawn_delay 0 set g_tdm_respawn_waves 0 set g_tdm_weapon_stay 0 @@ -414,61 +407,3 @@ set g_race 0 "Race: be faster than your opponents" set g_race_qualifying_timelimit 0 set g_race_qualifying_timelimit_override -1 set g_race_teams 0 "when 2, 3, or 4, the race is played as a team game (the team members can add up their laps)" - - -// =========== -// runematch -// =========== -set g_runematch 0 "Runematch: pick up and hold the runes, special items that give you points, a special power (rune) and a disadvantage (curse)" -set g_runematch_pointrate 5 -set g_runematch_fixedspawns 1 "use fixed runematch spawns if available" -set g_runematch_pointamt 1 -set g_runematch_shuffletime 30 "how often runes change position" -set g_runematch_respawntime 15 "how soon after being dropped to respawn" -set g_runematch_frags_killedby_runeholder 4 -set g_runematch_frags_killed_runeholder 5 -set g_runematch_frags_norune 0 -set g_runematch_drop_runes_max 2 "only drop up to 2 runes, the rest should respawn" -set g_runematch_allow_same 0 "allow matching rune-curse pairs" -set g_runematch_rune_alpha 0.78 -set g_runematch_rune_effects 544 "EF_ADDITIVE + EF_FULLBRIGHT = 544" -set g_runematch_rune_glow_size 0 -set g_runematch_rune_glow_color 0 -set g_runematch_rune_color_strength 1.0 -// strength/weakness -set g_balance_rune_strength_damage 2.0 -set g_balance_rune_strength_force 1.5 -set g_balance_curse_weak_damage 0.5 -set g_balance_curse_weak_force 0.6 -set g_balance_rune_strength_combo_damage 0.9 -set g_balance_rune_strength_combo_force 1.0 -// defense/vulner -set g_balance_rune_defense_takedamage 0.5 -set g_balance_curse_vulner_takedamage 2.0 -set g_balance_rune_defense_combo_takedamage 1.0 -// vampire/empathy -set g_balance_rune_vampire_absorb 0.4 -set g_balance_curse_empathy_takedamage -0.4 -set g_balance_rune_vampire_combo_absorb -0.1 -set g_balance_rune_vampire_maxhealth 500 -set g_balance_curse_empathy_minhealth 20 -set g_balance_rune_vampire_combo_minhealth 40 -// regen/venom -set g_balance_rune_regen_hpmod 1.75 -set g_balance_curse_venom_hpmod 0.6 -set g_balance_rune_regen_combo_hpmod 0.9 -set g_balance_rune_regen_regenrate 3.0 -set g_balance_curse_venom_rotrate 3.0 -set g_balance_rune_regen_combo_regenrate 0.5 -set g_balance_rune_regen_combo_rotrate 1.5 -set g_balance_rune_regen_limitmod 1 -set g_balance_curse_venom_limitmod 1 -set g_balance_rune_regen_combo_limitmod 1 -// speed/slow -set g_balance_rune_speed_atkrate 0.66 -set g_balance_curse_slow_atkrate 1.5 -set g_balance_rune_speed_combo_atkrate 1.2 -set g_balance_rune_speed_highspeed 1.5 -set g_balance_curse_slow_highspeed 0.6 -set g_balance_rune_speed_combo_highspeed 0.9 - diff --git a/gfx/menu/luminos/gametype_rune.tga b/gfx/menu/luminos/gametype_rune.tga deleted file mode 100644 index 6906411d39cfc5b077a41a6f076822819ebcc8d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19036 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 NvN1HCWYDkP{{hQhB&GlW diff --git a/gfx/menu/wickedx/gametype_rune.tga b/gfx/menu/wickedx/gametype_rune.tga deleted file mode 100644 index 6906411d39cfc5b077a41a6f076822819ebcc8d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19036 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 NvN1HCWYDkP{{hQhB&GlW diff --git a/gfx/menu/xaw/gametype_rune.tga b/gfx/menu/xaw/gametype_rune.tga deleted file mode 100644 index 79c8f30b0d06380e2df1812e501f03b4f9e1f9c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18820 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 Ar~m)} diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index f7ced42057..b4dbda25f2 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -313,8 +313,6 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTF; else if(v == "team_CTF_blueflag") MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_CTF; - else if(v == "runematch_spawn_point") - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_RUNEMATCH; else if(v == "target_assault_roundend") MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_ASSAULT; else if(v == "onslaught_generator") @@ -364,7 +362,6 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp else { MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_DEATHMATCH; // DM always works - MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_RUNEMATCH; // Rune always works MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_LMS; // LMS always works MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_KEEPAWAY; // Keepaway always works @@ -418,7 +415,6 @@ string _MapInfo_GetDefault(float t) case MAPINFO_TYPE_TEAM_DEATHMATCH: return "50 20 2 0"; case MAPINFO_TYPE_DOMINATION: return "200 20 0"; case MAPINFO_TYPE_CTF: return "300 20 10 0"; - case MAPINFO_TYPE_RUNEMATCH: return "200 20 0"; case MAPINFO_TYPE_LMS: return "9 20 0"; case MAPINFO_TYPE_ARENA: return "10 20 0"; case MAPINFO_TYPE_CA: return "10 20 0"; diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index bd67f67a82..10a35ee470 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -42,9 +42,6 @@ REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,"timelimit=20 lives=9 lea REGISTER_GAMETYPE(_("Arena"),arena,g_arena,ARENA,"timelimit=20 pointlimit=10 leadlimit=0") #define g_arena IS_GAMETYPE(ARENA) -REGISTER_GAMETYPE(_("Runematch"),rune,g_runematch,RUNEMATCH,"timelimit=20 pointlimit=200 leadlimit=0") -#define g_runematch IS_GAMETYPE(RUNEMATCH) - REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0") #define g_race IS_GAMETYPE(RACE) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c index a534016931..3fc6f31fe3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c @@ -153,7 +153,6 @@ void XonoticServerCreateTab_gameTypeChangeNotify(entity me) case MAPINFO_TYPE_CTF: GameType_ConfigureSliders(e, l, l2, _("Capture limit:"), 1, 20, 1, "capturelimit_override"); break; case MAPINFO_TYPE_DOMINATION: GameType_ConfigureSliders(e, l, l2, _("Point limit:"), 50, 500, 10, "g_domination_point_limit"); break; case MAPINFO_TYPE_KEYHUNT: GameType_ConfigureSliders(e, l, l2, _("Point limit:"), 200, 1500, 50, "g_keyhunt_point_limit"); break; - case MAPINFO_TYPE_RUNEMATCH: GameType_ConfigureSliders(e, l, l2, _("Point limit:"), 50, 500, 10, "g_runematch_point_limit"); break; case MAPINFO_TYPE_LMS: GameType_ConfigureSliders(e, l, l2, _("Lives:"), 3, 50, 1, "g_lms_lives_override"); break; case MAPINFO_TYPE_RACE: GameType_ConfigureSliders(e, l, l2, _("Laps:"), 1, 25, 1, "g_race_laps_limit"); break; case MAPINFO_TYPE_NEXBALL: GameType_ConfigureSliders(e, l, l2, _("Goals:"), 1, 50, 1, "g_nexball_goallimit"); break; diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index e80bf30e4e..b4ca21385d 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -609,7 +609,6 @@ float updateCompression() GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \ GAMETYPE(MAPINFO_TYPE_RACE) \ GAMETYPE(MAPINFO_TYPE_CTS) \ - GAMETYPE(MAPINFO_TYPE_RUNEMATCH) \ GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \ /* nothing */ diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index ef81fd92ba..c364ecae35 100644 --- a/qcsrc/server/arena.qc +++ b/qcsrc/server/arena.qc @@ -22,7 +22,7 @@ float red_players, blue_players, yellow_players, pink_players; float total_players; /** - * Resets the state of all clients, items, flags, runes, keys, weapons, waypoints, ... of the map. + * Resets the state of all clients, items, flags, keys, weapons, waypoints, ... of the map. * Sets the 'warmup' global variable. */ void reset_map(float dorespawn) diff --git a/qcsrc/server/runematch.qc b/qcsrc/server/attic/runematch.qc similarity index 100% rename from qcsrc/server/runematch.qc rename to qcsrc/server/attic/runematch.qc diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 08a6297ad4..e6b112981e 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -178,16 +178,6 @@ float autocvar_g_balance_crylink_secondary_spread; float autocvar_g_balance_crylink_secondary_spreadtype; float autocvar_g_balance_crylink_reload_ammo; float autocvar_g_balance_crylink_reload_time; -float autocvar_g_balance_curse_empathy_minhealth; -float autocvar_g_balance_curse_empathy_takedamage; -float autocvar_g_balance_curse_slow_atkrate; -float autocvar_g_balance_curse_slow_highspeed; -float autocvar_g_balance_curse_venom_hpmod; -float autocvar_g_balance_curse_venom_limitmod; -float autocvar_g_balance_curse_venom_rotrate; -float autocvar_g_balance_curse_vulner_takedamage; -float autocvar_g_balance_curse_weak_damage; -float autocvar_g_balance_curse_weak_force; float autocvar_g_balance_damagepush_speedfactor; float autocvar_g_balance_electro_combo_comboradius; float autocvar_g_balance_electro_combo_damage; @@ -593,26 +583,6 @@ float autocvar_g_balance_rocketlauncher_speedaccel; float autocvar_g_balance_rocketlauncher_speedstart; float autocvar_g_balance_rocketlauncher_reload_ammo; float autocvar_g_balance_rocketlauncher_reload_time; -float autocvar_g_balance_rune_defense_combo_takedamage; -float autocvar_g_balance_rune_defense_takedamage; -float autocvar_g_balance_rune_regen_combo_hpmod; -float autocvar_g_balance_rune_regen_combo_limitmod; -float autocvar_g_balance_rune_regen_combo_regenrate; -float autocvar_g_balance_rune_regen_combo_rotrate; -float autocvar_g_balance_rune_regen_hpmod; -float autocvar_g_balance_rune_regen_limitmod; -float autocvar_g_balance_rune_regen_regenrate; -float autocvar_g_balance_rune_speed_atkrate; -float autocvar_g_balance_rune_speed_combo_atkrate; -float autocvar_g_balance_rune_speed_combo_highspeed; -float autocvar_g_balance_rune_speed_highspeed; -float autocvar_g_balance_rune_strength_combo_damage; -float autocvar_g_balance_rune_strength_combo_force; -float autocvar_g_balance_rune_strength_damage; -float autocvar_g_balance_rune_strength_force; -float autocvar_g_balance_rune_vampire_absorb; -float autocvar_g_balance_rune_vampire_combo_absorb; -float autocvar_g_balance_rune_vampire_maxhealth; float autocvar_g_balance_seeker_type; float autocvar_g_balance_seeker_flac_ammo; float autocvar_g_balance_seeker_flac_animtime; @@ -988,21 +958,6 @@ float autocvar_g_respawn_ghosts; float autocvar_g_respawn_ghosts_maxtime; float autocvar_g_respawn_ghosts_speed; float autocvar_g_respawn_waves; -float autocvar_g_runematch_allow_same; -float autocvar_g_runematch_drop_runes_max; -float autocvar_g_runematch_fixedspawns; -float autocvar_g_runematch_frags_killed_runeholder; -float autocvar_g_runematch_frags_killedby_runeholder; -float autocvar_g_runematch_frags_norune; -float autocvar_g_runematch_point_leadlimit; -#define autocvar_g_runematch_point_limit cvar("g_runematch_point_limit") -float autocvar_g_runematch_pointamt; -float autocvar_g_runematch_pointrate; -float autocvar_g_runematch_respawntime; -float autocvar_g_runematch_rune_alpha; -float autocvar_g_runematch_rune_color_strength; -float autocvar_g_runematch_rune_effects; -float autocvar_g_runematch_shuffletime; float autocvar_g_running_guns; float autocvar_g_shootfromcenter; float autocvar_g_shootfromclient; diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 1c4f220e27..a403af3292 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -401,7 +401,6 @@ void PutObserverInServer (void) WriteEntity(MSG_ONE, self); } - DropAllRunes(self); MUTATOR_CALLHOOK(MakePlayerObserver); minstagib_stop_countdown(self); @@ -475,7 +474,6 @@ void PutObserverInServer (void) self.think = func_null; self.nextthink = 0; self.hook_time = 0; - self.runes = 0; self.deadflag = DEAD_NO; self.angles = spot.angles; self.angles_z = 0; @@ -805,8 +803,6 @@ void PutClientInServer (void) self.metertime = 0; - self.runes = 0; - self.deadflag = DEAD_NO; self.angles = spot.angles; @@ -1638,7 +1634,6 @@ void ClientDisconnect (void) bprint ("^4",self.netname); bprint ("^4 disconnected\n"); - DropAllRunes(self); MUTATOR_CALLHOOK(ClientDisconnect); Portal_ClearAll(self); @@ -2001,32 +1996,6 @@ void player_regen (void) max_mod = regen_mod = rot_mod = limit_mod = 1; - if (self.runes & RUNE_REGEN) - { - if (self.runes & CURSE_VENOM) // do we have both rune/curse? - { - regen_mod = autocvar_g_balance_rune_regen_combo_regenrate; - max_mod = autocvar_g_balance_rune_regen_combo_hpmod; - limit_mod = autocvar_g_balance_rune_regen_combo_limitmod; - } - else - { - regen_mod = autocvar_g_balance_rune_regen_regenrate; - max_mod = autocvar_g_balance_rune_regen_hpmod; - limit_mod = autocvar_g_balance_rune_regen_limitmod; - } - } - else if (self.runes & CURSE_VENOM) - { - max_mod = autocvar_g_balance_curse_venom_hpmod; - if (self.runes & RUNE_REGEN) // do we have both rune/curse? - rot_mod = autocvar_g_balance_rune_regen_combo_rotrate; - else - rot_mod = autocvar_g_balance_curse_venom_rotrate; - limit_mod = autocvar_g_balance_curse_venom_limitmod; - //if (!self.runes & RUNE_REGEN) - // rot_mod = autocvar_g_balance_curse_venom_rotrate; - } maxh = maxh * max_mod; //maxa = maxa * max_mod; //maxf = maxf * max_mod; diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index 50401604ef..6ddf7b69ed 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -712,20 +712,6 @@ void SV_PlayerPhysics() else if(g_keepaway) maxspd_mod *= autocvar_g_keepaway_ballcarrier_highspeed; - if(g_runematch) - { - if(self.runes & RUNE_SPEED) - { - if(self.runes & CURSE_SLOW) - maxspd_mod *= autocvar_g_balance_rune_speed_combo_highspeed; - else - maxspd_mod *= autocvar_g_balance_rune_speed_highspeed; - } - else if(self.runes & CURSE_SLOW) - { - maxspd_mod *= autocvar_g_balance_curse_slow_highspeed; - } - } maxspd_mod *= autocvar_g_movement_highspeed; // fix physics stats for g_movement_highspeed diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index e81b08e58e..73bf1bca7d 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -590,7 +590,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht // print an obituary message Obituary (attacker, inflictor, self, deathtype); race_PreDie(); - DropAllRunes(self); // increment frag counter for used weapon type float w; diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index f697d3689c..cf6ebed95b 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -14,21 +14,6 @@ float W_WeaponRateFactor() float t; t = 1.0 / g_weaponratefactor; - if(g_runematch) - { - if(self.runes & RUNE_SPEED) - { - if(self.runes & CURSE_SLOW) - t = t * autocvar_g_balance_rune_speed_combo_atkrate; - else - t = t * autocvar_g_balance_rune_speed_atkrate; - } - else if(self.runes & CURSE_SLOW) - { - t = t * autocvar_g_balance_curse_slow_atkrate; - } - } - return t; } diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index bfea6b2bcb..93e9d7c801 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -215,9 +215,6 @@ float intermission_running; float intermission_exittime; float alreadychangedlevel; - -.float runes; - // Keys player is holding .float itemkeys; // message delay for func_door locked by keys and key locks @@ -299,9 +296,6 @@ string gamemode_name; float startitem_failed; -void DropAllRunes(entity pl); - - typedef .float floatfield; floatfield Item_CounterField(float it); diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 31512fbff0..d3fdd09734 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -186,11 +186,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) else { self = oldself; - if(g_runematch) - { - f = RunematchHandleFrags(attacker, targ, f); - } - else if(g_lms) + if(g_lms) { // remove a life float tl; @@ -273,8 +269,6 @@ string AppendItemcodes(string s, entity player) s = strcat(s, "T"); if(player.kh_next) s = strcat(s, "K"); - if(player.runes) - s = strcat(s, "|", ftos(player.runes)); return s; } @@ -741,40 +735,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage = damage * autocvar_g_balance_selfdamagepercent; // Partial damage if the attacker hits himself } - if(g_runematch) - { - // apply strength rune - if (attacker.runes & RUNE_STRENGTH) - { - if(attacker.runes & CURSE_WEAK) // have both curse & rune - { - damage = damage * autocvar_g_balance_rune_strength_combo_damage; - force = force * autocvar_g_balance_rune_strength_combo_force; - } - else - { - damage = damage * autocvar_g_balance_rune_strength_damage; - force = force * autocvar_g_balance_rune_strength_force; - } - } - else if (attacker.runes & CURSE_WEAK) - { - damage = damage * autocvar_g_balance_curse_weak_damage; - force = force * autocvar_g_balance_curse_weak_force; - } - - // apply defense rune - if (targ.runes & RUNE_DEFENSE) - { - if (targ.runes & CURSE_VULNER) // have both curse & rune - damage = damage * autocvar_g_balance_rune_defense_combo_takedamage; - else - damage = damage * autocvar_g_balance_rune_defense_takedamage; - } - else if (targ.runes & CURSE_VULNER) - damage = damage * autocvar_g_balance_curse_vulner_takedamage; - } - // count the damage if(attacker) if(!targ.deadflag) @@ -866,42 +826,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force); self = oldself; - if(targ.classname == "player" && attacker.classname == "player" && attacker != targ && attacker.health > 2) - { - if(g_runematch) - { - if (attacker.runes & RUNE_VAMPIRE) - { - // apply vampire rune - if (attacker.runes & CURSE_EMPATHY) // have the curse too - { - //attacker.health = attacker.health + damage * autocvar_g_balance_rune_vampire_combo_absorb; - attacker.health = bound( - autocvar_g_balance_curse_empathy_minhealth, // LA: was 3, now 40 - attacker.health + damage * autocvar_g_balance_rune_vampire_combo_absorb, - autocvar_g_balance_rune_vampire_maxhealth); // LA: was 1000, now 500 - } - else - { - //attacker.health = attacker.health + damage * autocvar_g_balance_rune_vampire_absorb; - attacker.health = bound( - attacker.health, // LA: was 3, but changed so that you can't lose health - // empathy won't let you gain health in the same way... - attacker.health + damage * autocvar_g_balance_rune_vampire_absorb, - autocvar_g_balance_rune_vampire_maxhealth); // LA: was 1000, now 500 - } - } - // apply empathy curse - else if (attacker.runes & CURSE_EMPATHY) - { - attacker.health = bound( - autocvar_g_balance_curse_empathy_minhealth, // LA: was 3, now 20 - attacker.health + damage * autocvar_g_balance_curse_empathy_takedamage, - attacker.health); - } - } - } - // apply mirror damage if any if(mirrordamage > 0 || mirrorforce > 0) { diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc index 293c78f001..12c75ae9e5 100644 --- a/qcsrc/server/g_triggers.qc +++ b/qcsrc/server/g_triggers.qc @@ -476,17 +476,6 @@ void trigger_hurt_touch() Damage(other, self, self, self.dmg, DEATH_HURTTRIGGER, other.origin, '0 0 0'); } } - else - { - if (!other.owner) - { - if (other.classname == "rune") // reset runes - { - EXACTTRIGGER_TOUCH; - other.nextthink = min(other.nextthink, time + 1); - } - } - } return; } diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 5e5fc4c7d4..cac843b23a 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -271,7 +271,6 @@ void cvar_changes_init() BADCVAR("g_onslaught"); BADCVAR("g_race"); BADCVAR("g_race_qualifying_timelimit"); - BADCVAR("g_runematch"); BADCVAR("g_tdm"); BADCVAR("g_tdm_teams"); BADCVAR("leadlimit"); @@ -315,7 +314,6 @@ void cvar_changes_init() BADCVAR("g_keyhunt_point_leadlimit"); BADPREFIX("g_mod_"); BADCVAR("g_nexball_goalleadlimit"); - BADCVAR("g_runematch_point_leadlimit"); BADCVAR("leadlimit_and_fraglimit"); BADCVAR("leadlimit_override"); BADCVAR("pausable"); @@ -381,7 +379,6 @@ void cvar_changes_init() BADCVAR("g_mirrordamage"); BADCVAR("g_nexball_goallimit"); BADCVAR("g_powerups"); - BADCVAR("g_runematch_point_limit"); BADCVAR("g_start_delay"); BADCVAR("g_warmup"); BADCVAR("g_weapon_stay"); BADPRESUFFIX("g_", "_weapon_stay"); diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index e3689cc3d3..63ed488c0d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1183,7 +1183,7 @@ void readlevelcvars(void) g_warmup_allguns = cvar("g_warmup_allguns"); g_warmup_allow_timeout = cvar("g_warmup_allow_timeout"); - if ((g_race && g_race_qualifying == 2) || g_runematch || g_arena || g_assault || cvar("g_campaign")) + if ((g_race && g_race_qualifying == 2) || g_arena || g_assault || cvar("g_campaign")) inWarmupStage = 0; // these modes cannot work together, sorry g_pickup_respawntime_weapon = cvar("g_pickup_respawntime_weapon"); @@ -1516,11 +1516,6 @@ void precache() { // gamemode related things precache_model ("models/misc/chatbubble.spr"); - if (g_runematch) - { - precache_model ("models/runematch/curse.mdl"); - precache_model ("models/runematch/rune.mdl"); - } #ifdef TTURRETS_ENABLED if (autocvar_g_turrets) diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh index d90d564b50..35b2e65234 100644 --- a/qcsrc/server/mutators/base.qh +++ b/qcsrc/server/mutators/base.qh @@ -142,7 +142,7 @@ MUTATOR_HOOKABLE(PlayerDamage_SplitHealthArmor); float damage_save; MUTATOR_HOOKABLE(PlayerDamage_Calculate); - // called to adjust damage and force values which are applied to the player, used for e.g. strength damage/force multiplier or runematch runes + // called to adjust damage and force values which are applied to the player, used for e.g. strength damage/force multiplier // i'm not sure if I should change this around slightly (Naming of the entities, and also how they're done in g_damage). // INPUT: entity frag_attacker; diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index db93116109..e991f9765e 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -96,7 +96,7 @@ g_subs.qc g_tetris.qc -runematch.qc +//runematch.qc arena.qc g_violence.qc diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index c91c1ac189..d80b777a6f 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -153,7 +153,6 @@ Called before each frame by the server float game_delay; float game_delay_last; -void RuneMatchGivePoints(); float RedirectionThink(); entity SelectSpawnPoint (float anypoint); void StartFrame (void) @@ -238,7 +237,6 @@ void StartFrame (void) CreatureFrame (); CheckRules_World (); - RuneMatchGivePoints(); bot_serverframe(); FOR_EACH_PLAYER(self) diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index 1ed2f533b3..ab586a1ac4 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -52,7 +52,6 @@ string TeamNoName(float t) return "Neutral Team"; } -void runematch_init(); void tdm_init(); void entcs_init(); @@ -146,14 +145,6 @@ void InitGameplayMode() have_team_spawns = -1; // request team spawns } - if(g_runematch) - { - // ActivateTeamplay(); - fraglimit_override = autocvar_g_runematch_point_limit; - leadlimit_override = autocvar_g_runematch_point_leadlimit; - runematch_init(); - } - if(g_lms) { fraglimit_override = autocvar_g_lms_lives_override; -- 2.39.2