Temporary hack to fix T2/T3 for now. Basically just ignoring attempts…

… to research

things that do not exist (instead of having lots of unreachable techs that do
nothing, which was the previous state). Remove duplicate script code for setting
amount of starting power; as a side effect starting power may be less now for
T2/T3. Will fix that later when scripts know the T2/T3 state. Closes ticket:3044

data/base/multiplay/skirmish/rules.js

@@ -20,8 +20,6 @@ function eventGameInit()
 		enableStructure("A0ResearchFacility", playnum);
 
 		// We need to enable these in order for scripts to be able to generate their templates.
-		// Cyborg legs is a research that is never researched. The rest are not even present in 
-		// the research system. They should be there as results, along with the bodies.
 		makeComponentAvailable("CyborgLegs", playnum);
 		makeComponentAvailable("Cyb-Wpn-Atmiss", playnum);
 		makeComponentAvailable("CyborgCannon", playnum);

data/mp/multiplay/script/cam2tech.vlo

@@ -5,10 +5,6 @@ run
 //ALWAYS MAKE THIS THE SAME AS THE INDEX OF THE LAST ENTRY IN THE camTech[] array
 numCamTech		int 	115
 
-initialPowerCl	int     1000
-initialPowerBa	int     2000
-initialPowerDe	int     3000
-
 camTech	[0]	RESEARCHSTAT	"R-Comp-CommandTurret01"
 camTech	[1]	RESEARCHSTAT	"R-Comp-SynapticLink"
 camTech	[2]	RESEARCHSTAT	"R-Cyborg-Legs01"

data/mp/multiplay/script/cam3tech.vlo

@@ -3,13 +3,9 @@ run
 {	  
 //ALWAYS MAKE THIS THE SAME AS THE INDEX OF THE LAST ENTRY IN THE camTech[] array
 numCamTech		int 	253
-//ALWAYS MAKE THIS THE ONE MORE THAN THE INDEX OF THE LAST ENTRY IN THE camTech[] array
+//ALWAYS MAKE THIS THE ONE MORE THAN THE INDEX OF THE LAST ENTRY IN THE camTechB[] array
 numCamTechB		int 	17
 
-initialPowerCl	int     2000
-initialPowerBa	int     3000
-initialPowerDe	int     4000
-
 // tech level three
 camTech	[0]	RESEARCHSTAT	"R-Wpn-RocketSlow-ROF03"
 

data/mp/multiplay/script/camtech.slo

@@ -1,31 +1,13 @@
 // technology auto enabler.
 
-public	int		initialPowerCl, initialPowerBa, initialPowerDe, numCamTech, numCamTechB;
+public	int		numCamTech, numCamTechB;
 public	RESEARCHSTAT	camTech[254];
 public	RESEARCHSTAT	camTechB[17];
 
 event setTechPower(CALL_GAMEINIT)
 {
 	local int playnum, count;
 
-	playnum = 0;
-	while (playnum < MAX_PLAYERS)
-	{
-		if(multiPlayerBaseType == CAMP_CLEAN)
-		{
-			setPowerLevel(initialPowerCl, playnum);
-		}
-		else if(multiPlayerBaseType == CAMP_BASE)
-		{
-			setPowerLevel(initialPowerBa, playnum);
-		}
-		else
-		{
-			setPowerLevel(initialPowerDe, playnum);
-		}
-		playnum = playnum + 1;		
-	}
-
 	playnum = 0;
 	while (playnum < MAX_PLAYERS)
 	{

src/research.cpp

@@ -1726,12 +1726,7 @@ RESEARCH *getResearch(const char *pName)
 			return &asResearch[inc];
 		}
 	}
-
-	for (inc = 0; inc < asResearch.size(); inc++)
-	{
-		debug(LOG_ERROR, "  Research %d: %s", inc, asResearch[inc].pName);
-	}
-	debug(LOG_ERROR, "Unknown research - %s", pName);
+	debug(LOG_WARNING, "Unknown research - %s", pName);
 	return NULL;
 }
 

src/scriptfuncs.cpp

@@ -4249,11 +4249,11 @@ bool scrCompleteResearch(void)
 		return false;
 	}
 
-
-	if(psResearch == NULL)
+	if (psResearch == NULL)
 	{
-		ASSERT( false, "scrCompleteResearch: no such research topic" );
-		return false;
+		// hack to make T2 and T3 work even though the research lists 
+		// are polluted with tons of non-existent techs :(
+		return true;
 	}
 
 	researchIndex = psResearch->index;

src/scriptvals_parser.ypp

@@ -706,11 +706,13 @@ var_init:		var_entry TYPE var_value
 							YYABORT;
 						}
 						data.v.oval = getResearch($3.pString);	/* store pointer */
+#if 0
 						if (data.v.oval == NULL)
 						{
 							yyerror("Research %s not found", $3.pString);
 							YYABORT;
 						}
+#endif
 						if(!eventSetContextVar(psCurrContext, $1, &data))
 						{
 							yyerror("Set Value Failed for %u", $1);