Second level of my campaign, and some cvar fixes

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 69d6a92a36d28335a9319325594cd1eb9f4ed31a..cd292c08f4861dc3004639de0ba9c731156e8738 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -892,10 +892,9 @@ set quit_and_redirect ""   "set to an IP to redirect all players at the end of the
 \r
 // singleplayer campaign\r
 set g_campaign 0\r
-seta g_campaign_name "voretournament25"\r
+seta g_campaign_name "voretournament"\r
 set g_campaign_skill 0\r
-set g_campaignvoretournament20_index 0\r
-set g_campaignvoretournament25_index 1\r
+set g_campaignvoretournament_index 0\r
 \r
 alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0"\r
 alias singleplayer_continue "set scmenu_campaign_goto -1"\r

diff --git a/data/maps/campaign_voretournament.txt b/data/maps/campaign_voretournament.txt
index 5d1c69fb81a1c67f5116d82d2f8148d79aa6a5a1..231bb4242ff185e69f598dffa851205887039c00 100644 (file)
--- a/data/maps/campaign_voretournament.txt
+++ b/data/maps/campaign_voretournament.txt
@@ -1,4 +1,5 @@
 "//campaign:VoreTournament Campaign"
 "//game","mapname","bots","skill","frag","mutator-sets","description","long description"
 
-"dm","basement","1","1","5","bot_config_file maps/campaign_voretournament_bots_1.txt; g_vore 0; g_start_weapon_grabber 0","The escape","As you're slowly waking up, you see yourself in a small cell located inside a basement. A guard is patrolling the area. Suddenly, your cell door gets unlocked without the guard's knowledge. Who did that?\n\nFind a Grabber and use its electric attack to take the guard down. Then advance to the upper level of the facility, and try to recover your memory."
\ No newline at end of file
+"dm","basement","1","1","5","bot_config_file maps/campaign_voretournament_bots_1.txt; bot_vs_human 0; g_vore 0; g_start_weapon_grabber 0","The escape","As you're slowly waking up, you see yourself in a small cell located inside a basement. A guard is patrolling the area. Suddenly, your cell door gets unlocked without the guard's knowledge.\n\nFind a Grabber and use its electric attack to take the guard down. Then advance to the upper level of the facility, and try to recover your memory."
+"ctf","basementctf","2","2","5","bot_config_file maps/campaign_voretournament_bots_1.txt; bot_vs_human 1; g_vore 0; g_start_weapon_grabber 0","Unlocking the power of vore","As the guard drops dead and you prepare to advance, you hear a mysterious voice in your mind: 'You are the only one who can stop the Vore Princess, by obtaining the power of vore. Please, help us!'\n\nYou reach the second floor, where you come across two mysterious flags. 'Bring them together', the voice speaks again as two guards arrive."
\ No newline at end of file