From fc9f3a660e775ee19c1b73353af94772e6c012e0 Mon Sep 17 00:00:00 2001
From: Jonas <jonas.paul.gerecke@gmail.com>
Date: Wed, 16 Sep 2026 17:31:47 +0200
Subject: [PATCH] Spikes machen jetzt damage statt zu gameOverWorld zu wechseln

---
 SMIMS-Game/Player.class      | Bin 4165 -> 4211 bytes
 SMIMS-Game/Player.java       |   4 +-
 SMIMS-Game/Spike.class       | Bin 1073 -> 886 bytes
 SMIMS-Game/Spike.java        |   5 --
 SMIMS-Game/project.greenfoot | 104 +++++++++++++++++------------------
 5 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/SMIMS-Game/Player.class b/SMIMS-Game/Player.class
index d43e31d96b0c26706a675318cfbf2b90f26b44f6..9749940c2aaf62539bb71084276bb580c6a3cad4 100644
GIT binary patch
delta 1029
zcmYjPX-kw*6n@^>XPgCJR2+2F)F~KTs<AP`3e6TGjSz%rAR;BChOu-iB`|^(TB)}J
zq5KjxQMOF#xRg4TwrJVDnZKbv^r;Um&voAN{c`U)_nhZB=RD_*=l#gDP5d4j0Z@sV
zm~GmaZpKXs#=7RFosBlE#VtE-<BsypSYnOgo*6xM^eSFceo35J4Utf&&4w5T>=?v(
z38u!~k!`zLEVwVhx;_$Wt_p`+S}hpviI^&N(umS;sgXt%qt&04U`;zDo)vhAN4zCG
zhKc8hQfF;v)|7SS`~=^VSxsuz7+;Lg2Qo9ELx~FT+o~%^8OUG=SON>m;l?t|Bl%*i
zK!UGH8o!3d0G(T~EK*qpY^4=~MTUXrD!8y3nOFl4)@c}WGz@x39ukzP1O+LR?E8Dl
z#tu<12rIT?6UJHEj4%~`Ld${!%zsMDiW+RkGdw367*c7C=)=Tpv)SmvBrP3^a2hZ0
z5_**41g1Ee0k4P=BPC<6857E6LH~!dE5r62sy$=h!G5Y8{sjrf@|fd+7jN*EoIt%=
z(aG`N;XS#=lrBd`hxiTM%oV!{`s6Edga&a{!e!+8<m+=@s!zW0&+9^&Z*wmkhK4>k
zd~sAIadC7f9Rd6A2o#+d`SlQj=TjA64^q*B+zPb9hrJYOA0^w5TC`ycMN2Rxxx=7l
z1Kgo+AzNLpu3&?+V5y*Vk{als@CQkINQ0I&Xbzc5aJdSOIs^4{-{>&GN05f2$i^`g
z;<$#yt07?vX)dySz(<}`Pja)k_=wS>T3x_U9LHV7@ABsN#nIo1LVdsxMNY9iH0!1t
zgzGAnAJA3WUBU32BBv<D8Om^$gPg-jD6}r%5-#EzI%m5PJ7pcU8)1D?MT+7xzHrat
bSIDsZLXjCU$>~h-=-fX!m4s<VbolxgMjp}F

delta 1000
zcmYk4X-iaL6o8*Qi?cY+<Y3{XBjy%NE|sMbW{s@`CVdeCDI_C;WGb~tDuot`cCHXX
z`X$O}GgGHDZP6^#_OjAH&=2U7(RSYPhL?eN&bjBD=d3@{htu7ofBGH+VJ17>lXkb8
z_1yAsn>+fHJ>S*AJqMj0?&}NVGV;4M>@^LwwFljF5cTkY7LB+admE~E*E#9caBXa;
z-BT8c)YUtA)YTjpwrKtOptD>X&}X>{Q&b`kn!F`E;i>#<JR?rtetoN}QM@KxD|2SN
zb{SrS;%UcPl$?x(d?TRLy(T;$hB;z_r8p@jz;fmZd@-fWU<yqb8<v2gEHWrV?t&6U
z@ne&BH9ppo%sPT>FcH#B1S?ul080!&e*Bo!{WHFzNhPep#WprGBz-!F$XK6?<m8a}
z4~yiYob9~er9?xYfwj}aNNh5xwDC$L3%Q(QlrgLnaGKZBnvFLSqvkhldn-0InG~#l
zrFVVAlP1&t?%65zR3sF}>PZ)$Alba*y)dED$mo^!KJZakir~WXi!ukTe)+Iqx-t2D
zN`lq0!Xf|FD7C#@(`Y3z<iGJ>Yh!+BOE(F&njR8DQOc%0qudNdE0v}^Me7ub6*cF%
zvBvk2NFAv(ki&ioIlw9!P4f<$<}Djb&6GM;7z1zgW-e1CuMpv|jQNPrnoZGuQ?zuD
zD8a=>@VK|Aa^`4`O7Jm~I4-4}Ad8bGNVW+gB_#QT@`=y#_RHA@B)K}f_S{XDB3oXR
zyLz=RJEJQ~&t<Z#MYeX*^862D>TH`*eR=*qQS}?Xs)(u}L#_hZY&~bC{qr<&fiql`
zpUxFpxXz_mHEM&B$EZe0<FOl1(igtUR@DamIDeDtphNR|<AavKlys%>O)M5B{sGfI
B#bf{g

diff --git a/SMIMS-Game/Player.java b/SMIMS-Game/Player.java
index a0f6c36..a45fa9e 100644
--- a/SMIMS-Game/Player.java
+++ b/SMIMS-Game/Player.java
@@ -112,11 +112,13 @@ public class Player extends Actor
 
     public void collision(){
         if (getIntersectingObjects(Projectile.class).size()>0
-        || getIntersectingObjects(Enemy.class).size()>0)
+        || getIntersectingObjects(Enemy.class).size()>0
+        || getIntersectingObjects(Spike.class).size()>0)
         {
             health--;
             getWorld().removeObjects(getIntersectingObjects(Projectile.class));
             getWorld().removeObjects(getIntersectingObjects(Enemy.class));
+            getWorld().removeObjects(getIntersectingObjects(Spike.class));
             
         }
     }
diff --git a/SMIMS-Game/Spike.class b/SMIMS-Game/Spike.class
index 56b67f8b29eaa0b6a1dfa257e2339ad5fae76c8e..3931ddb86cf04e400c72afd555f19d31c5905e3b 100644
GIT binary patch
delta 574
zcmYk3O-mb56o#KWv6*qWN&Se?)WlX3HQrJC5vv7PE?WAbxKPk83Pv4bsh~(eT!_Cx
zX6>RsA<(AaLR`D^&vaG9b0=e4E;HP7?s=d098Syoo%V0;F0X(k-kkfZB_EHh<}qnS
zdOJK08=+10YWnDpGO9c<pm0}CHV%&VcYSgUYKAC8Z<U!H))Xlzx*B0~Q<17peX!c6
znr9E`&o(ipDN~6q)KD?Ugl5vdc8lnJ__eXuv?Ws-6WyxDxYyhZV=t*#PHYzynYCtp
z=i5sCaJ|00A4XrC+Gv1cS_XNCBL{r*3uT6X;<hAmn2B0W|JkhE^PP8|^Fku2<Rx0v
zidUo)N-d7zk!h1j0CA~B57H$=Ta=YaQG!yKzkrWP8(9JLT$5W4<dQ%8hsu%?X;FqP
zkzpjpbvnx?I8R_T=HgCdAxUSaVs4uVi~yg=H)4L^ZnYVGaI(3e&A7Mw9an;?HBB)i
r|4(^o7RKn66%?p2A;(bt&pk-o3$pQ!`)g5ns6QB27Ot3=*kR!wpmj>Z

literal 1073
zcmZ8f+fvg|6kUgwrVVK;Eh1MhRIyEkdcPGfh=O&BI8z41C)4)W21?UO0}c;<h>w1P
zGg=&-aeVfh9LIG+5Qc}GWbf>?)?WMU-+#aV1Tc>!9eoIC2pi}}L?GF4rEI@*9Ir56
z^Bh+oGH17K@1Z~_n_G(^ikJr7zyJ(^{z}K*l6-eNQq~1TNkf8=S1oH#x;l$b85l%L
zK)1WA&Q7gqw;KXO+482fYZY2nyHQwZS>0|i_eR5zKzzyCmMgo`U3c78T}K)r9cM72
zVbs7F#s$(x4K5wFDiG~T&xiQrM<sr)m|Ih=Od2?=EJmvGy=+L8I&a_trU-BRho`f-
z@=3ggivrs6UeHtq(*`ahD`2>C+u4;X)lFIRPDuOX3#3g0d0Y_)Q|Glm$&!+vHBdNA
zZ>YpI1J`jwV1RbYPR;Ucr_JeROC@C?gIfk}D?p4q&!ydHdJ1*dz&&MbpykMJttpr7
zT9aB?g7{i+>b#+3*>201JKI(1u3FU=Gbts|TC-eR#X&OcHSI3Fmi>z@a#)?p!PSN=
z<uG3HtlHMH)d}jOUQ-5hkClS~5v5n09k(VIZ6&1pT(j!NIqfL-4G?^|K|I6!?#F$e
zMMjJKtN!ceK7={`720P;eVF5!K!|6Yhy-Ft;sK-KgK9j)BSysGF<H5YT<u7}xy~A;
zH)5vZJtRLO{sZZaeVqP=VY7z`r4aHJQsibG*~hqf6I{GWUqvyh{DI07zh0!7<k$m|
z7Zg#AC&+m27c%8MKQ5hYUfG|bh0L+$69H|MTnl(gKB4wB;Qhds6mQ-nUyjd=`32hB
z9<Ck=sa(E?o6-6wXbkQg`5ES9!A%`R7Nf{vnp<dM=9qXs5FbS<5LfP^5Px85Y*XMF
I<323@1E(0h8~^|S

diff --git a/SMIMS-Game/Spike.java b/SMIMS-Game/Spike.java
index 0a69da3..3babe27 100644
--- a/SMIMS-Game/Spike.java
+++ b/SMIMS-Game/Spike.java
@@ -20,11 +20,6 @@ public class Spike extends Actor
      */
     public void act()
     {
-        // Add your action code here.
-        if(this.isTouching(Player.class))
-        {
-            Greenfoot.setWorld(new GameOverWorld());
-        }
         this.bewege();
     }
 
diff --git a/SMIMS-Game/project.greenfoot b/SMIMS-Game/project.greenfoot
index b8a97cd..5c0ab24 100644
--- a/SMIMS-Game/project.greenfoot
+++ b/SMIMS-Game/project.greenfoot
@@ -9,56 +9,57 @@ class.MovingPlattform.image=Unbenannt.png
 class.MyWorld.image=GameBackground.png
 class.Plattform.image=Platform1.png
 class.Player.image=Player.png
+class.PlayerProjectile.image=beeper.png
 class.Projectile.image=Projectile1.png
 class.Spike.image=Spike.png
 class.SpikedPlattform.image=SpikedPlattform.png
 class.StartWorld.image=StartBackground.png
 class.TargetingProjectile.image=blue-draught.png
-class.UnactiveSpike.image=SpikeUnactive.png
+class.UnactiveSpike.image=Spike_Copy.png
 dependency1.from=GameOverWorld
 dependency1.to=Button
 dependency1.type=UsesDependency
 dependency10.from=MyWorld
-dependency10.to=MovingPlattform
+dependency10.to=BreakingPlattform
 dependency10.type=UsesDependency
 dependency11.from=MyWorld
-dependency11.to=BreakingPlattform
+dependency11.to=SpikedPlattform
 dependency11.type=UsesDependency
 dependency12.from=MyWorld
-dependency12.to=SpikedPlattform
+dependency12.to=Projectile
 dependency12.type=UsesDependency
 dependency13.from=MyWorld
-dependency13.to=Projectile
+dependency13.to=TargetingProjectile
 dependency13.type=UsesDependency
-dependency14.from=MyWorld
-dependency14.to=TargetingProjectile
+dependency14.from=Spike
+dependency14.to=GameOverWorld
 dependency14.type=UsesDependency
 dependency15.from=Spike
-dependency15.to=GameOverWorld
+dependency15.to=MyWorld
 dependency15.type=UsesDependency
 dependency16.from=Spike
-dependency16.to=MyWorld
+dependency16.to=Player
 dependency16.type=UsesDependency
-dependency17.from=Spike
-dependency17.to=Player
+dependency17.from=Player
+dependency17.to=GameOverWorld
 dependency17.type=UsesDependency
 dependency18.from=Player
-dependency18.to=GameOverWorld
+dependency18.to=Plattform
 dependency18.type=UsesDependency
 dependency19.from=Player
-dependency19.to=Plattform
+dependency19.to=PlayerProjectile
 dependency19.type=UsesDependency
 dependency2.from=PlayerTestWorld
 dependency2.to=Ground
 dependency2.type=UsesDependency
 dependency20.from=Player
-dependency20.to=PlayerProjectile
+dependency20.to=Projectile
 dependency20.type=UsesDependency
 dependency21.from=Player
-dependency21.to=Projectile
+dependency21.to=Enemy
 dependency21.type=UsesDependency
-dependency22.from=Player
-dependency22.to=Enemy
+dependency22.from=Healthbar
+dependency22.to=Player
 dependency22.type=UsesDependency
 dependency23.from=UnactiveSpike
 dependency23.to=SpikedPlattform
@@ -69,63 +70,60 @@ dependency24.type=UsesDependency
 dependency25.from=UnactiveSpike
 dependency25.to=Spike
 dependency25.type=UsesDependency
-dependency26.from=Healthbar
-dependency26.to=Player
+dependency26.from=Plattform
+dependency26.to=MyWorld
 dependency26.type=UsesDependency
 dependency27.from=Plattform
-dependency27.to=MyWorld
+dependency27.to=Player
 dependency27.type=UsesDependency
-dependency28.from=Plattform
-dependency28.to=Player
+dependency28.from=MovingPlattform
+dependency28.to=MyWorld
 dependency28.type=UsesDependency
 dependency29.from=MovingPlattform
-dependency29.to=MyWorld
+dependency29.to=Player
 dependency29.type=UsesDependency
 dependency3.from=PlayerTestWorld
 dependency3.to=Player
 dependency3.type=UsesDependency
-dependency30.from=MovingPlattform
-dependency30.to=Player
+dependency30.from=SpikedPlattform
+dependency30.to=Spike
 dependency30.type=UsesDependency
 dependency31.from=SpikedPlattform
-dependency31.to=Spike
+dependency31.to=GameOverWorld
 dependency31.type=UsesDependency
 dependency32.from=SpikedPlattform
-dependency32.to=GameOverWorld
+dependency32.to=MyWorld
 dependency32.type=UsesDependency
 dependency33.from=SpikedPlattform
-dependency33.to=MyWorld
+dependency33.to=UnactiveSpike
 dependency33.type=UsesDependency
-dependency34.from=SpikedPlattform
-dependency34.to=UnactiveSpike
+dependency34.from=TargetingProjectile
+dependency34.to=Player
 dependency34.type=UsesDependency
-dependency35.from=TargetingProjectile
-dependency35.to=Player
+dependency35.from=Button
+dependency35.to=MyWorld
 dependency35.type=UsesDependency
-dependency36.from=Button
-dependency36.to=MyWorld
+dependency36.from=PowerUps
+dependency36.to=Player
 dependency36.type=UsesDependency
-dependency37.from=PowerUps
+dependency37.from=HealthItem
 dependency37.to=Player
 dependency37.type=UsesDependency
-dependency38.from=HealthItem
+dependency38.from=JumpBoostItem
 dependency38.to=Player
 dependency38.type=UsesDependency
-dependency39.from=JumpBoostItem
+dependency39.from=Enemy
 dependency39.to=Player
 dependency39.type=UsesDependency
 dependency4.from=PlayerTestWorld
 dependency4.to=JumpBoostItem
 dependency4.type=UsesDependency
 dependency40.from=Enemy
-dependency40.to=Player
+dependency40.to=EnemyProjectile
 dependency40.type=UsesDependency
-dependency41.from=Enemy
-dependency41.to=EnemyProjectile
+dependency41.from=PlayerProjectile
+dependency41.to=Enemy
 dependency41.type=UsesDependency
-dependency42.from=PlayerProjectile
-dependency42.to=Enemy
-dependency42.type=UsesDependency
 dependency5.from=StartWorld
 dependency5.to=Button
 dependency5.type=UsesDependency
@@ -139,14 +137,14 @@ dependency8.from=MyWorld
 dependency8.to=Plattform
 dependency8.type=UsesDependency
 dependency9.from=MyWorld
-dependency9.to=Healthbar
+dependency9.to=MovingPlattform
 dependency9.type=UsesDependency
 editor.fx.0.height=737
 editor.fx.0.width=814
-editor.fx.0.x=360
-editor.fx.0.y=26
-height=822
-package.numDependencies=42
+editor.fx.0.x=330
+editor.fx.0.y=72
+height=830
+package.numDependencies=41
 package.numTargets=23
 project.charset=UTF-8
 publish.hasSource=false
@@ -289,7 +287,7 @@ target4.width=120
 target4.x=0
 target4.y=0
 target5.height=70
-target5.name=UnactiveSpike
+target5.name=Healthbar
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=120
@@ -303,7 +301,7 @@ target6.width=120
 target6.x=0
 target6.y=0
 target7.height=70
-target7.name=Healthbar
+target7.name=UnactiveSpike
 target7.showInterface=false
 target7.type=ClassTarget
 target7.width=120
@@ -324,7 +322,7 @@ target9.width=120
 target9.x=0
 target9.y=0
 version=3.1.0
-width=715
+width=1550
 world.lastInstantiated=MyWorld
-xPosition=532
-yPosition=117
+xPosition=0
+yPosition=0