r0.921

14 files changed, 54 insertions, 50 deletions

diff --git a/TemplePushing.c4s/Sections.c4d/Ambience.ogg b/TemplePushing.c4s/Sections.c4d/Ambience.ogg
new file mode 100644
index 0000000..1f2bb70
--- /dev/null
+++ b/TemplePushing.c4s/Sections.c4d/Ambience.ogg
diff --git a/TemplePushing.c4s/Sections.c4d/Ambience.wav b/TemplePushing.c4s/Sections.c4d/Ambience.wav
deleted file mode 100644
index de426a5..0000000
--- a/TemplePushing.c4s/Sections.c4d/Ambience.wav
+++ /dev/null
diff --git a/TemplePushing.c4s/Sections.c4d/CloudAmbience.ogg b/TemplePushing.c4s/Sections.c4d/CloudAmbience.ogg
new file mode 100644
index 0000000..b6e01a6
--- /dev/null
+++ b/TemplePushing.c4s/Sections.c4d/CloudAmbience.ogg
diff --git a/TemplePushing.c4s/Sections.c4d/CloudAmbience.wav b/TemplePushing.c4s/Sections.c4d/CloudAmbience.wav
deleted file mode 100644
index 43f270a..0000000
--- a/TemplePushing.c4s/Sections.c4d/CloudAmbience.wav
+++ /dev/null
diff --git a/TemplePushing.c4s/Sections.c4d/ExtremeAmbience.ogg b/TemplePushing.c4s/Sections.c4d/ExtremeAmbience.ogg
new file mode 100644
index 0000000..15275e0
--- /dev/null
+++ b/TemplePushing.c4s/Sections.c4d/ExtremeAmbience.ogg
diff --git a/TemplePushing.c4s/Sections.c4d/ExtremeAmbience.wav b/TemplePushing.c4s/Sections.c4d/ExtremeAmbience.wav
deleted file mode 100644
index 4861190..0000000
--- a/TemplePushing.c4s/Sections.c4d/ExtremeAmbience.wav
+++ /dev/null
diff --git a/TemplePushing.c4s/Sections.c4d/FestiveAmbience.ogg b/TemplePushing.c4s/Sections.c4d/FestiveAmbience.ogg
new file mode 100644
index 0000000..40438f7
--- /dev/null
+++ b/TemplePushing.c4s/Sections.c4d/FestiveAmbience.ogg
diff --git a/TemplePushing.c4s/Sections.c4d/FestiveAmbience.wav b/TemplePushing.c4s/Sections.c4d/FestiveAmbience.wav
deleted file mode 100644
index 7b8ca6b..0000000
--- a/TemplePushing.c4s/Sections.c4d/FestiveAmbience.wav
+++ /dev/null
diff --git a/TemplePushing.c4s/Sections.c4d/LiquidAmbience.ogg b/TemplePushing.c4s/Sections.c4d/LiquidAmbience.ogg
new file mode 100644
index 0000000..f8dd22c
--- /dev/null
+++ b/TemplePushing.c4s/Sections.c4d/LiquidAmbience.ogg
diff --git a/TemplePushing.c4s/Sections.c4d/LiquidAmbience.wav b/TemplePushing.c4s/Sections.c4d/LiquidAmbience.wav
deleted file mode 100644
index e601b3e..0000000
--- a/TemplePushing.c4s/Sections.c4d/LiquidAmbience.wav
+++ /dev/null
diff --git a/TemplePushing.c4s/Sections.c4d/SectClassic.c4d/Script.c b/TemplePushing.c4s/Sections.c4d/SectClassic.c4d/Script.c
index cbf4f40..ed67274 100644
--- a/TemplePushing.c4s/Sections.c4d/SectClassic.c4d/Script.c
+++ b/TemplePushing.c4s/Sections.c4d/SectClassic.c4d/Script.c
@@ -5,18 +5,15 @@
 public func SectionName() { return "Classic"; }
 
 public func SpawnpointLocations() { return [[550, 282], [603, 205], [682, 282], [784, 227], [912, 168], [1040, 120],
-	[648, 460], [432, 438], [170, 118], [299, 170], [441, 230], [1175, 290], [105, 380], [910, 400], [560, 610]]; }
+	[648, 460], [432, 438], [170, 118], [299, 170], [441, 230], [1170, 290], [105, 375], [910, 400], [560, 610], [1040, 530], [300, 530], [780, 530], [1040, 400]]; }
 
 protected func Initialize()
 {
 	// Moving bricks
-	var bricks = [CreateObject(BRK2, 225, 150, NO_OWNER), CreateObject(BRK2, 985, 150, NO_OWNER)];
+	var bricks = [CreateObject(BRK2, 240, 150, NO_OWNER), CreateObject(BRK2, 970, 150, NO_OWNER)];
 
 	if (ambienceEnabled)
-	{
-		// Background Sound
-		if (mode != MODE_Apocalyptic && mode != MODE_Festive) SoundLevel("Ambience", 70);
-		
+	{	
 		// Fog
 		for (var i; i < 300; ++i)
 		{
@@ -43,9 +40,6 @@ protected func Initialize()
 		AddEffect("FireRain", 0, 20, 1);
 		CreateObject(FRRN, 0, 0, NO_OWNER);
 		
-		// Background sound
-		SoundLevel("ExtremeAmbience", 100);
-		
 		// Modulate brick color (object + material)
 		for (var brick in bricks)
 		{
@@ -56,15 +50,21 @@ protected func Initialize()
 	}
 	
 	if (mode == MODE_Festive)
-	{
-		// Chilly ambience
-		if (ambienceEnabled) SoundLevel("FestiveAmbience", 60);
-		
+	{	
 		// Modulate brick color (object + material)
 		for (var brick in bricks)
 		{
-			brick->SetClrModulation(RGB(189, 243, 255));
+			brick->SetClrModulation(RGBa(125, 200, 255, 30));
 		}
-		SetMaterialColor(Material("Brick"), 100, 100, 230, 150, 150, 255, 30, 30, 50);
+		
+		// Modulate material colour
+		SetMatAdjust(RGBa(125, 200, 255, 30));
 	}
+}
+
+public func SectionAmbienceSounds()
+{
+	if (mode == MODE_Festive) return [["FestiveAmbience.ogg", 25]];
+	else if (mode == MODE_Apocalyptic) return [["ExtremeAmbience.ogg", 75]];
+	else return [["Ambience.ogg", 50], ["Rain.ogg", 75]];
 }
\ No newline at end of file
diff --git a/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Fog3.c4d/Particle.txt b/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Fog3.c4d/Particle.txt
index 146bc0b..b2a1315 100644
--- a/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Fog3.c4d/Particle.txt
+++ b/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Fog3.c4d/Particle.txt
@@ -1,6 +1,6 @@
 [Particle]
 Name=Fog3
-MaxCount=500
+MaxCount=300
 InitFn=StdInit
 ExecFn=StdExec
 DrawFn=Std
diff --git a/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Script.c b/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Script.c
index b2f1c25..ead2b17 100644
--- a/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Script.c
+++ b/TemplePushing.c4s/Sections.c4d/SectCloudTemple.c4d/Script.c
@@ -4,35 +4,36 @@
 
 public func SectionName() { return "CloudTemple"; }
 
-public func SpawnpointLocations() { return [[70, 100], [140, 310], [1105, 310], [431, 443], [830, 160], [420, 160], [300, 90], [230, 440], [320, 310], [530, 90], [625, 160],[720, 90], [930, 310], [820, 440], [950, 90], [1180, 100]]; } 
+public func SpawnpointLocations() { return [[70, 100], [140, 310], [1105, 310], [431, 443], [830, 160], [420, 160], [300, 90], [230, 440], [320, 310], [530, 90], [625, 160],[720, 90], [930, 310], [820, 440], [950, 90], [1180, 100], [1020, 440]]; } 
 
 protected func Initialize()
 {
 	Music();
 	
-	// Create "Clouds"	
-	for (var i; i < 100; ++i)
+	if (ambienceEnabled)
 	{
-		if (mode == MODE_Apocalyptic)
-		{
-			CreateParticle("Fog3", Random(LandscapeWidth()), RandomX(570, 700) -10, 0, 0, RandomX(1250, 2000), RGB(255,0,0));
-		}
-		else
+		// Create "Clouds"	
+		for (var i; i < 80; ++i)
 		{
-			CreateParticle("Fog3", Random(LandscapeWidth()), RandomX(570, 700) -10, 0, 0, RandomX(1250, 2000));
+			if (mode == MODE_Apocalyptic)
+			{
+				CreateParticle("Fog3", Random(LandscapeWidth()), RandomX(570, 700) -10, 0, 0, RandomX(1250, 2000), RGB(255,0,0));
+			}
+			else
+			{
+				CreateParticle("Fog3", Random(LandscapeWidth()), RandomX(570, 700) -10, 0, 0, RandomX(1250, 2000));
+			}
 		}
-	}
-		
-	if (ambienceEnabled)
-	{
-		// Create background sound
-		if (mode != MODE_Apocalyptic && mode != MODE_Festive) SoundLevel("CloudAmbience", 50);
 		
 		// Create sun and lenseflare
 		CreateObject(SONE, 0, 0, NO_OWNER);
 		CreateObject(LENS, 0, 0, NO_OWNER);
+		
+		// Create crystals
+		CreateObject(BCRY, LandscapeWidth()/2, 171, NO_OWNER);
+		// CreateObject(BCRS, 100, 100, NO_OWNER);
 	}
-	
+
 	if (mode == MODE_Apocalyptic)
 	{
 		// Rock fall
@@ -45,20 +46,27 @@ protected func Initialize()
 		AddEffect("FireRain", 0, 20, 1);
 		CreateObject(FRRN, 0, 0, NO_OWNER);
 		
-		// Background sound
-		SoundLevel("ExtremeAmbience", 100);
-		
 		// Modulate brick and crystal colour
 		SetMaterialColor(Material("Brick"), 100, 0, 0, 150, 0, 0, 20, 0, 0);
 		SetMaterialColor(Material("SkyCrystal"), 245, 0, 0, 255, 0, 0, 20, 0, 0);
+		
+		// Modulate huge/giant crystal colour
+		// SetColor
 	}
 	
 	if (mode == MODE_Festive)
-	{
-		// Chilly ambience
-		SoundLevel("FestiveAmbience", 60);
+	{	
+		// Modulate material colour
+		SetMatAdjust(RGBa(175, 230, 255, 55));
 		
-		// Modulate brick colour
-		SetMaterialColor(Material("Brick"), 100, 100, 230, 150, 150, 255, 30, 30, 50);
+		// Modulate crystal colour
+		SetClrModulation(RGBa(175, 230, 255, 55), FindObject(BCRY));	
 	}
+}
+
+public func SectionAmbienceSounds()
+{
+	if (mode == MODE_Festive) return [["FestiveAmbience.ogg", 25]];
+	else if (mode == MODE_Apocalyptic) return [["ExtremeAmbience.ogg", 75]];
+	else return [["CloudAmbience.ogg", 50]];
 }
\ No newline at end of file
diff --git a/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c b/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c
index 651ac9a..9a7bed4 100644
--- a/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c
+++ b/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c
@@ -15,9 +15,6 @@ public func SectionName() { return "LiquidTemple"; }
 		// Create lava rain
 		if (mode != MODE_Festive) AddEffect("LavaRain", 0, 20, 1);
 		
-		// Create background sound
-		if (mode != MODE_Apocalyptic && mode != MODE_Festive) SoundLevel("LiquidAmbience", 50);
-		
 		/*
 		for (var i; i < 300; ++i)
 		{
@@ -38,22 +35,21 @@ public func SectionName() { return "LiquidTemple"; }
 		AddEffect("FireRain", 0, 20, 1);
 		CreateObject(FRRN, 0, 0, NO_OWNER);
 		
-		// Background sound
-		SoundLevel("ExtremeAmbience", 100);
-		
 		// Modulate brick colour (material)
 		SetMaterialColor(Material("Brick"), 100, 0, 0, 150, 0, 0, 20, 0, 0);
 	}
 	
 	if (mode == MODE_Festive)
 	{
-		// Chilly ambience
-		if (ambienceEnabled) SoundLevel("FestiveAmbience", 60);
-		
 		// Modulate colours
 		SetSkyAdjust(RGB(90,90,255));
 		SetMaterialColor(Material("Brick"), 150, 150, 255, 150, 150, 255, 150, 150, 255);
 	}
 }
 
-
+public func SectionAmbienceSounds()
+{
+	if (mode == MODE_Festive) return [["FestiveAmbience.ogg", 25]];
+	else if (mode == MODE_Apocalyptic) return [["ExtremeAmbience.ogg", 75]];
+	else return [["LiquidAmbience.ogg", 50], ["Rain.ogg", 10]];
+}