38 files changed, 9 insertions, 330 deletions

diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/FireBomb.c b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/FireBomb.c
deleted file mode 100644
index 125bd49..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/FireBomb.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#strict
-#appendto FBMP
-
-func Activate(pClonk)
-{
- [$Shot$|Image=GNPW]
- Sound("Blast2");
- Exit(this(),-10+20*GetDir(pClonk));
- SetXDir(-80+160*GetDir(pClonk));
- SetYDir(-10);
- return(1);
-}
-
-func Hit()
-{
- if (Random(2)) return(_inherited());
- SetYDir(-20);
- Sound("BOING");
- return(1);
-}
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DefCore.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DefCore.txt
deleted file mode 100644
index 6ed04c9..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DefCore.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-[DefCore]
-id=_MFL
-Version=4,9,8
-Name=MagicFlint
-Category=C4D_Magic
-Width=1
-Height=1
-Value=25
-Components=IROC=2;ILOA=2
-Picture=0,0,64,64
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DescDE.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DescDE.txt
deleted file mode 100644
index bc8405a..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DescDE.txt
+++ /dev/null
@@ -1 +0,0 @@
-Zaubert einen Flint herbei.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DescUS.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DescUS.txt
deleted file mode 100644
index 80f5e9e..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/DescUS.txt
+++ /dev/null
@@ -1 +0,0 @@
-Summons a flint.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Graphics.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Graphics.png
deleted file mode 100644
index 9fd8437..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Graphics.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Names.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Names.txt
deleted file mode 100644
index b182b58..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Names.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DE:Flint herbeizaubern
-US:Summon flint
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Script.c
deleted file mode 100644
index b514189..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Flint.c4d/Script.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Flint herbeizaubern */
-
-#strict
-static FlintID;
-
-public func Activate(pCaster,pRealcaster) {
-  var pSlurp;
-  var pFlint;
-  
-  FlintID=[FLNT,SFLN,EFLN];
-  
-  // Effekt prüfen
-  var iResult;
-  if (iResult = CheckEffect("FlintNSpell", 0, 125)) return(iResult!=-1 && RemoveObject());
-  // Sound
-  Sound("Magic*");
-  // Effekt
-  CreateParticle("MSpark", 0,0, 1000, RGBa(255,50,50,150));
-
-  if(pRealcaster) pCaster=pRealcaster;
- { pFlint = CreateContents(FlintID[Random(GetLength(FlintID))],pCaster); }
- 
-  RemoveObject();
-  
-  return(1);
-}
-
-/* Zaubercombo */
-
-public func GetSpellClass(object pMage) { return(EART); }
-public func GetSpellCombo(pMage) { return("422"); } // (1: Backward; 2: Down; 3: Forward; 4: Throw; 5: Jump; 6: Dig)
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DefCore.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DefCore.txt
deleted file mode 100644
index 09eaa86..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DefCore.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[DefCore]
-id=_FWV
-Version=4,9,8
-Name=Frostwave
-Category=C4D_Magic
-Value=18
-Components=IICE=4
-Picture=0,0,64,64
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DescDE.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DescDE.txt
deleted file mode 100644
index 0f080c4..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DescDE.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sendet eine Frostwelle aus, die Gegner wegschleudert und einfriert.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DescUS.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DescUS.txt
deleted file mode 100644
index 956f6c4..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/DescUS.txt
+++ /dev/null
@@ -1 +0,0 @@
-Casts an frostwave which flings enemys away.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Graphics.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Graphics.png
deleted file mode 100644
index 4519567..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Graphics.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Names.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Names.txt
deleted file mode 100644
index 8615e7c..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Names.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DE:Frostwelle
-US:Frost wave
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Script.c
deleted file mode 100644
index 142a8cb..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Script.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#strict
-
-func Activate(pCaster,pRealcaster) {
-  var pClonk, pComboObj;
-  if(pRealcaster) pClonk=pRealcaster;
-  else pClonk=pCaster;
-  
-  var iNum = AddEffect("FrostwaveNSpell",0,130,1,0,GetID(),0,GetX(pCaster),GetY(pCaster),pClonk);
-  if (iNum <= 0) return (iNum<0, RemoveObject());
-  Sound("MgWind*");
-  RemoveObject();
-  return(1);
-}
-
-func FxFrostwaveNSpellStart(object pTarget, int iNumber, int iTemp, int iAngle, int iX, int iY, object pCaller) {
-  if(iTemp) return();
-  
-  // Radius anpassen
-  EffectVar(1,pTarget,iNumber) = 20;
-
-  // Position
-  EffectVar(2,pTarget,iNumber) = iX;
-  EffectVar(3,pTarget,iNumber) = iY;
-  
-  // Zauberer
-  EffectVar(4,pTarget,iNumber) = pCaller;
-  EffectVar(6,pTarget,iNumber) = GetController(pCaller);
-  
-  // Kombo
-  var pCombo = FindContents(ICE1, pCaller);
-  if (pCombo)
-    {
-    EffectVar(5,pTarget,iNumber) = true;
-    RemoveObject(pCombo);
-    }
-}
-
-func FxFrostwaveNSpellTimer(object pTarget, int iNumber, int iTime) {
-
-  var iRaduis = EffectVar(1,pTarget,iNumber);
-  // löschen falls schon zu weit
-  if(iRaduis >= EffectCall(pTarget,iNumber,"MaxRange")) return(-1);
-
-  // Position
-  var iX = EffectVar(2,pTarget,iNumber);
-  var iY = EffectVar(3,pTarget,iNumber);
-  
-  // Kombo?
-  var dwSearchOCF = OCF_Alive;
-  if (EffectVar(5,pTarget,iNumber)) dwSearchOCF += OCF_Collectible;
-  
-  // Effekt!
-  CreateParticle("FrostWave",iX,iY, RandomX(-1,1),RandomX(-1,1), 400+10*iRaduis,RGB(255,255,255));
-var obj;
-
-  var angle;
-  // Alle Gegner wegschleudern
-  while(obj = FindObject(0, -iRaduis-5+iX,-iRaduis-5+iY,iRaduis*2+10,iRaduis*2+10, dwSearchOCF, 0,0, NoContainer(), obj))
-  {
-    if(obj == Contained()) continue;
-    if(Inside(Distance(GetX(obj), GetY(obj), iX, iY), iRaduis-5, iRaduis+5))
-    {   
-    angle=Angle(iX, iY, GetX(obj), GetY(obj) );     
-    if(GetAlive(obj)) 
-    { 
-        obj->SetKiller(EffectVar(6,pTarget,iNumber));
-        Fling(obj, Sin(angle, 80)/9, -Cos(angle, 80)/9);
-        if(!Frozen(obj)) Freeze(obj, EffectVar(4,pTarget,iNumber)); 
-    }
-    else 
-     { 
-        SetXDir(Sin(angle, 50), obj); SetYDir(-Cos(angle, 50), obj);
-        SetController(GetController(EffectVar(4,pTarget,iNumber)),obj);
-     }
-    }
-  } 
-    
-  EffectVar(1,pTarget,iNumber)+=8;
-}
-
-func FxFrostwaveNSpellMaxRange() { return(75); }
-
-/* Zaubercombo */
-
-public func GetSpellClass(object pMage) { return(WATR); }
-public func GetSpellCombo(pMage) { return ("335"); } // (1: Backward; 2: Down; 3: Forward; 4: Throw; 5: Jump; 6: Dig)
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Wave.c4d/Graphics.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Wave.c4d/Graphics.png
deleted file mode 100644
index b4a8989..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Wave.c4d/Graphics.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Wave.c4d/Particle.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Wave.c4d/Particle.txt
deleted file mode 100644
index 56ed2c0..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Frostwave.c4d/Wave.c4d/Particle.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[Particle]
-Name=FrostWave
-MaxCount=350
-InitFn=StdInit
-ExecFn=StdExec
-DrawFn=Std
-Face=0,0,64,64,-32,-32
-GravityAcc=0
-RByV=1
-AlphaFade=5
-Delay=0
-Additive=1
-Repeats=1
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Maplang.bmp b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Maplang.bmp
deleted file mode 100644
index cd806b8..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Maplang.bmp
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Mapsymm.bmp b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Mapsymm.bmp
deleted file mode 100644
index 08e92d2..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Mapsymm.bmp
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Names.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Names.txt
deleted file mode 100644
index 23fb108..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Names.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DE:Extraobjekte
-US:Additional Objects 
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DefCore.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DefCore.txt
deleted file mode 100644
index c31ec02..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DefCore.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-[DefCore]
-id=OGBT 
-Version=4,9,8
-Name=Goblet
-Category=C4D_Object|C4D_SelectMaterial|C4D_SelectHomebase
-MaxUserSelect=10
-Timer=5
-TimerCall=FillCheck
-Width=8
-Height=9
-Offset=-4,-4
-Vertices=4
-VertexX=-4,4,-4,4
-VertexY=-4,-4,4,4
-VertexFriction=50,50,50,50
-Value=85
-Mass=10
-Components=KELK=1
-Picture=0,9,35,48
-Rebuy=1
-Collectible=1
-Rotate=1
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DescDE.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DescDE.txt
deleted file mode 100644
index bae43a3..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DescDE.txt
+++ /dev/null
@@ -1 +0,0 @@
-Magisches Trinkgefäß. Bringt, wenn gefüllt, dem Träger Lebensenergie.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DescUS.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DescUS.txt
deleted file mode 100644
index 9bd1347..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/DescUS.txt
+++ /dev/null
@@ -1 +0,0 @@
-Magical container of liquids. Replenishes the bearer's energy.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DefCore.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DefCore.txt
deleted file mode 100644
index 134d1d8..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DefCore.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-[DefCore]
-id=EGBL
-Version=4,9,8
-Name=Goblet
-Category=C4D_Object|C4D_SelectMaterial|C4D_SelectKnowledge|C4D_SelectHomebase
-MaxUserSelect=10
-Timer=5
-TimerCall=FillCheck
-Width=8
-Height=9
-Offset=-4,-4
-Vertices=4
-VertexX=-4,4,-4,4
-VertexY=-4,-4,4,4
-VertexFriction=50,50,50,50
-Value=85
-Mass=10
-Components=METL=2
-Picture=0,9,35,48
-Rebuy=1
-Collectible=1
-Rotate=1
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DescDE.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DescDE.txt
deleted file mode 100644
index d360789..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DescDE.txt
+++ /dev/null
@@ -1 +0,0 @@
-Trinkgefäß.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DescUS.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DescUS.txt
deleted file mode 100644
index 9bd1347..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/DescUS.txt
+++ /dev/null
@@ -1 +0,0 @@
-Magical container of liquids. Replenishes the bearer's energy.
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Graphics.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Graphics.png
deleted file mode 100644
index 2aaf5d5..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Graphics.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Names.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Names.txt
deleted file mode 100644
index 4c85279..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Names.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DE:Kelch
-US:Goblet
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Script.c
deleted file mode 100644
index bdd3eeb..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Script.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-- Leerer Kelch --*/
-
-#strict
-
-local iFill, iTimer;
-
-func FillCheck()
-  {
-  ++iTimer;
-  if(!(iTimer%5))
-    {
-    var iX = Sin(GetR(), RandomX(-4,8) );
-    var iY = -Cos(GetR(), RandomX(-4,4) );
-    if(!Contained())
-      CreateParticle("NoGravSpark", iX, iY,0,0,RandomX(25, 55),RGBa(255,255,0,120));
-    iTimer=0;
-    }
-  if(GetMaterial() == Material("Water"))
-    {
-    if((iFill+=ExtractMaterialAmount(0,2, Material("Water"), 6))>=10 )
-      ChangeDef(GBLT);
-    }
-  }
-
-public func IsMagicProduct() { return(true); }
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Title.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Title.png
deleted file mode 100644
index bd299ab..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/EmptyGoblet.c4d/Title.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Graphics.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Graphics.png
deleted file mode 100644
index cc8e6cf..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Graphics.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Names.txt b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Names.txt
deleted file mode 100644
index 4c85279..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Names.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DE:Kelch
-US:Goblet
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Script.c
deleted file mode 100644
index a040037..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Script.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-- Kelch --*/
-
-#strict
-
-local iTimer;
-
-func Initialize()
-  {
-  return(1);
-  }
-
-func FillCheck()
-  {
-  if(!Contained())
-      if(Inside(GetR(), 20, 340))
-        Hit();
-    if(!(iTimer%5))
-    {
-    var iX = Sin(GetR(), RandomX(-4,4) );
-    var iY = -Cos(GetR(), RandomX(-4,1) );
-    if(!Contained())
-      CreateParticle("NoGravSpark", iX, iY,0,0,RandomX(25, 55),RGBa(255,255,0,120));
-    }
-  iTimer++;
-  if(iTimer>=10) 
-    {
-    if(GetOCF(Contained()) & OCF_CrewMember())
-      DoEnergy(+15, Contained());
-    iTimer=0;
-    }
-  return(1);
-  }
-
-func Hit()
-  {
-  if(!GBackLiquid())
-    {
-    for(var i=15; i>0; i--)
-      {
-      var iX=Sin(GetR(), RandomX(4,8)), iY=-Cos(GetR(), RandomX(4,8)), iXDir=GetWind()*30/100, iYDir=-Cos(GetR()+RandomX(-2,2), Random(7));
-      InsertMaterial(Material("Water"), iX, iY, iXDir, iYDir);
-      }
-    SetEmpty();
-    }
-  }
-
-private func SetEmpty()
-  {
-  ChangeDef(EGBL);
-  return(1);
-  }
-  
-// Mit Kelch: Aufwertung zum Magus
-public func GetRevaluationCombo() { return(MAGE); }
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Title.png b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Title.png
deleted file mode 100644
index 16aa9b6..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/OGoblet.c4d/Title.png
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Sky.jpg b/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Sky.jpg
deleted file mode 100644
index d060665..0000000
--- a/TemplePushing.c4s/CliffPushing.c4d/Extra.c4d/Sky.jpg
+++ /dev/null
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/MagicSpawnpoint.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/MagicSpawnpoint.c4d/Script.c
index 4466a3a..1f93fc8 100644
--- a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/MagicSpawnpoint.c4d/Script.c
+++ b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/MagicSpawnpoint.c4d/Script.c
@@ -1,4 +1,4 @@
-/*-- Magic Spawnpoint --*/
+/*-- Spawnpoint --*/
 
 #strict
 
