Earthquake uses definition call in scenarios

Somehow I like this method, and I will use it for all disasters and maybe other environment objects as well.
Launching earthquakes is still possible via a global function though. Still needs sound...

planet/BackToTheRocks.ocf/Cavern.ocs/Scenario.txt

@@ -37,8 +37,5 @@ StartSeason=0,0,0,100
 YearSpeed=0,0,0,100
 Wind=1,100,-100,100
 
-[Environment]
-Objects=Earthquake=10
-
 [Animals]
 Nest=Loam=50;Firestone=20

planet/BackToTheRocks.ocf/Cavern.ocs/Script.c

@@ -56,7 +56,7 @@ protected func Initialize()
 		for (var i = 0; i < 4; i++)
 			chest->CreateContents(content_list[Random(GetLength(content_list))]);
 	// Create Disasters.
-	//CreateObject(Core_Disaster_Earthquake, 0, 0, NO_OWNER)->SetChance(100);
+	Earthquake->SetChance(50);
 	// Snow
 	AddEffect("IntSnow", 0, 100, 1);
 	return;

planet/BeyondTheRocks.ocf/IronPeak.ocs/Script.c

@@ -57,8 +57,7 @@ protected func Initialize()
 	SetGamma(RGB(0,0,blue), RGB(128-blue,128-blue,128+blue), RGB(255-blue,255-blue,255));
 	
 	// Some natural disasters. 
-	//var earthquakes = CreateObject(Earthquake);
-	// earthquakes->SetChance(30);
+	// Earthquake->SetChance(30);
 	// TODO: Rockfall.
 	
 	//LogMatCounts();

planet/Objects.ocd/Environment.ocd/Earthquake.ocd/Script.c

@@ -1,59 +1,36 @@
-/*--
-		Earthquake
-		Author: Maikel
-		
-		This is the earthquake control object, earthquakes are realized through a global effect.
-		Earthquakes can be activated in Scenario.txt under [Environment], Earthquake=x will result
-		in a 10*x % earthquake level. You can also just create the control object and modify the
-		chance with Get/Set/DoChance. The third option is to directly launch an earthquake with
-		LaunchEarthquake(int x, int y, int strength) at the global coordinates (x,y).
---*/
+/**
+	Earthquake
+	Trembles the earth.
+	
+	@author Maikel	
+*/
 
 
 /*-- Disaster Control --*/
 
-protected func Initialize()
+public func SetChance(int chance)
 {
-	// Check for other control objects.
-	var ctrl = FindObject(Find_ID(GetID()), Find_Exclude(this));
-	if (ctrl)
-	{
-		ctrl->DoChance(10);
-		RemoveObject();
-	}
-	else
-	{
-		AddEffect("IntEarthquakeControl", this, 100, 35, this);
-		SetChance(10);
-	}
+	if (this != Earthquake)
+		return;
+	var effect = AddEffect("IntEarthquakeControl", nil, 100, 20, nil, Earthquake);
+	effect.chance = chance;
 	return;
 }
 
 public func GetChance()
 {
-	var effect = GetEffect("IntEarthquakeControl", this);
-	return effect.chance;
-}
-
-public func SetChance(int chance)
-{
-	var effect = GetEffect("IntEarthquakeControl", this);
-	effect.chance = BoundBy(chance, 0, 100);
+	if (this != Earthquake)
+		return;
+	var effect = GetEffect("IntEarthquakeControl");
+	if (effect)
+		return effect.chance;
 	return;
 }
 
-public func DoChance(int chance)
+protected func FxIntEarthquakeControlTimer(object target, proplist effect, int time)
 {
-	SetChance(GetChance() + chance);
-	return;
-}
-
-protected func FxIntEarthquakeControlTimer(object target, effect, int time)
-{
-	var chance = effect.chance;
-	if (!Random(8))
-		if (Random(100) < chance)
-			LaunchEarthquake(Random(LandscapeWidth()), Random(LandscapeHeight()), Random(40) + 35);
+	if (Random(100) < effect.chance && !Random(10))
+		LaunchEarthquake(Random(LandscapeWidth()), Random(LandscapeHeight()), Random(40) + 35);
 	return FX_OK;
 }
 
@@ -74,7 +51,7 @@ global func LaunchEarthquake(int x, int y, int strength)
 	return true;
 }
 
-/*-- Earthquake control --*/
+/*-- Earthquake --*/
 
 protected func FxIntEarthquakeStart(object target, effect)
 {

planet/Tests.ocf/PoT.ocs/Scenario.txt

@@ -37,5 +37,3 @@ StartSeason=0,0,0,100
 YearSpeed=0,0,0,100
 Wind=1,100,-100,100
 
-[Environment]
-Objects=Earthquake=10