Condense campaign research into one file

Squashes the campaign research files into one so that research from previous campaigns can be interlinked with each-other and allow proper research bonuses to be applied for both the player and more importantly the enemy players. To see how this works, view function camCompleteRequiredResearch(array_of_research_names, player) in the campaign library. VTOL factory production research message no longer uses the rearming pad message. Delete cam1res.wrf Delete cam2res.wrf Delete cam3res.wrf Delete research_cam1.json Delete research_cam2.json Delete research_cam3.json
Warzone2100 · Aug 1, 2017 · a696594 · a696594
1 parent 08248b8
commit a696594
Show file tree

Hide file tree

Showing 10 changed files with 8,561 additions and 10,849 deletions.
diff --git a/data/base/gamedesc.lev b/data/base/gamedesc.lev
@@ -27,7 +27,7 @@ data		"wrf/tut.wrf"
 data 		"wrf/audio.wrf"
 data		"wrf/tutorial/tutaudio.wrf"
 data		"wrf/stats.wrf"
-data 		"wrf/cam1res.wrf"
+data 		"wrf/camres.wrf"
 
 /* Tutorial Level 3 - Base Building. */
 camstart	TUTORIAL3
@@ -45,7 +45,7 @@ data		"wrf/basic.wrf"
 data		"wrf/cam1.wrf"
 data		"wrf/audio.wrf"
 data		"wrf/stats.wrf"
-data		"wrf/cam1res.wrf"
+data		"wrf/camres.wrf"
 
 /* Campaign 1 now starts with 1A */
 camstart	CAM_1A
@@ -162,7 +162,7 @@ data		"wrf/basic.wrf"
 data		"wrf/cam2.wrf"
 data		"wrf/audio.wrf"
 data		"wrf/stats.wrf"
-data		"wrf/cam2res.wrf"
+data		"wrf/camres.wrf"
 
 camstart	CAM_2A
 dataset		CAM_2
@@ -269,7 +269,7 @@ data		"wrf/basic.wrf"
 data		"wrf/cam3.wrf"
 data		"wrf/audio.wrf"
 data		"wrf/stats.wrf"
-data		"wrf/cam3res.wrf"
+data		"wrf/camres.wrf"
 
 camstart	CAM_3A
 dataset		CAM_3