Move weather scripts to JS.

- Fixes a warning for cam2-5s by not including a directory that does not exist. - Audio is started from rules.js rather than the weather scripts. - Rocky maps use the Kevlar scavenger texture. - Weather used in multiplay. Qtscript: Adds function setCampaignNumber(number). Fixes ticket:983. Music resets in eventGameInit in rules.js.
Warzone2100 · Dec 20, 2017 · b016f60 · b016f60
1 parent f093075
commit b016f60
Show file tree

Hide file tree

Showing 66 changed files with 295 additions and 567 deletions.
diff --git a/data/base/script/rules.js b/data/base/script/rules.js
@@ -67,16 +67,23 @@ function setMainReticule()
 
 function setupGame()
 {
-	if (tilesetType == "URBAN")
+	if (tilesetType == "ARIZONA")
 	{
+		setCampaignNumber(1);
+	}
+	else if (tilesetType == "URBAN")
+	{
+		setCampaignNumber(2);
 		replaceTexture("page-7-barbarians-arizona.png", "page-7-barbarians-urban.png");
 		replaceTexture("page-8-player-buildings-bases.png", "page-8-player-buildings-bases-urban.png");
 		replaceTexture("page-9-player-buildings-bases.png", "page-9-player-buildings-bases-urban.png");
 	}
 	else if (tilesetType == "ROCKIES")
 	{
+		setCampaignNumber(3);
 		replaceTexture("page-8-player-buildings-bases.png", "page-8-player-buildings-bases-rockies.png");
 		replaceTexture("page-9-player-buildings-bases.png", "page-9-player-buildings-bases-rockies.png");
+		replaceTexture("page-7-barbarians-arizona.png", "page-7-barbarians-kevlar.png");
 	}
 
 	if (tilesetType != "ARIZONA")
@@ -93,6 +100,7 @@ function setupGame()
 	setReticuleButton(6, _("Commanders (F6)"), "image_commanddroid_up.png", "image_commanddroid_down.png");
 	setMainReticule();
 	showInterface();
+	hackPlayIngameAudio();
 }
 
 function eventGameLoaded()

diff --git a/data/base/script/weather.js b/data/base/script/weather.js
@@ -0,0 +1,51 @@
+//Controls weather conditions like rain/snow. Fog stuff goes here.
+var loaded; //don't execute stuff in eventGameInit more than once
+
+function wDefined(x)
+{
+     return typeof(x) !== "undefined";
+}
+
+//Allows up to max - 1 to be generated.
+function wRandom(max)
+{
+     return Math.floor(Math.random() * max);
+}
+
+function eventGameInit()
+{
+     if (wDefined(loaded) && loaded)
+     {
+          return;
+     }
+
+     loaded = true;
+     if (tilesetType === "URBAN" || tilesetType === "ROCKIES")
+     {
+          weatherCycle();
+          setTimer("weatherCycle", 45000);
+     }
+     else
+     {
+          setWeather(WEATHER_CLEAR);
+     }
+}
+
+function weatherCycle()
+{
+     if (wRandom(100) > 33)
+     {
+          if (tilesetType === "URBAN")
+          {
+               setWeather(WEATHER_RAIN);
+          }
+          else if (tilesetType === "ROCKIES")
+          {
+               setWeather(WEATHER_SNOW);
+          }
+     }
+     else
+     {
+          setWeather(WEATHER_CLEAR); //stop weather effect
+     }
+}
diff --git a/data/base/wrf/cam1/cam1a-c.wrf b/data/base/wrf/cam1/cam1a-c.wrf
@@ -9,15 +9,9 @@ directory	"messages"
 file		SMSG		"brief1a-c.txt"
 file		SMSG		"prox1a-c.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1night.vlo"
-
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1a-c.js"
diff --git a/data/base/wrf/cam1/cam1a.wrf b/data/base/wrf/cam1/cam1a.wrf
@@ -9,17 +9,9 @@ directory	"messages"
 file		SMSG		"brief1a.txt"
 file		SMSG		"prox1a.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1a.js"
