Merge branch 'master' into Mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

diff --cc gamemodes.cfg
index 33e7bef41aaf7b025813c356309f898c826e1de2,af8d3e83d825411b18c8b58356711a49a46be44e..d9705ad9663c522a308a502b8341912a2ae0d882
--- 1/gamemodes.cfg
--- 2/gamemodes.cfg
+++ b/gamemodes.cfg
@@@ -427,100 -410,3 +420,43 @@@ set g_race 0 "Race: be faster than you
  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
- 
 +
 +// ===============
 +//  tower defense
 +// ===============
 +set g_td 0 "Tower Defense: protect the generator/s from waves of monsters"
 +set g_td_force_settings 0 "if enabled, don't use map settings (monster count, start wave etc.)"
 +set g_td_start_wave 1
 +set g_td_generator_health 700
 +set g_td_generator_damaged_points 20 "player loses this many points if the generator was damaged during the wave"
 +set g_td_current_monsters 10 "maximum monsters that can be spawned simultaneously"
 +set g_td_monster_count 10
 +set g_td_monster_count_increment 5
 +set g_td_buildphase_time 20
 +set g_td_generator_dontend 0 "don't change maps when a generator is destroyed (only if there is more than 1 generator)"
 +set g_td_pvp 0
 +set g_td_monsters_skill_start 1 "set to 0 to use g_monsters_skill instead"
 +set g_td_monsters_skill_increment 0.1
 +set g_td_monsters_spawnshield_time 2
 +set g_td_monsters_ignore_turrets 0
 +set g_td_max_waves 8
 +set g_td_kill_points 5
 +set g_td_turretkill_points 3
 +set g_td_turret_max 4
 +set g_td_turret_plasma_cost 50
 +set g_td_turret_mlrs_cost 80
 +set g_td_turret_walker_cost 100
 +set g_td_turret_towerbuff_cost 70
 +set g_td_turret_barricade_cost 20
 +set g_td_turret_flac_cost 40
 +set g_td_turret_upgrade_cost 100
 +set g_td_turret_repair_cost 20
 +set g_td_barricade_damage 10
 +set g_td_monsters_speed_walk 75
 +set g_td_monsters_speed_run 110
 +set g_td_monsters_spawn_delay 3
 +
 +// ====================
 +//  real-time strategy
 +// ====================
 +set g_rts 0 "Real-Time Strategy: defend your generator & turrets by controlling monsters"

diff --cc qcsrc/common/mapinfo.qc
index 606df668fafd96320a5aa6550137a6502b426ec0,b4dbda25f2bc2b2617c37342f460e2e2715e6a8f..ad5fc99143529bc0ba1ce4516e053f1bc34605a0
--- 1/qcsrc/common/mapinfo.qc
--- 2/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@@ -313,10 -313,6 +313,8 @@@ float _MapInfo_Generate(string pFilenam
                                        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 == "td_generator")
 +                                      MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_TD;
                                else if(v == "target_assault_roundend")
                                        MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_ASSAULT;
                                else if(v == "onslaught_generator")

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_physics.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/cl_weaponsystem.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/mutators/base.qh
Simple merge

diff --cc qcsrc/server/progs.src
Simple merge

diff --cc qcsrc/server/sv_main.qc
Simple merge

diff --cc qcsrc/server/teamplay.qc
index 0819588c1b2413e1b5c031f76a4329492fcead05,6608fc9a317e38e1e73686179016a354ecdabe45..1fb7ad122d3adc8214190ab4667205b4a3e7ed52
--- 1/qcsrc/server/teamplay.qc
--- 2/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -106,31 -105,7 +105,23 @@@ void InitGameplayMode(
                MUTATOR_ADD(gamemode_ctf);
                have_team_spawns = -1; // request team spawns
        }
 +    
 +      if(g_td)
 +      {
 +              fraglimit_override = 0; // no limits in TD - it's a survival mode
 +              leadlimit_override = 0;
 +              MUTATOR_ADD(gamemode_td);
 +      }
 +      
 +      if(g_rts)
 +      {
 +              ActivateTeamplay();
 +              fraglimit_override = 0;
 +              leadlimit_override = 0;
 +              MUTATOR_ADD(gamemode_rts);
 +              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;