From 17963b116c2dbeffdbcfc10e70e4e909a9586faa Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Thu, 2 Nov 2023 21:49:39 +0100
Subject: [PATCH] fix level 2, add level 3, start + end cards

---
 .gitignore  |   1 +
 gg.py       |  24 +++++++++++++++++++++++-
 maps.tmx    |  24 ++++++++++++++++++++----
 tileset.png | Bin 1094 -> 1110 bytes
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c218293..a1cf51b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gg_data.py
+/screenshots
diff --git a/gg.py b/gg.py
index 9f661d9..56f5c23 100644
--- a/gg.py
+++ b/gg.py
@@ -106,7 +106,7 @@ def collision(num, ox, oy, nx, ny, flipped):
 
 def playLevel(num):
     loadLevel(num)
-    x, y, vy, ay = 5, 90, 0, 1
+    x, y, vy, ay = 5, 16*[6,9,4][num], 0-(num==2), 1-2*(num==2)
     frame = 0
     action = False
     standing = False
@@ -132,7 +132,28 @@ def playLevel(num):
         except KeyboardInterrupt:
             action = standing
 
+def startcard():
+    clear_screen()
+    draw_string(152, 20, "Gravity Guy !", (0,0,0), "small")
+    draw_string(15, 40, "Inversez la sens de gravitation en appuyant sur la", (0,0,0), "small")
+    draw_string(15, 55, "touche [AC/ON] pour sauter de plateforme en", (0,0,0), "small")
+    draw_string(15, 70, "platforme et atteindre la fin de chaque niveau.", (0,0,0), "small")
+    draw_string(15, 90, "[AC/ON]: C'est parti !", (0,0,0), "small")
+    show_screen()
+
+    try:
+        while True:
+            pass
+    except KeyboardInterrupt:
+        pass
+
+def endcard():
+    clear_screen()
+    draw_string(136, 84, "Bravo Gravity Guy!", (0,0,0), "small")
+    show_screen()
+
 def main():
+    startcard()
     num = 0
     while True:
         b = playLevel(num)
@@ -143,6 +164,7 @@ def main():
                 break
         elif num+1 == len(levels):
             print("Bravo!")
+            endcard()
             break
         else:
             print("Niveau suivant?")
diff --git a/maps.tmx b/maps.tmx
index fb56d2d..17cd14b 100644
--- a/maps.tmx
+++ b/maps.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="24" height="12" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="24" height="12" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="1">
  <tileset firstgid="1" source="tileset.tsx"/>
  <layer id="1" name="Tile Layer 1" width="24" height="12" visible="0">
   <data encoding="csv">
@@ -17,10 +17,10 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,3,3,4,3,3,4
 </data>
  </layer>
- <layer id="2" name="Tile Layer 2" width="24" height="12">
+ <layer id="2" name="Tile Layer 2" width="24" height="12" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,2,0,0,2,2,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,6,6,6,5,6,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -30,7 +30,23 @@
 0,0,0,0,0,2,1,1,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-4,3,3,3,4,3,3,3,4,3,3,3,4,3,3,3,4,0,0,0,0,0,0,0
+4,3,3,3,4,3,3,3,4,3,3,3,4,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Tile Layer 3" width="24" height="12">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,2,2,2,2,0,2,0,5,6,6,5,0,0,0,0,
+5,6,6,6,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,1,1,1,
+0,0,0,0,0,2,1,1,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+4,3,4,3,4,3,4,3,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+7,7,7,7,7,7,7,7,7,0,0,0,0,0,0,0,0,0,4,3,4,3,4,3
 </data>
  </layer>
 </map>