@@ -8,7 +8,7 @@ func IsWaypoint() { return(1); }
 
 global func PlaceSpawnpoint(id idObj, int iX, int iY, int timer)
 {
-  var spwn = CreateObject(MSPN, iX, iY, -1);
+  var spwn = CreateObject(SPNP, iX, iY, -1);
   spwn->CreateContents(idObj);
   if(timer)
     spwn->LocalN("spawntimer") = timer;
@@ -17,8 +17,7 @@ global func PlaceSpawnpoint(id idObj, int iX, int iY, int timer)
 
 protected func Initialize()
 {
-  if(Random(14)) WpID=SCRL;
-  else WpID=OGBT;
+  WpID = [SCRL];
   // Standardtimer = 1000 Frames
   spawntimer = 1000;
   SetClrModulation(RGBa(0,0,0,255));
@@ -36,7 +35,7 @@ protected func Timer()
   // Kein Inhalt?
   if(!Contents())
     {
-	return(CreateContents(WpID));
+    return(CreateContents(WpID[Random(GetLength(WpID))]));
     }
   // Tolle Effekt starten
   angle += 10;
@@ -134,7 +133,7 @@ public func RejectEntrance(object pClonk)
       return(1);
 		
     Collect(pObj, pClonk);
-    CreateContents(WpID);
+    CreateContents(WpID[Random(GetLength(WpID))]);
     Initialized();
     if(Contained(pObj) == this()) RemoveObject(pObj);
     else
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Names.txt b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Names.txt
index 9d875f8..26991ea 100644
--- a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Names.txt
+++ b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Names.txt
@@ -1,2 +1,2 @@
-DE:Magischer Spawnpunktspawner
+DE:Magische Spawnpunktspawner
 US:Magic Spawnpoint Spawner
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Script.c
index d1e7b39..0de4e94 100644
--- a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Script.c
+++ b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/MagicSpawnpoints.c4d/Script.c
@@ -9,7 +9,6 @@ protected func Activate(iPlr) {
 func Initialize()
 {
  SetGamma(RGB(5,5,10),RGB(80,80,150),RGB(200,200,255));
- RemoveAll(SPNP);
  CreateObject(MSPN,550,282);
  CreateObject(MSPN,603,205);
  CreateObject(MSPN,682,282);
@@ -21,9 +20,5 @@ func Initialize()
  CreateObject(MSPN,170,118);
  CreateObject(MSPN,299,170);
  CreateObject(MSPN,435,230);
- CreateObject(MSPN,1175,290);
- CreateObject(MSPN,105,380);
- CreateObject(MSPN,910,400);
- CreateObject(MSPN,560,610);
  return(1);
 }
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Script.c
index a762af8..f1c3a97 100644
--- a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Script.c
+++ b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Script.c
@@ -8,7 +8,6 @@ protected func Activate(iPlr) {
 
 func Initialize()
 {
- RemoveAll(MSPN);
  CreateObject(SPNP,550,282);
  CreateObject(SPNP,603,205);
  CreateObject(SPNP,682,282);
@@ -20,9 +19,5 @@ func Initialize()
  CreateObject(SPNP,170,118);
  CreateObject(SPNP,299,170);
  CreateObject(SPNP,435,230);
- CreateObject(SPNP,1175,290);
- CreateObject(SPNP,105,380);
- CreateObject(SPNP,910,400);
- CreateObject(SPNP,560,610);
  return(1);
 }
\ No newline at end of file
diff --git a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Spawnpoint.c4d/Script.c b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Spawnpoint.c4d/Script.c
index 6172d25..c4ec93a 100644
--- a/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Spawnpoint.c4d/Script.c
+++ b/TemplePushing.c4s/CliffPushing.c4d/Rules.c4d/Spawnpoints.c4d/Spawnpoint.c4d/Script.c
@@ -17,10 +17,9 @@ global func PlaceSpawnpoint(id idObj, int iX, int iY, int timer)
 
 protected func Initialize()
 {
-  if(Random(4)) WpID = [FLNT,SCRL,SFLN,ROCK];
-  else WpID = [EFLN,STFN,FBMP];
-  // Standardtimer = 750 Frames
-  spawntimer = 750;
+  WpID = [FLNT,SCRL,AXE1,TFLN,COKI,SFLN,PMON,PSTO,EFLN,FBMP,SWOR];
+  // Standardtimer = 600 Frames
+  spawntimer = 600;
   SetClrModulation(RGBa(0,0,0,255));
 }