From 007bb67a0d8236235a0d241210dff72c1af04398 Mon Sep 17 00:00:00 2001 From: Makussu Date: Thu, 21 Dec 2023 16:07:29 +0100 Subject: [PATCH] polish, more assets and todo --- assets/Sprite-0002.ase | Bin 0 -> 705 bytes assets/Sprite-robi.png | Bin 0 -> 4394 bytes assets/Sprite-robiwithbob.png | Bin 0 -> 4566 bytes collect.pde | 8 -------- files.pde | 9 +++++---- kek2.pde | 20 ++++++++++++-------- keys.pde | 1 - logs.pde | 27 --------------------------- menu.pde | 25 +++++++++++++++++++------ readme.org | 17 +++++++++++++++++ saves/save.json | 5 +++++ ship.pde | 9 +++++---- 12 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 assets/Sprite-0002.ase create mode 100644 assets/Sprite-robi.png create mode 100644 assets/Sprite-robiwithbob.png create mode 100644 readme.org create mode 100644 saves/save.json diff --git a/assets/Sprite-0002.ase b/assets/Sprite-0002.ase new file mode 100644 index 0000000000000000000000000000000000000000..31239786b487fbf0cde29e0e09e8a13b2bc68f0b GIT binary patch literal 705 zcmX@e#K7=iDI;wY?gFHyH z0yEeo2mvycoxvxuGPOv-5Wlq1doS`&r0Wen+!v8Sekod8)ptZWAl1@ z@VS1>rzf|X^?O!i@@vkBsLq&i@5R*m7m;!eZ#&ObcZdobv`^UQn99$$b;=9X>wH09 QgQK=TxXRBkk;&-}08D?;IsgCw literal 0 HcmV?d00001 diff --git a/assets/Sprite-robi.png b/assets/Sprite-robi.png new file mode 100644 index 0000000000000000000000000000000000000000..c6474f1969a77a4a8d693bce62121df122e1b321 GIT binary patch literal 4394 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}7g8fU(>y)37&sUh7`PZ1 z7+Dw?L24Kn7#NY*OpMG7%nS?+Z43+yLX6B{H6V3TjI3aG4+8^(G?YDsfq_8-s)mVy zfx(cGiGi1afng2<1A`GG6N3l?1H&o?28PUbh+X>_Ab^7b1U*1DGcYi~Xm?NF00kpG zLjyfyGX@4D10!QALnA9ALj^-qD+4ntBVz_e2F3*l7lF(Y4!h69z`)p&>FgZf>Flgf zP?VpRnUl)EP%)==qOHea2brVs(cZ4B_`)ks~IuBSbe1? ziHN%&-1^|b@uaHGhdT=VVJIvu3@Vu@^nbcY)RBsUJN@O~<;veP)Nei&vRR#R z#jMnnAWy~V@uE)aIg%xqIh3>vgXaq$HL*E<-L|G?Z}(@N_r>*nbxRYB4yX&L&&Z27 zB7MYo_Ox@A^DPdYn&edDXOnn=wNrkl-tIrgc0SoKKi#b-CvBdElg^Y~5$}@1%t9Vz zKAN#8Ys&lcJJ%H4d$cC(^_p7$e}@Vjqa&YLoef;Fp+mJpKw)to*QyNy%R`lqy0m?p zEcZ|Fxc($>wQ$xR8SWL1txtX&{QsbQds<=EC0{P}#s}TG^*xLWV;5ZA@b-Q3?Yy}R zjp+}(UjNAUP53tXi<^75EMxQS14m2UCx34^EvxWriFex*55`&lk_0R47w4a1cHZuA zf7b2jYWd~-4%2pd-DhBLKTy%R>ALN`ySMM&-k*N!?_Y+Q&?xfFg{+#=fE;F*!T6L?J0PJu}Z%>HY5gN(z}Nwo2iqz6QPp z&Z!xh9#uuD!Bu`C$yM3OmMKd1c3d_URu#Dgxv3?I3Kh9IdBs*0wn|`gt@4VkK*IV; z3ScEA*|tg%z5xo(`9-M;CVD1%2D+{lnPo;wc3cWJMJZ`kK`w4kBZ^YeY?U%fN(!v> z^~=l4^~#O)@{7{-4J|D#^$m>ljf`}QQqpvbEAvVcD|GXUl|e>8%y3C9PAAp#4CU}mIiXl7`VYMGK|l$@N3 zWRz!KaYdqeO$0v=k!? zV-wR9BqRKbGSf5j5_6DU1u`lnGsVi#(9$HuG%Zcn%-keJ*CZ`9O*b*o!d%zP*wQq~ z(mXlIIMEVpR7$dyTYgb)Vu`I%W^Q77s(wLUI#>b};8u_;7k`2;K4Nc6`3{1eG05`ojKdq!Zu_)CsJvFbyR>?gxw*VYg3L4;u z(nM8Vo{KnGXmF7f0wgIOOaTxa>+a!gWGi%~YRC-cf(=a0-At9l`x@DcBL!gwxvF}UT4qf1C z3}o-IO1Q$fUYW literal 0 HcmV?d00001 diff --git a/assets/Sprite-robiwithbob.png b/assets/Sprite-robiwithbob.png new file mode 100644 index 0000000000000000000000000000000000000000..85f49c2b22d28b6f88a71c884301a06e1c4497a8 GIT binary patch literal 4566 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}7g8fU(>y)37&sUh7`PZ1 z7+Dw?L24Kn7#NY*OpMG7%nS?+Z43+yLX6B{H6V3TjI3aG4+8^(G?YDsfq_8-s)mVy zfx(cGiGi1afng2<1A`GG6N3l?1H&o?28PUbh+X>_Ab^7b1U*1DGcYi~Xm?NF00kpG zLjyfyGX@4D10!QALnA9ALj^-qD+6;Y0|N#|2F3*l7lF(=>`|G>z`)p&>FgZf>Flgf zP?VpRnUl)EP%)==qOHea2brVs(cZ4B_`)ks~IuBSbe1? ziHN%&-1^|b@uaHGhdT=VVJIvu3@Vu@^nbcY)RBsUJN@O~<;veP)Nei&vRR#R z#jMnnAWy~V@uE)aIg%xqIh3>vgXaq$HL*E<-L|G?Z}(@N_r>*nbxRYB4yX&L&&Z27 zB7MYo_Ox@A^DPdYn&edDXOnn=wNrkl-tIrgc0SoKKi#b-CvBdElg^Y~5$}@1%t9Vz zKAN#8Ys&lcJJ%H4d$cC(^_p7$e}@Vjqa&YLoef;Fp+mJpKw)to*QyNy%R`lqy0m?p zEcZ|Fxc($>wQ$xR8SWL1txtX&{QsbQds<=EC0{P}#s}TG^*xLWV;5ZA@b-Q3?Yy}R zjp+}(UjNAUP53tXi<^75EMxQS14m2UCx34^EvxWriFex*55`&lk_0R47w4a1cHZuA zf7b2jYWd~-4%2pd-DhBLKTy%R>ALN`ySMM&-k*N!?_Y+Q&?xfFg{+#=fE;F*!T6L?J0PJu}Z%>HY5gN(z}Nwo2iqz6QPp z&Z!xh9#uuD!Bu`C$yM3OmMKd1c3d_URu#Dgxv3?I3Kh9IdBs*0wn|`gt@4VkK*IV; z3ScEA*|tg%z5xo(`9-M;CVD1%2D+{lnPo;wc3cWJMJZ`kK`w4kBZ^YeY?U%fN(!v> z^~=l4^~#O)@{7{-4J|D#^$m>ljf`}QQqpvbEAvVcD|GXUl|e>8%y3C9PAAp#4IbHlVW-J~R=WL*;@V`JUK

