Non-colliding players in last level (since you all play as ghosts)

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index d387f533dff4b0d04e8764c53a6def1318a5f538..45e5d176e47dc259220e02a4d0d1a5f16de412aa 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -426,6 +426,7 @@ set samelevel 0 "when 1, always play the same level over and over again"
 set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone into a death trap"\r
 \r
 set g_cloaked 0 "display all players mostly invisible"\r
+set g_player_colisions 1 "when disabled, players won't colide with each other"\r
 set g_player_alpha 1\r
 set g_player_brightness 0      "set to 2 for brighter players"\r
 seta g_balance_cloaked_alpha 0.25\r

diff --git a/data/maps/campaign_voretournament.txt b/data/maps/campaign_voretournament.txt
index 515ed35a0461d1b484d7c4e53e0d3466a1917da7..c65c2286629c18b7b63ab3711704312d80950528 100644 (file)
--- a/data/maps/campaign_voretournament.txt
+++ b/data/maps/campaign_voretournament.txt
@@ -20,4 +20,4 @@
 "tdm","stormkeep2","1","10","23","bot_config_file maps/campaign_voretournament_bots_17.txt; g_campaign_forceteam 1; sv_autotaunt 0","Awakening","You watch as your team is eaten and digested by the Vore Princess. You now remain alone with her, confronting her by your self. Finish her off and avenge your team!"
 "tdm","stormkeep2","1","10","32","bot_config_file maps/campaign_voretournament_bots_18.txt; g_campaign_forceteam 1; g_vore_reversescoring 1; sv_autotaunt 0","Meal for the Princess","As the Vore Princess falls to the ground ready for your final strike, your memory suddenly comes back. You freeze in shock. The Vore Princess was right. You are her spirit half, and your fate is to unleash the power of vore and defeat the Destroyer (Guardian).\n\nOffer yourself to the Vore Princess and let her eat you, so your spirits can merge and restore your power."
 "tdm","farewell","4","10","60","bot_config_file maps/campaign_voretournament_bots_19.txt; g_campaign_forceteam 2; sv_maxspeed 460; sv_jumpvelocity 500; g_balance_falldamage_minspeed 1000; g_balance_grabber_speed_pull 4000; g_balance_grabber_speed_fly 8000; g_balance_grabber_secondary_damage 300; g_balance_grabber_secondary_refire 0.25; g_balance_health_limit 800; g_balance_health_start 800; g_balance_pause_health_regen 0; g_balance_health_regenlinear 50; g_balance_health_regenstable 800; g_balance_health_rotstable 800; g_balance_fuel_limit 800; g_balance_fuel_regenstable 800; g_balance_fuel_rotstable 800; g_balance_fuel_regen 1; g_balance_pause_fuel_regen 0; g_start_ammo_fuel 800; g_balance_vore_digestion_damage 140; g_balance_vore_kick_delay 0.3; g_balance_vore_teamheal_stable 800; g_balance_vore_teamheal 25; g_balance_vore_regurgitate_speedcap 3000; g_balance_vore_kick_damage_min 100; g_balance_vore_kick_damage_max 200; g_balance_vore_kick_escapeprobability 0; g_balance_vore_regurgitate_force 2500; g_balance_vore_regurgitate_predatorforce 0","Astral fusion","The Vore Princess gently swallows you. Her stomach locks you inside as you begin digesting. Your body is soon broken, your spirit blending with hers and becoming one. Your true power is suddenly restored, as you become the Vore Princess.\n\nFight the Destroyer's guards outside of the castle, then make your way to his realm and defeat him."
-"tdm","brokenworld","7","10","60","bot_config_file maps/campaign_voretournament_bots_20.txt; g_campaign_forceteam 2; g_player_alpha 0.5; sv_maxspeed 460; sv_jumpvelocity 500; g_balance_falldamage_minspeed 1000; g_balance_grabber_speed_pull 4000; g_balance_grabber_speed_fly 8000; g_balance_grabber_secondary_damage 300; g_balance_grabber_secondary_refire 0.25; g_balance_health_limit 800; g_balance_health_start 800; g_balance_pause_health_regen 0; g_balance_health_regenlinear 50; g_balance_health_regenstable 800; g_balance_health_rotstable 800; g_balance_fuel_limit 800; g_balance_fuel_regenstable 800; g_balance_fuel_rotstable 800; g_balance_fuel_regen 1; g_balance_pause_fuel_regen 0; g_start_ammo_fuel 800; g_balance_vore_digestion_damage 140; g_balance_vore_kick_delay 0.3; g_balance_vore_teamheal_stable 800; g_balance_vore_teamheal 25; g_balance_vore_regurgitate_speedcap 3000; g_balance_vore_kick_damage_min 100; g_balance_vore_kick_damage_max 200; g_balance_vore_kick_escapeprobability 0; g_balance_vore_regurgitate_force 2500; g_balance_vore_regurgitate_predatorforce 0","Destroyer of the Destroyer","The nightmare guards in the castle fall to the ground. You use your magic to open a portal and get to the Destroyer's realm. Mystic Silver and Snack use their power to materialize there and aid you.\n\nFight and defeat the Destroyer in this final battle. Order will be restored, and everything will then be as it should be."
\ No newline at end of file
+"tdm","brokenworld","7","10","60","bot_config_file maps/campaign_voretournament_bots_20.txt; g_campaign_forceteam 2; g_player_colisions 0; g_player_alpha 0.5; sv_maxspeed 460; sv_jumpvelocity 500; g_balance_falldamage_minspeed 1000; g_balance_grabber_speed_pull 4000; g_balance_grabber_speed_fly 8000; g_balance_grabber_secondary_damage 300; g_balance_grabber_secondary_refire 0.25; g_balance_health_limit 800; g_balance_health_start 800; g_balance_pause_health_regen 0; g_balance_health_regenlinear 50; g_balance_health_regenstable 800; g_balance_health_rotstable 800; g_balance_fuel_limit 800; g_balance_fuel_regenstable 800; g_balance_fuel_rotstable 800; g_balance_fuel_regen 1; g_balance_pause_fuel_regen 0; g_start_ammo_fuel 800; g_balance_vore_digestion_damage 140; g_balance_vore_kick_delay 0.3; g_balance_vore_teamheal_stable 800; g_balance_vore_teamheal 25; g_balance_vore_regurgitate_speedcap 3000; g_balance_vore_kick_damage_min 100; g_balance_vore_kick_damage_max 200; g_balance_vore_kick_escapeprobability 0; g_balance_vore_regurgitate_force 2500; g_balance_vore_regurgitate_predatorforce 0","Destroyer of the Destroyer","The nightmare guards in the castle fall to the ground. You use your magic to open a portal and get to the Destroyer's realm. Mystic Silver and Snack use their power to materialize there and aid you.\n\nFight and defeat the Destroyer in this final battle. Order will be restored, and everything will then be as it should be."
\ No newline at end of file

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index d6898c8d7859e33099f9a1f077b18054fecdaab2..9035c5861635c0c8cd9dbb05351a4049184eaaa9 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -831,7 +831,10 @@ void PutClientInServer (void)
                self.wasplayer = TRUE;\r
                self.iscreature = TRUE;\r
                self.movetype = MOVETYPE_WALK;\r
-               self.solid = SOLID_SLIDEBOX;\r
+               if(cvar("g_player_colisions"))\r
+                       self.solid = SOLID_SLIDEBOX;\r
+               else\r
+                       self.solid = SOLID_CORPSE;\r
                if(cvar("g_playerclip_collisions"))\r
                        self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;\r
                else\r