From a1cba3fa8fe5e9f9d1bcf5e9b9ff2ccc0d026469 Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Sat, 26 Sep 2020 22:51:43 +0200 Subject: [PATCH] Icons, tutorial --- core/assets/icons/icon_128.png | Bin 0 -> 894 bytes core/assets/icons/icon_16.png | Bin 0 -> 612 bytes core/assets/icons/icon_32.png | Bin 0 -> 668 bytes core/src/com/trs/game/Controller.java | 2 +- core/src/com/trs/game/model/Model.java | 2 +- core/src/com/trs/game/model/Monster.java | 2 +- .../com/trs/game/view/Screens/EndScreen.java | 3 +++ .../com/trs/game/view/Screens/GameScreen.java | 22 +++++++++++++++++- .../com/trs/game/desktop/DesktopLauncher.java | 5 ++++ 9 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 core/assets/icons/icon_128.png create mode 100644 core/assets/icons/icon_16.png create mode 100644 core/assets/icons/icon_32.png diff --git a/core/assets/icons/icon_128.png b/core/assets/icons/icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..3a07ccd12a63a91c182f99c04800098940e97c6c GIT binary patch literal 894 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr zm{>c}*5j~)%+dJZrCOrw)*gi?0_N&;bXj?cb|);{A{td{u=5M|EE5$?y}qXGg9rPM zu4?YyypC^OlfnHlJY@UaH+5^jd?;bvW9Xlnxa{lk)FWQxp8SN%k^u26z-Q#GpH}mD3 z@14$TR5Xt~Ka$KAJK@K~*PBk~&*|plwlPjg3Hp3QF=^wCgGKC{CoL567jzd1U0kF1 zdefoG?#)pvH(s;-$=zI;t9rI{*5Qt1PEHj?CpX^IkOW1q)oxv#B5#k|{7F1MUuC+_ zIwJ{7v4B>tlOLP^AAFy8_Ry1-*&;oRclEdZHDqEbYfQVlZGV66?ns;L;7M>ht@$0$1_n7s{8y2d^8mYK{x-7!Q`rvQRK23I>drY<2dHHK==h!hw zzRLQ^W?{kN);(qKyN~bYoxAtX_VTOu?CT~M?Kemf&jUsaTavfC3&Vd9T(EcfWS|IV zfk$L91B0G22s2hJwJ!q-vX^-Jy0SmvloFBVIA5N(3n(O6;u=xnoS&PUnpeW$T$Gwv zlA5AWo>`Ki;O^-g5Z=fq4vg+FPZ!6Kid%2*2J$r-2sj*E_wZl%I&p=IP21j-J=^d2 zFmS~Yfwf!j-MDsIPk@2Rfq{d8QGtP_fdMz?#LF357hc>i@48X;@0IuYYz3Ue=mML! zMEGp<;WI?o;qhkU`ktF}!;gX8qERSZQI}p(lr6C_?airN_Zf^4+i%U-pvNJsQ^Uh#2E7v(^^EImWSA;PG6VRazTTUN%)t^)U zWv4E)Aj4EW#&2IgG#WC4?eVA=?vP}Fn1b8?0u28@u)Vow^_$!7tU3b_c)I$ztaD0e F0s#IdNCE%= literal 0 HcmV?d00001 diff --git a/core/assets/icons/icon_16.png b/core/assets/icons/icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..600c9e37ed7cab9e97a7dcbdcdc3fb1ee6b7c961 GIT binary patch literal 612 zcmV-q0-ODbP)EX>4Tx04R}tkv&MmKpe$iQ>7{u2Rle{$WWauh>AK&6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UwP&La) z#baVNw<-o+(Tgxb2w+BHrk+SIX5cx#?&0I>U6f~epZjz4D|wRvK9P8i>4rtTK|H-_ z>74h8L#!kz#OK6g23?T&k?XR{Z=8z`3p_JqWK#3QA!4!E!Ey()lA#h$5l0kNqkJLj zvch?bvs$UK);;+PgL!Qw&2^f?h+_!}Bq2gZ4P{hdAxf)8iis5M$2|OD$DbsZOs+B* zITlcb3d!+<|H1EW&BEk_n-q)z-7mKNF#-g3fo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc zEph}5Yy%h9ZB5<-E_Z;TCtWfmNAlAY3I*W(jJ_!c4Bi5LYi@6?eVjf38R}~J1~@nb zMvIia?(y!P&ffk#)9UXBu9I@VFk}~Q00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{002BmL_t(I%VT6EX>4Tx04R}tkv&MmKpe$iQ>7{u2Rle{$WWauh>AK&6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UwP&La) z#baVNw<-o+(Tgxb2w+BHrk+SIX5cx#?&0I>U6f~epZjz4D|wRvK9P8i>4rtTK|H-_ z>74h8L#!kz#OK6g23?T&k?XR{Z=8z`3p_JqWK#3QA!4!E!Ey()lA#h$5l0kNqkJLj zvch?bvs$UK);;+PgL!Qw&2^f?h+_!}Bq2gZ4P{hdAxf)8iis5M$2|OD$DbsZOs+B* zITlcb3d!+<|H1EW&BEk_n-q)z-7mKNF#-g3fo9#dzmILZc>?&Kfh(=;uQq_$Ptxmc zEph}5Yy%h9ZB5<-E_Z;TCtWfmNAlAY3I*W(jJ_!c4Bi5LYi@6?eVjf38R}~J1~@nb zMvIia?(y!P&ffk#)9UXBu9I@VFk}~Q00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNlirueSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004AJL_t(o!|j#P3P2$ULtWhe|K;@*Tnr;a>Sex!#N^Ph z!OUn6tJ&icfB?Se!mkFBgLn0^KmY=O!bkuLquns6ShuqmAmg5#`;|5gFb4RuP!oPc zWUUDR4lVG)e-F(4N}C241N>R2i7mLa1qvep2%rO+7$iF-ZncpB0000 walls; diff --git a/core/src/com/trs/game/model/Monster.java b/core/src/com/trs/game/model/Monster.java index f9026bd..f7a684d 100644 --- a/core/src/com/trs/game/model/Monster.java +++ b/core/src/com/trs/game/model/Monster.java @@ -84,7 +84,7 @@ public class Monster { batch.begin(); font.getData().setScale(0.8f); font.setColor(Color.WHITE); - font.draw(batch, "Hunger",xPos - 22, yPos + 71); + font.draw(batch, "Saturation",xPos - 22, yPos + 71); font.getData().setScale(1f); font.setColor(Color.BLACK); batch.end(); diff --git a/core/src/com/trs/game/view/Screens/EndScreen.java b/core/src/com/trs/game/view/Screens/EndScreen.java index a8127d1..17693cc 100644 --- a/core/src/com/trs/game/view/Screens/EndScreen.java +++ b/core/src/com/trs/game/view/Screens/EndScreen.java @@ -15,6 +15,7 @@ public class EndScreen extends Screen { boolean lost; + public EndScreen(int GAME_WORLD_WIDTH, int GAME_WORLD_HEIGHT, boolean lost, float volume){ super(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT, 2, volume); this.lost = lost; @@ -54,6 +55,8 @@ public class EndScreen extends Screen { texts.add(new Text(1300, 150, "Ingame music by Jan125@opengameart.org", Color.BLACK, 1, 0,0)); texts.add(new Text(1300, 120, "Victory tune by Macto@opengameart.org", Color.BLACK, 1, 0,0)); texts.add(new Text(1300, 90, "Lose music by Jan125@opengameart.org", Color.BLACK, 1, 0,0)); + texts.add(new Text(1050, 60, "Game Developed by:", Color.BLACK, 1, 0,0)); + texts.add(new Text(1250, 25, "GammelJAN@GitLab JonathanHager@GitLab", Color.BLACK, 1.5, 0,0)); } @Override diff --git a/core/src/com/trs/game/view/Screens/GameScreen.java b/core/src/com/trs/game/view/Screens/GameScreen.java index 00c6267..660ea95 100644 --- a/core/src/com/trs/game/view/Screens/GameScreen.java +++ b/core/src/com/trs/game/view/Screens/GameScreen.java @@ -13,6 +13,9 @@ import com.trs.game.view.Text; public class GameScreen extends Screen { + float currentSeconds; + float tutorialDuration = 130; + public GameScreen(int GAME_WORLD_WIDTH, int GAME_WORLD_HEIGHT, float volume){ super(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT, 1, volume); music = Gdx.audio.newMusic(Gdx.files.internal("game.ogg")); @@ -23,11 +26,28 @@ public class GameScreen extends Screen { @Override public void timer() { - + currentSeconds++; } @Override public void render(SpriteBatch batch, ShapeRenderer renderer, BitmapFont font) { + + float Value = 1f-((tutorialDuration-currentSeconds) / ((float)tutorialDuration)); + Color color = new Color(Value,Value,Value,1); + batch.begin(); + font.setColor(color); + System.out.println(Value); + if(Value <= 1){ + if(texts.size() > 0){ + texts.remove(texts.size()-1); + texts.remove(texts.size()-1); + } + texts.add(new Text((int)(0.5f*1600f), (int)(0.7f*900f),"Don't let the Monster eat the people!", color,2.5,0,0)); + texts.add(new Text((int)(0.5f*1600f), (int)(0.6f*900f),"Drag to create a wall!", color,1.5,0,0)); + } + font.setColor(Color.BLACK); + batch.end(); + for(Button button : buttons){ button.render(batch,renderer,font); } diff --git a/desktop/src/com/trs/game/desktop/DesktopLauncher.java b/desktop/src/com/trs/game/desktop/DesktopLauncher.java index fda0a71..31b51bd 100644 --- a/desktop/src/com/trs/game/desktop/DesktopLauncher.java +++ b/desktop/src/com/trs/game/desktop/DesktopLauncher.java @@ -1,5 +1,6 @@ package com.trs.game.desktop; +import com.badlogic.gdx.Files; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.trs.game.Controller; @@ -11,6 +12,10 @@ public class DesktopLauncher { config.height = 900; config.samples = 8; config.resizable = false; + config.addIcon("icons/icon_128.png", Files.FileType.Internal); + config.addIcon("icons/icon_32.png", Files.FileType.Internal); + config.addIcon("icons/icon_16.png", Files.FileType.Internal); + config.title = "StarveTheMonster"; new LwjglApplication(new Controller(), config); } }