From 6ce32a689d1a9f804790d845220a1063a07b94e2 Mon Sep 17 00:00:00 2001
From: moritz <baarsmoritz70@gmail.com>
Date: Mon, 8 Jul 2024 12:43:39 +0200
Subject: [PATCH] Erstellung/Beginn Szene 2

---
 code/__pycache__/functions.cpython-312.pyc | Bin 2595 -> 4120 bytes
 code/__pycache__/setup.cpython-312.pyc     | Bin 5095 -> 5903 bytes
 code/__pycache__/sprites.cpython-312.pyc   | Bin 6252 -> 6618 bytes
 code/functions.py                          |  39 +++++++++++++++-
 code/setup.py                              |  20 ++++++--
 code/simulation.py                         |  52 +++++++++------------
 code/sprites.py                            |   7 +++
 7 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/code/__pycache__/functions.cpython-312.pyc b/code/__pycache__/functions.cpython-312.pyc
index 385f1094ed0bb908c77bc9775e24fb86cd88c017..ed2de9818c0836987099a59fc549ad62f65a24fa 100644
GIT binary patch
delta 1383
zcmeHH%}*0S6rbtNeo(rlg_Vys#R>@oQWC(32ZKgqFnkn^2SZGdl<tBpwKTI!Op`Xy
zgrp{VXzc-x8V^c(P@@Op!EpD~P|{}gz`;L&6yw=9ElnZDizg4hWZ%5s@BQY@zRbrf
zW!r22BFk0;_VM%6rA24f-iZgZ{pTGjzlrV>RRGV&@qqY#YRrO1Kcp;^qBqF12`9#4
z4!+}`7@;kcKw+GV3Fn#tF~cZ<pNon;f$|N;0*vi6lk*DgXC>sfNhG_cMDw+(tSomE
z&9@?y<P&^YJfTkw4dpY1AVaFB!qsl;s5XY>vzVa-30rd;xP30qx&uoJMoTS%q>$k9
zmKwr;U7T0eRZG1*b+Z-g3pB>Cvk}*$MsINxM+4lfNp4XsKC#nelBG~2ViJ`G9-G2i
zObr;C*-SNEGZrGD<%fnT#Nx|=N17?<F&bKjtjq#K3$8{YAyuPpSj3c=elZYS*%3h)
zq?#5rn^X-{#wyiKQ8$1xbZTc}Ar=Y5HA)=-Xcsu0ZHKpJl>I(T2x?JnVTAesU4!rV
z6SxhuUMAM`bZR;y6iG*!$m!YCY-X%TTxHUno=MGQ+KZ&KOl)a?%Ae^glCHCQE8{nB
zAGWzG2=m=f#In><lH3K!eIR*`IG}z=sI_y;ll7FGzJk;D=HA=+o%!9#y|sO(e`D&~
z1LDZIw&#kZ@4G0clc{7$>?w#nFUDSvzZ`$pzk8`DUN0-IEq~TuQU(jk;DO>h;*fL$
z(>7?}|3&!sF2bEqbY+5e!|u?2aDP0DqjVV3cbRSop<Yzo&;fz=G6voiL_3&c*P(i9
v>2U6_$#roQFnh@K3*g|0Vf+=zl~x<RT=8;vq+;{nE0wDbJapU#u3GdL+MM$l

delta 106
zcmbQCuvmoeG%qg~0}#Y*>P}n8Gm%e%QEsBTJXa;7ChJR(xZmV@X0eS$QcR47n|ql&
z*~K(jZm|_qrYGj676}36i^M^M^yJh0Qe1LCCL<6Ri%)*fFUs|qN0!mLNEj#p08*_N
A<^TWy