diff --git a/data/base/wrf/cam1/cam1b.wrf b/data/base/wrf/cam1/cam1b.wrf
@@ -9,17 +9,9 @@ directory	"messages"
 file		SMSG		"brief1b.txt"
 file		SMSG		"prox1b.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1b.js"
diff --git a/data/base/wrf/cam1/cam1c.wrf b/data/base/wrf/cam1/cam1c.wrf
@@ -9,17 +9,9 @@ directory	"messages"
 file		SMSG		"brief1c.txt"
 file		SMSG		"prox1c.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1night.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1c.js"
diff --git a/data/base/wrf/cam1/cam1ca.wrf b/data/base/wrf/cam1/cam1ca.wrf
@@ -9,17 +9,9 @@ directory	"messages"
 file		SMSG		"brief1ca.txt"
 file		SMSG		"prox1ca.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1mkday.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1ca.js"
diff --git a/data/base/wrf/cam1/cam1end.wrf b/data/base/wrf/cam1/cam1end.wrf
@@ -8,16 +8,9 @@ directory	"messages"
 
 file		SMSG		"cam1-outro.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1day.vlo"
-
 directory "script"
-file JAVASCRIPT      "rules.js"
+file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1end.js"
diff --git a/data/base/wrf/cam1/sub1-1.wrf b/data/base/wrf/cam1/sub1-1.wrf
@@ -9,17 +9,9 @@ directory	"messages"
 file		SMSG		"brief1-1.txt"
 file		SMSG		"prox1-1.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1mkday.vlo"
-
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-1.js"
diff --git a/data/base/wrf/cam1/sub1-1s.wrf b/data/base/wrf/cam1/sub1-1s.wrf
@@ -8,17 +8,9 @@ directory	"messages"
 
 file		SMSG		"brief1-1.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1night.vlo"
-
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-1s.js"
diff --git a/data/base/wrf/cam1/sub1-2.wrf b/data/base/wrf/cam1/sub1-2.wrf
@@ -9,18 +9,9 @@ directory	"messages"
 file		SMSG		"brief1-2.txt"
 file		SMSG		"prox1-2.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-2.js"
diff --git a/data/base/wrf/cam1/sub1-2s.wrf b/data/base/wrf/cam1/sub1-2s.wrf
@@ -8,16 +8,9 @@ directory	"messages"
 
 file		SMSG		"brief1-2.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-file		SCRIPT		"cam1daynight.slo"
-
-/* Directory for script value files*/
-directory       "script/data"
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-2s.js"
diff --git a/data/base/wrf/cam1/sub1-3.wrf b/data/base/wrf/cam1/sub1-3.wrf
@@ -9,19 +9,9 @@ directory	"messages"
 file		SMSG		"brief1-3.txt"
 file		SMSG		"prox1-3.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1mknight.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-3.js"
diff --git a/data/base/wrf/cam1/sub1-3s.wrf b/data/base/wrf/cam1/sub1-3s.wrf
@@ -8,19 +8,9 @@ directory	"messages"
 
 file		SMSG		"brief1-3.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-3s.js"
diff --git a/data/base/wrf/cam1/sub1-4a.wrf b/data/base/wrf/cam1/sub1-4a.wrf
@@ -9,19 +9,9 @@ directory	"messages"
 file		SMSG		"brief1-4a.txt"
 file		SMSG		"prox1-4a.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-4a.js"
diff --git a/data/base/wrf/cam1/sub1-4as.wrf b/data/base/wrf/cam1/sub1-4as.wrf
@@ -8,19 +8,9 @@ directory	"messages"
 
 file		SMSG		"brief1-4a.txt"
 
-/* Directory for uncompiled script files */
-directory       "script/text"
-
-file		SCRIPT		"cam1daynight.slo"
-
-
-/* Directory for script value files*/
-directory       "script/data"
-
-file            SCRIPTVAL       "cam1day.vlo"
-
-/* Directory for javascript files*/
 directory "script"
 file JAVASCRIPT "rules.js"
+file JAVASCRIPT "weather.js"
+
 directory "script/campaign"
 file JAVASCRIPT "cam1-4as.js"