9FqcqFZ)Km-O zRMXT%BqRKbGSf5j5_6DU1u`lnGsP+?B_+koAT3qbAl1l3*Tm2yN!P-{B3U;r)igQT z+#to=FgXcqR7$dyTYgb)Vu`I%W^Q77s(wLUI#>b};8ujmk${aS3DEG)LF3B&d1PeiORB&n`ga_f~ zWP(&HC@6q4g;ioQ#0$lVWvMA(cfzHTGZORCQ&Vh}pve`cB@;_hut+mZPD(T~(X~uY zGuJgSG)UF8FiJMlwJ@|WGBQXuvM@I=Mm4=SKdq!Zu_)CsJvFbyR>?gxw*VYg3L4;u z(nM8Vo{%K1P^86d)Bcc3cV&u^<;W zJ1!f2a7hO$^&kd3IUQ7kESlF z1s4~hJC&N3VyjfHWN$bBcg05r1_rhyZ+91l{~)+v@AAnE3=EtF9+AZi4BWyX%*Zfn zjsyb(1AB?5uPgg=9#KAa#_%eKTm}ZlVow*xkch)?!*%lx8;I0xTP3Gp>#$D1C?mjo z=Yba$4F^B03UyvBCX*l_cZ=KQltZHDx(&=r*d;y&m|g!EzgOeh5?jp!_8))Wd!D}k zJi|m@&D@P&_FI@SYj1u0?%&H*wRY2%)wfz*KYrzFm{eAa&CJr7g@%6K91M*myl?;A zob$ioMLtuZ-87HW2M#|ze)Y&Qug6asG*1bXr7<4JGuo;kN05^m3%J?D2{e_Ar5_j1OcDsuVlk&^@Vas~!3y%6$J#cJ~7 z(<`^dhM6-LNS!v{yh&iM*n^0P|83b8F+X_ApmYDo*+$i_i4v=moPyr^E;pJuLCHnf zhk+y3Gp>m<=Mr;riCJ;)=~hh*_K4|@PFxS(8vGOria7o8+lGH-IofW1wg-0cd@B)G z@ra2!5G{CiY26xzX_p$*7(A-PIU>t$r&j)7t-N9{`xSSt< x && ship.newX-10 < x + logwidth && ship.newY+10 > y && ship.newY-10 < y + logheight) { - // ship.colliding = true; - // } - // } - // } - - // void draw() { - // drawLog(4); - // logCollide(ship_zero); - // } - } - -// class Tree extends Log { -// Tree (float x, float y, float logw, float logh, boolean hasC) { -// super(x, y, logw, logh, hasC); -// } -// void draw() { -// color treecolor = color(133, 79, 51); - -// // rectMode(CENTER); -// drawLog(1); - -// } -// } diff --git a/menu.pde b/menu.pde index ae44f14..339789d 100644 --- a/menu.pde +++ b/menu.pde @@ -25,6 +25,9 @@ class MainMenu extends Menus { ispause = false; isgame = true; } + fill(0); + textAlign(CENTER, CENTER); + textSize(32); text("Play", x, y); } @@ -34,6 +37,9 @@ class MainMenu extends Menus { ismenu = false; isstats = true; } + fill(0); + textAlign(CENTER, CENTER); + textSize(32); text("Stats", x, y); } @@ -42,6 +48,10 @@ class MainMenu extends Menus { // color maincolor = color(100, 100, 100); playButton(300, 300, 150, 50); statsButton(300, 400, 150, 50); + + textSize(100); + textAlign(CENTER, CENTER); + text("Save Bob", 300, 200); } void draw() { @@ -62,6 +72,8 @@ class Stats extends Menus { isstats = false; } fill(0); + textSize(32); + textAlign(CENTER, CENTER); text("Main Menu", 300, 300); } @@ -69,13 +81,14 @@ class Stats extends Menus { background(50); menuButton(); + textAlign(LEFT); textSize(24); - text("Best Game Time", 50, 50); - text(best_game_time, 200, 50); - text("Trees Sawed: " , 50, 70); - text(trees_sawed, 200, 70); - text("Insgesamt Spielzeit", 50, 90); - text(game_time, 200, 90); + text("Best Game Time", 100, 50); + text(best_game_time, 500, 50); + text("Trees Sawed: " , 100, 70); + text(trees_sawed, 500, 70); + text("Insgesamt Spielzeit", 100, 90); + text(game_time, 500, 90); } } diff --git a/readme.org b/readme.org new file mode 100644 index 0000000..31116db --- /dev/null +++ b/readme.org @@ -0,0 +1,17 @@ +** Ingame +*** DONE Level mit 2 Bereichen. Erster Bereich Straße und Kettensäge und End/Startpunkt. Zweiter Bereich Wald und Bob +*** DONE Robi muss noch beschleunigen können +*** TODO Wir brauchen Geräusche +*** DONE setze bob auf den Robi +*** TODO Richtige Texte am Anfang zum erklären +*** TODO Abprallen nicht machen, wenn newx nicht erreicht sein kann, sondern wenn Robi tatsächlich die Wand berührt +*** TODO Roboter muss abprallen, kaputt gehen +*** BUG sometimes a log gets stuck in sawed = false state +** Menu +*** DONE Statistikseite: Spielzeit, Bäume gefällt, Zeit gestoppt +*** DONE Richtige Texte im Menu +*** DONE File loading and saving +Wird noch nicht benutzt +*** DONE nochmal die statistikseite überarbeiten +**** DONE Math for best_game_time +**** TODO Why doesnt bestgametime work diff --git a/saves/save.json b/saves/save.json new file mode 100644 index 0000000..97f2c01 --- /dev/null +++ b/saves/save.json @@ -0,0 +1,5 @@ +[ + 0, + 13, + 205455 +] \ No newline at end of file diff --git a/ship.pde b/ship.pde index a0997f9..e54de47 100644 --- a/ship.pde +++ b/ship.pde @@ -1,6 +1,3 @@ -// Roboter muss abprallen, kaputt gehen -// TODO Abprallen nicht machen, wenn newx nicht erreicht sein kann, sondern wenn Robi tatsächlich die Wand berührt - class Ship { // Movement PVector pos = new PVector(-width/2, height/2); // position @@ -157,7 +154,11 @@ class Ship { // line(-10, 10, 0, -10); // triangle(- 5, - 5, - 5, 5, 10, 0); imageMode(CENTER); - image(player_sprite, 0, 0); + if(bob.is_attached) { + image(player_sprite_bob, 0, 0); + } else { + image(player_sprite, 0, 0); + } if(hasSaw) { image(saw_sprite, 20, 0); }