diff --git a/code/__pycache__/setup.cpython-312.pyc b/code/__pycache__/setup.cpython-312.pyc
index d72e155d0457d016784694ce0592e2c8a5f096aa..13ada76ce79d1d281b23c264a2f9b35d2cb37f23 100644
GIT binary patch
delta 715
zcmZvZO=uHA6vt<FXS188yW5&*(i%$qNH*&sVDVBAA&AmLDN-*|qM>HjWNSat+4K<D
zkbqvqLkV*!o(f)CyeI|nB-MimUV?hsiqv{2xs=l0Jcw@=np}J^Ki-@Fdo%Oi92jdk
z?Te}oAh7C(=a2SdZ7qQ_ZR5g#MV_KrQpcwBX6n9Rc4tI{x&-pNpE=$_=o|_FMFv~}
zuUi3Oi+vULv*U%*vSk-syS7@*RqOuQz$>~nYTGrp=$7myyLgq3ZhsfeFjm>$L1RLL
zYG;BU+u^u{0V{AU9Rh*EC5R4loB?!y0Zh>s9E)CL4^(5!;JYD!^O#qs0H*9qbZ)6^
z(+GR1F5nCs()`c}<oGFeq>Y46pON3z^ae?u2c-n7X9{?54mx>(+w;GNMGITRl3(#5
zfHer47SfS^EV1`E9T9qZh#lf|vmeVI@~|g(qDMT*3wd%`X(*m@7n#a5g+`I{5qhQ)
zcr@rF!@K8?a6WN?|B@M|D%bh2sLl~gr#BcH<$E!X1i%en1Ex-m2F?HXGsfvn$eiaj
zJBa-h3uEp^eq&|x(l<TVn*5=kTWdaRuJ`v?i^SOz5^e6qlIxXC<#qPm<W8k?=U!*_
zVJBK@P3=YE9TKN}sHWtHs`c{RBK!n|bd)2{!SCEcK~nIxKg#vRWovc8zCmw;1YILH
f2{;ll#=A(}McOgZapL&$493}$iZCeSL{R<@{g9{w

delta 325
zcmeCzd#=uRnwOW00SI{Jbf-NLoX97^s4!7ok)@JRlVxL2ER#TH5HkbAOBSGtmnVQk
z=H&fM5{#OYZ!kSlFpNpgPf3j_PAw@d&?~6C#S3P|7nc;Jrj`^JiEn<ytjWp9HJOK3
z-I5!m*Ai${<^>Sp$_OM1nHU&~c!3f{Y#@RUMDPQNmk)u2Ci5+(%#<Se$vM30aw;HE
zkfO|NkZuJap~-%WwJ0$!J++8q@<!eqM&-$Je7D%dfNE~ZO#a6w$(om1USzjffxng|
zMgn9W%PqEo%JjrspavkfNE}4i0g06iMIiYikk(%uHo5sJr8%i~MUFr&(2)$qAn^~(
bjEs!88F+6q@O@(8XO#G?62!=;0oDfq)0a*A

diff --git a/code/__pycache__/sprites.cpython-312.pyc b/code/__pycache__/sprites.cpython-312.pyc
index 98a7fdf6adcbbf17d8ac048e1ad4063ba7166a76..0cc9210d1954116931b89163d204506ca553de3d 100644
GIT binary patch
delta 832
zcmZvZO-vI}5XaxN-Ii{<1-GTew$vgmwGfaGC8!0eB2xTlRbnDaE9pn9kREn5v4%tr
zJ(So;;ycL25MxZ_grpuk;KeH!<w8?qOgwn<fLPJQLw!@KCWe>nZ{Pmk%)I~1e(5as
z7}f-VCv4^3+)s?@R}2FHCny;9(gZl_VwwyY*JjBb80Rk$Z%zII7?jYRf2>;7xD}XI
zUAR}W=UbNH5t)G)OdTLZ^3m(OnJ#Kgd`vNAWkPdIS&?!)uZXE|doKdjA|%bt0J}zg
zzNnF-@l-t0m3&bymy;P*I%!oA@<;FXDy4dsCAks%8N3R~!d^uodRvm>saugs0U3Qc
zostcY`003}s^8rcnx0I@r4A;IRJB$XBlj`Pl7g;bA+WA<KX)yAm%PhuOKq==>#e?m
zwJ|$1AD9c|&J?VUzgwfdP-}l%W2b|>ji&U^po^M>L!hGpVL;u>3QB!6EA&7MT^06e
zw)7m=xNXRP5H>)41n&$!v^Z#?))&Mt=_ukDLO}Qs{R}cr$zSP28blF+c4dtFnIS(E
zDz1N%Fi7^wc|KbA8h>V!XoQpWu-M@mLj4qC7;zdAM1&9*5LUWow$rDg2!8s@+(|!+
zD=c}z7=Qr%WSmtW$DlEK!_*6B>7vOK-p%wC47!Tg)&3}+Ag~2lWMKBcD>R&EO9ZZc
zTMb<EP7kAbSN#)EpTmTU%-KN*F;{8-H55h=|Boh&A_DvRHySPH`AQge%7*Dni&Iyb
yV#Q0CezaKIqbvi5EKf3QDgod<5lX5quw^gLPs~kh2u<&VrV?R7=_YMy82$~KTfs5_

delta 557
zcmZvY%Su8~6o$`AJEnDxNFLD)%^<{}(zJ`A=7mJNV5AsD1`QG{=yG&Wvjz=}1`U>P
zAdRAdoM}BlBb!9_2GKx4s$qK>5k!0N?Y;kht<Bnh!~5nI9|S?ivGsg=ncwTJi6MXh
z9_lTa2b-?Uoxr9x&ABv61w<8il&bnpgC(tmkHR&K;)&=39p17oFSbN4IB-O7?|Sc3
zmh?}+PqKH5DLgRSFm4E>eC#Su5vB<OVTLfvPy~jsY^D3$4?JX0-RC*?(WUMVHaP})
zu;VLr!#zkrc5d{f*J6?7)kH+rlNG{h|G0ggj$uNC5G5=UmI%w(?Dv8n3uZTFj5P=$
zFC`(0tI`=Cpn??EbVhuYhG78(lQa0=^cgD568`<i0y%_PJT?uncj^X<a$_n3pCD%i
z{pJZsvJp=A*GY&G{)VwZB7u5-!_am+TO7l8805P&vdFduUp$fvrQHUf?(DLfiQkcS
v=Gnj%%fQ$+6DjfH4ntD~056=-R*!<UoW06j<emgaU2wEHCbYM(Vu^nNWN~?b

diff --git a/code/functions.py b/code/functions.py
index 28ff6e3..af2121f 100644
--- a/code/functions.py
+++ b/code/functions.py
@@ -58,4 +58,41 @@ def check_sensor(collisions, lanterns):
                 
                 # Direkt zugehörige Laterne anmachen
                     if lantern.id == detector.id:
-                        lantern.light_up(255, 255, 0, 255)
\ No newline at end of file
+                        lantern.light_up(255, 255, 0, 255)
+
+def scene_1(screen, detectors, streets, lanterns, player):
+    screen.fill("Grey")  
+    detectors.draw(screen)
+    streets.draw(screen)
+    lanterns.draw(screen)
+    player.draw(screen)
+    player.update()
+
+    for lantern in lanterns:
+        lantern.reset_light()
+
+                # Check for collision and light up corresponding lantern
+    collisions = pygame.sprite.spritecollide(player.sprite, detectors, False)
+    check_sensor(collisions, lanterns)
+                
+    if pygame.sprite.spritecollide(player.sprite, streets, False):
+                    player.sprite.set_back()#
+
+
+def scene_2(screen, detectors, streets, lanterns, player):
+    screen.fill("Pink")  
+    detectors.draw(screen)
+    streets.draw(screen)
+    lanterns.draw(screen)
+    player.draw(screen)
+    player.update()
+
+    for lantern in lanterns:
+        lantern.reset_light()
+
+                # Check for collision and light up corresponding lantern
+    collisions = pygame.sprite.spritecollide(player.sprite, detectors, False)
+    check_sensor(collisions, lanterns)
+                
+    if pygame.sprite.spritecollide(player.sprite, streets, False):
+                    player.sprite.set_back()
diff --git a/code/setup.py b/code/setup.py
index 5b4d933..cf347da 100644
--- a/code/setup.py
+++ b/code/setup.py
@@ -1,7 +1,7 @@
 import pygame
 import sprites
 
-def setup_streets():
+def setup_streets_scene_1():
     street_1 = sprites.Streets(0, 100, 850, 4)     # Street 1 Top Line
     street_2 = sprites.Streets(0, 200, 850, 4)     # Street 1 Bottomm Line
     street_3 = sprites.Streets(950, 100, 850, 4)   # Street 2 Top Line
@@ -19,7 +19,7 @@ def setup_streets():
     return streets_list
 
 
-def setup_lanterns_detectors_new(SCREEN_WIDTH):
+def setup_lanterns_detectors_scene_1(SCREEN_WIDTH):
     lantern_list = []
     detectors_list = []
 
@@ -101,4 +101,18 @@ def setup_lanterns_detectors_new(SCREEN_WIDTH):
     lantern_list.extend([cross_lantern_1, cross_lantern_2, cross_lantern_3, cross_lantern_4, cross_lantern_5, cross_lantern_6, cross_lantern_7, cross_lantern_8])
     detectors_list.extend([cross_detector_1, cross_detector_2])
 
-    return lantern_list, detectors_list
\ No newline at end of file
+    return lantern_list, detectors_list
+
+def setup_streets_scene_2():
+    street_1 = sprites.Streets(0, 450, 850, 4)     # Street 1 Top Line
+    street_2 = sprites.Streets(0, 550, 850, 4)     # Street 1 Bottomm Line
+    street_3 = sprites.Streets(950, 450, 850, 4)   # Street 2 Top Line
+    street_4 = sprites.Streets(950, 550, 850, 4)   # Street 2 Bottom Line
+    street_5 = sprites.Streets(850, 0, 4, 454)     # Street 3 Left Line
+    street_6 = sprites.Streets(950, 0, 4, 454)     # Street 3 Right Line
+    street_7 = sprites.Streets(850, 550, 4, 450)   # Street 5/6 Bottom Line
+    street_8 = sprites.Streets(950, 550, 4, 450)   # Street 4 Left Line
+
+    streets_list = [street_1, street_2, street_3, street_4, street_5, street_6, street_7, street_8]
+
+    return streets_list
\ No newline at end of file
diff --git a/code/simulation.py b/code/simulation.py
index 7c3bd8f..c14e413 100644
--- a/code/simulation.py
+++ b/code/simulation.py
@@ -14,19 +14,26 @@ clock = pygame.time.Clock()
 player = pygame.sprite.GroupSingle()
 player.add(sprites.Player())
 
-streets = pygame.sprite.Group()
-streets_list = setup.setup_streets()
+streets_scene_1 = pygame.sprite.Group()
+streets_list_scene_1 = setup.setup_streets_scene_1()
+streets_scene_2 = pygame.sprite.Group()
+streets_list_scene_2 = setup.setup_streets_scene_2()
 
-lanterns = pygame.sprite.Group()
-detectors = pygame.sprite.Group()
-lantern_list, detectors_list = setup.setup_lanterns_detectors_new(SCREEN_WIDTH)
+
+lanterns_scene_1 = pygame.sprite.Group()
+detectors_scene_1 = pygame.sprite.Group()
+lantern_list_scene_1, detectors_list_scene_1 = setup.setup_lanterns_detectors_scene_1(SCREEN_WIDTH)
+
+current_scene = "scene_1"
     
-for item in lantern_list:
-    lanterns.add(item)
-for item in detectors_list:
-    detectors.add(item)
-for item in streets_list:
-    streets.add(item)
+for item in lantern_list_scene_1:
+    lanterns_scene_1.add(item)
+for item in detectors_list_scene_1:
+    detectors_scene_1.add(item)
+for item in streets_list_scene_1:
+    streets_scene_1.add(item)
+for item in streets_list_scene_2:
+    streets_scene_2.add(item)
 
 
 
@@ -37,25 +44,12 @@ if __name__ == "__main__":
             if event.type == pygame.QUIT:
                 run = False
         
-        screen.fill("Grey")  
-        detectors.draw(screen)
-        streets.draw(screen)
-        lanterns.draw(screen)
-        player.draw(screen)
-        player.update()
-
-        for lantern in lanterns:
-            lantern.reset_light()
-
-        # Check for collision and light up corresponding lantern
-        collisions = pygame.sprite.spritecollide(player.sprite, detectors, False)
-        functions.check_sensor(collisions, lanterns)
-        
-                
-
-        if pygame.sprite.spritecollide(player.sprite, streets, False):
-            player.sprite.set_back()
+        if current_scene == "scene_1":
+            functions.scene_1(screen, detectors_scene_1, streets_scene_1, lanterns_scene_1, player)
+        if current_scene == "scene_2":
+            functions.scene_2(screen, detectors_scene_1, streets_scene_2, lanterns_scene_1, player)
 
+        current_scene = player.sprite.left_scene(current_scene)
 
         pygame.display.update()
         clock.tick(60)
diff --git a/code/sprites.py b/code/sprites.py
index 2bebe9a..d96f6ed 100644
--- a/code/sprites.py
+++ b/code/sprites.py
@@ -39,6 +39,13 @@ class Player(pygame.sprite.Sprite):
         if self.rect.x < -60:
             self.rect.x = 1860
 
+    def left_scene(self, current_scene):
+        if current_scene == "scene_1" and self.rect.y <= -80:
+            self.rect.x = 900
+            self.rect.y = 1050
+            return "scene_2"
+        return current_scene
+    
     def update(self):
         self.get_last_position()
         self.player_inputs()