TemplePushingB.c4s

5 files changed, 12 insertions, 10 deletions

diff --git a/TemplePushing.c4s/Misc.c4d/TSnowball.c4d/Script.c b/TemplePushing.c4s/Misc.c4d/TSnowball.c4d/Script.c
index aa90954..c99f5b3 100644
--- a/TemplePushing.c4s/Misc.c4d/TSnowball.c4d/Script.c
+++ b/TemplePushing.c4s/Misc.c4d/TSnowball.c4d/Script.c
@@ -12,6 +12,9 @@ protected func Hit() {
 protected func Departure(thrower) {
   var proc = GetProcedure(thrower);
   var comd = GetComDir(thrower);
+  
+  if (GetOCF() & OCF_CrewMember())
+  {
   // Ablegen -> Abbruch
   if (GetPlrDownDouble(GetOwner(thrower)))
     // Nur Ablegen in der Luft mit Befehlsrichtung? Luftwurf erlauben!
@@ -53,6 +56,7 @@ protected func Departure(thrower) {
   SetYDir(y_dir);
   
   Sound("Arrow");
+  }
 }
 
 func IsAlchemContainer() { return(true); }
diff --git a/TemplePushing.c4s/Script.c b/TemplePushing.c4s/Script.c
index 97f88bd..d045e3d 100644
--- a/TemplePushing.c4s/Script.c
+++ b/TemplePushing.c4s/Script.c
@@ -134,7 +134,8 @@ func UpdateScoreboard(int player, bool leaver)
 	SortScoreboard(SBRD_ScoreCol, true);
 	}
 	else SortScoreboard(SBRD_ScoreCol, true);
-	// SortScoreboard(SBRD_Caption);
+	
+	SortScoreboard(SBRD_Caption);
 }
 
 func ShowLobby()
@@ -506,7 +507,7 @@ func LaunchClonk(int player, object clonk, bool relaunch)
 	DrawParticleLine("PSpark", GetX(clonk) + RandomX(5, 60), 0, GetX(clonk), GetY(clonk), 10, 150, RGBa(Random(255), Random(255), Random(255),50), RGBa(Random(255), Random(255), Random(255),50), 0);
 	DrawParticleLine("PSpark", GetX(clonk) - RandomX(5, 60), 0, GetX(clonk), GetY(clonk), 10, 150, RGBa(Random(255), Random(255), Random(255),50), RGBa(Random(255), Random(255), Random(255),50), 0);
 	Sound("PlayerJoin", 0, clonk, 100);
-	// CastParticles("MSpark", 50, 20, GetX(clonk), GetY(clonk), 50, 75, RGBa(128,128,255,0), RGBa(255,255,255,127));
+	CastParticles("MSpark", 50, 20, GetX(clonk), GetY(clonk), 50, 75, RGBa(128,128,255,0), RGBa(255,255,255,127));
 	SetPlrView(player, clonk);
 	ResetHealth(clonk);
 }
diff --git a/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c b/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c
index f5eb2d8..651ac9a 100644
--- a/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c
+++ b/TemplePushing.c4s/Sections.c4d/SectLiquidTemple.c4d/Script.c
@@ -50,12 +50,9 @@ public func SectionName() { return "LiquidTemple"; }
 		// Chilly ambience
 		if (ambienceEnabled) SoundLevel("FestiveAmbience", 60);
 		
-		// Modulate material colours
-		SetMaterialColor(Material("Brick"), 100, 0, 0, 150, 0, 0, 20, 0, 0);
-		SetMaterialColor(Material("DarkBrick"), 100, 100, 230, 150, 150, 255, 30, 30, 50);
-		SetMaterialColor(Material("BackWall"), 100, 100, 230, 150, 150, 255, 30, 30, 50);
-		SetMaterialColor(Material("Wall"), 100, 100, 230, 150, 150, 255, 30, 30, 50);
-		SetMaterialColor(Material("BackBrick"), 100, 100, 230, 150, 150, 255, 30, 30, 50);
+		// Modulate colours
+		SetSkyAdjust(RGB(90,90,255));
+		SetMaterialColor(Material("Brick"), 150, 150, 255, 150, 150, 255, 150, 150, 255);
 	}
 }
 
diff --git a/TemplePushing.c4s/System.c4g/ShootInventory.c b/TemplePushing.c4s/System.c4g/ShootInventory.c
index 6adcfcc..f310e61 100644
--- a/TemplePushing.c4s/System.c4g/ShootInventory.c
+++ b/TemplePushing.c4s/System.c4g/ShootInventory.c
@@ -69,7 +69,7 @@ protected func Activate(object clonk)
 	}
 	else if (GetID() == TSWB)
 	{
-		Exit(0, -5 + 10 * clonk->GetDir());
+		Exit(0, -7 + 14 * clonk->GetDir());
 		SetYDir(-30);
 		SetXDir(-50 + 100 * clonk->GetDir());
 	}
diff --git a/TemplePushing.c4s/System.c4g/Vanish.c b/TemplePushing.c4s/System.c4g/Vanish.c
index 8eae5cb..1ad5222 100644
--- a/TemplePushing.c4s/System.c4g/Vanish.c
+++ b/TemplePushing.c4s/System.c4g/Vanish.c
@@ -22,7 +22,7 @@ protected func Hit()
 	else if (GetID() == TSWB)
 	{
 		CastParticles("Snow", 50, 20, 0, 0, 50, 80, RGBa(255,255,255,0), RGBa(255,255,255,0));
-		Schedule("RemoveObject()", 2, 0, 0);
+		RemoveObject();
 	}
 	else
 	{