diff --git a/tileset.png b/tileset.png
index 55e6391c41d8e4b619a98b4d7a84c3361a7698a3..a3e8a010f5ad315f63e8e60b046683621297e091 100644
GIT binary patch
delta 680
zcmV;Z0$2UU2-XN8iBL{Q4GJ0x0000DNk~Le0001R0000G2nGNE0L~Qq5wRhe0Wl^3
zApj>UNBCy|000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>d{6dVQ)cZ<Z6>j5Z#
zE=fc|R9M61nLS9uKorOSC*8zF0u`JbgsQkGsGFkIRf-_7TEtP2ila-ZItVUeDRmZ0
zEJ6ugHSX=8OVJJ;oCJm9B90mdJxtQ1NqT1!>wijk_wM8U^6o1HoRm6~RR9<r9B5eX
z=Dq>|h{qxX0FDoiRCuVZooxaDwc3k+t{?Ga`e$s(%{o6p=qB3tX8oTZE||toXyB=?
zl`G7IXDuC!_INBp+`=oC$^ZZ<ogl`6w_1YGZP^E>5Lo<K0S0I=0bpW$7&GBnTq{@T
z?CPm2Y-ZPf02ELoY1^A$-S8A108H*@RAaEI#+Kt67%83YF(~N3x%H>u-(MAfrv8)Y
z=ALSVqz$qeL?d*kGS>U{`h@9Fzo!7zsWr%og#5aQY_-FYkK6K%wA6FS<lkWzWVd!V
z@cg1kIEsan99H^2S_+Sc0#Z6bSSpwpmsPZ>WJLl1Ujehtz~4}_S?e{t{JQ8WJ3Yxj
zuRBn=z2j2Pz{pTj?S`hz!O4n$bw>UxfOgrpdpO6ftz7QWQ8`iU1;kze!1<H)x|prj
zKmW@qv{e$np|F&(nlfo-wp|7mOJ&QWgcoa{?Ud{Q@)tz?bm`ZPOn~(!#%~*xW~XEd
zje?4VqdI%G>c1ldmz$V&+Ibow`uY54x(3pqTfwoi8)4bO^V1>zudD7yD$T8=bi%X_
zCy)xK8RpAeRt5VO|MX=x;S~r9(P?%SPBUD7r|<x12Ep!k5idLI_&)&|3|-vMK0S8;
O0000<MNUMnLSTXt$}?#I

delta 664
zcmV;J0%!f!2*wB@iBL{Q4GJ0x0000DNk~Le0001B0000G2nGNE0O`7V`LQ9H0Ws_V
z>;UfbEq59K000SaNLh0L04^f{04^f|c%?sf00007bV*G`2j>bM5EBZrN*#rh>j5Z#
z9!W$&R9M5^m^(-uQ51&1D|V7b1`JqP2%3;4LbS`GtF0`7FqlZNG{^=^n`NVgU=x&O
z1v`n1OF#x|$6kx1k!WFIC2T-!#MVin7iZ_O^W43we>KCo=RUr3&wU9p(#B8I1{irY
z+_c>9(=z~yvjqXLzWT#Pp}s9G3V^GBtLuh-6w8&zv6UA*ewx-Roc~Gvg#;&cXdN(-
zpA77<+g_Y4h`8{Nj!ytEDkb6Wc)O)(y@7p*3Nej;w}b&OHu{E%{3M6g0X;8XdK~=h
z&Hzfl&E#xv`pZ|P@B!YhRBbmbsdt}>4wxGaw#z=P0eoD488|Vsuxz^_J0bah1;HJ(
zsB+hPdsAn8Xi#YY?A#otWw1A|vvb}R$tQ04X6g!q6xSXHey6CApW(x1jn9L3ZG{ie
zZB$AkO$B44rp+^zX&C^S0uRlARw!xKsD{5cugA)cL>ZuZpl5&nW>U}a+t-QO9m@HG
zH?81|cv1lfoBiL{rZQ`*R=bRUR8H6XLGK4(w;sGN?3{bQpX3tMF6j?Y)07EXa%5(7
zTm~E+p9CI7RjmD?OIm~=-3Os@xoOo#ocbo5Gyw7#x>e38&6?f%ROBOO)<;l))HmVh
zbn=li-w$#t;CuD}2`vb2klhVC41OnF!c@!i6cJZOrQ};j6v+GARq^jP;+N8kT;IS)
yrH^qUtAWTMM4jFH+f@P32?6kf81~$pmHj`CcTo@<4Ch_|0000<MNUMnLSTY2ZYQMx