8 files changed, 56 insertions, 27 deletions
diff --git a/TemplePushing.c4s/System.c4g/Axe.c b/TemplePushing.c4s/System.c4g/Axe.c
index 1de4d9a..a718d58 100644
--- a/TemplePushing.c4s/System.c4g/Axe.c
+++ b/TemplePushing.c4s/System.c4g/Axe.c
@@ -14,6 +14,7 @@ func Activate(pClonk)
 func Hit()
 {
  if (Random(2)) return(_inherited());
+ else
  SetYDir(-20);
  Sound("BOING");
  return(1);
diff --git a/TemplePushing.c4s/System.c4g/EmptyGoblet.c b/TemplePushing.c4s/System.c4g/EmptyGoblet.c
index 7c48007..655a1b3 100644
--- a/TemplePushing.c4s/System.c4g/EmptyGoblet.c
+++ b/TemplePushing.c4s/System.c4g/EmptyGoblet.c
@@ -5,9 +5,25 @@ func Activate(pClonk)
 {
  [$Shot$|Image=GNPW]
  Sound("Blast2");
- Sound("Crystal3");
- Exit(this(),-20+40*GetDir(pClonk));
- SetXDir(-100+200*GetDir(pClonk));
+ Exit(this(),-10+20*GetDir(pClonk));
+ SetXDir(-80+160*GetDir(pClonk));
  SetYDir(-10);
  return(1);
-}
-\ No newline at end of file
+}
+
+func Hit()
+{
+ if (Random(2)) return(_inherited());
+ else
+ SetYDir(-20);
+ Sound("BOING");
+ return(1);
+}
+/*-- Neues Script --*/
+
+#strict
+
+func Initialize() {
+  
+  return(1);
+}
diff --git a/TemplePushing.c4s/System.c4g/FireBomb.c b/TemplePushing.c4s/System.c4g/FireBomb.c
new file mode 100644
index 0000000..85ea01c
--- /dev/null
+++ b/TemplePushing.c4s/System.c4g/FireBomb.c
@@ -0,0 +1,21 @@
+#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());
+ else
+ SetYDir(-20);
+ Sound("BOING");
+ return(1);
+}
diff --git a/TemplePushing.c4s/System.c4g/Flint.c b/TemplePushing.c4s/System.c4g/Flint.c
index 978319d..82309e0 100644
--- a/TemplePushing.c4s/System.c4g/Flint.c
+++ b/TemplePushing.c4s/System.c4g/Flint.c
@@ -14,6 +14,7 @@ func Activate(pClonk)
 func Hit()
 {
  if (Random(2)) return(_inherited());
+ else
  SetYDir(-20);
  Sound("BOING");
  return(1);
diff --git a/TemplePushing.c4s/System.c4g/Goblet.c b/TemplePushing.c4s/System.c4g/Goblet.c
index eb4911f..a916e35 100644
--- a/TemplePushing.c4s/System.c4g/Goblet.c
+++ b/TemplePushing.c4s/System.c4g/Goblet.c
@@ -1,5 +1,5 @@
 #strict
-#appendto OGBT
+#appendto GBLT
 
 func Activate(pClonk)
 {
@@ -10,3 +10,12 @@ func Activate(pClonk)
  SetYDir(-10);
  return(1);
 }
+
+func Hit()
+{
+ if (Random(2)) return(_inherited());
+ else
+ SetYDir(-20);
+ Sound("BOING");
+ return(1);
+}
diff --git a/TemplePushing.c4s/System.c4g/Rock.c b/TemplePushing.c4s/System.c4g/Rock.c
deleted file mode 100644
index e094b4c..0000000
--- a/TemplePushing.c4s/System.c4g/Rock.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#strict
-#appendto ROCK
-
-func Activate(pClonk)
-{
- [$Shot$|Image=GNPW]
- Sound("Blast1");
- Exit(this(),-15+30*GetDir(pClonk));
- SetXDir(-100+200*GetDir(pClonk));
- SetYDir(-10);
- return(1);
-}
-
-func Hit()
-{
- if (Random(5)) return(_inherited());
- SetYDir(-25);
- Sound("BOING");
- return(1);
-}
-\ No newline at end of file
diff --git a/TemplePushing.c4s/System.c4g/Scroll.c b/TemplePushing.c4s/System.c4g/Scroll.c
index 0bc56ba..a66bb32 100644
--- a/TemplePushing.c4s/System.c4g/Scroll.c
+++ b/TemplePushing.c4s/System.c4g/Scroll.c
@@ -4,7 +4,7 @@ static SpID;
 
 func Initialize()
 {
- SpID=[ABLA,MBOT,MFRB,MDBT,GVTY,MMTR,MLGT,CFAL,MSSH,MINV,MQKE,MARK,_FWV,_MFL];
- SetSpell(SpID[Random(GetLength(SpID))]);
+ SpID=[ABLA,MBOT,MFRB,MDBT,GVTY,MBRG,MMTR,MLGT,CAHE,MSSH,MINV,MFFS,MQKE,ELX1,MICS,MARK];
+ SetSpell(SpID[Random(16)]);
  return(_inherited());
 }
 \ No newline at end of file
diff --git a/TemplePushing.c4s/System.c4g/Sword.c b/TemplePushing.c4s/System.c4g/Sword.c
index 9fc46af..4f98bd7 100644
--- a/TemplePushing.c4s/System.c4g/Sword.c
+++ b/TemplePushing.c4s/System.c4g/Sword.c
@@ -14,6 +14,7 @@ func Activate(pClonk)
 func Hit()
 {
  if (Random(2)) return(_inherited());
+ else
  SetYDir(-20);
  Sound("BOING");
  return(1);