diff options
| -rw-r--r-- | assets/sprites/gui/friends.atlas | 50 | ||||
| -rw-r--r-- | assets/sprites/gui/friends.png | bin | 55360 -> 231189 bytes | |||
| -rw-r--r-- | assets/sprites/gui/friends.skin | 11 | ||||
| -rw-r--r-- | core/src/kz/ilotterytea/maxon/MaxonConstants.java | 34 | ||||
| -rw-r--r-- | core/src/kz/ilotterytea/maxon/screens/SplashScreen.java | 5 |
5 files changed, 70 insertions, 30 deletions
diff --git a/assets/sprites/gui/friends.atlas b/assets/sprites/gui/friends.atlas index ab8c9ea..09bead0 100644 --- a/assets/sprites/gui/friends.atlas +++ b/assets/sprites/gui/friends.atlas @@ -1,15 +1,45 @@ friends.png -size:256,128 +size:512,256 repeat:none -enotegg -bounds:128,64,64,64 -greddyss -bounds:0,0,64,64 -gvardovskiy +4elovekkun +bounds:192,128,64,64 +Art5507 +bounds:256,192,64,64 +GigovichGig +bounds:256,0,64,64 +GreDDySS +bounds:192,64,64,64 +Gvardovskiy +bounds:64,128,64,64 +IIReZortII +bounds:128,0,64,64 +NameIsNamesake +bounds:128,192,64,64 +drt_s_s +bounds:0,64,64,64 +enotEGG_ +bounds:192,0,64,64 +felugoz +bounds:64,192,64,64 +iQweep bounds:64,64,64,64 ilotterytea -bounds:0,64,64,64 -namesake +bounds:0,192,64,64 +m4x0nn +bounds:0,128,64,64 +neizyum +bounds:128,128,64,64 +rbch20 +bounds:0,0,64,64 +rey_ron_ro +bounds:128,64,64,64 +saopin_ bounds:64,0,64,64 -saopin -bounds:128,0,64,64 +shvedoff__ +bounds:256,128,64,64 +usatiy_ +bounds:320,192,64,64 +vexenigmus +bounds:192,192,64,64 +wanderning_ +bounds:256,64,64,64 diff --git a/assets/sprites/gui/friends.png b/assets/sprites/gui/friends.png Binary files differindex c2d5140..78c7c23 100644 --- a/assets/sprites/gui/friends.png +++ b/assets/sprites/gui/friends.png diff --git a/assets/sprites/gui/friends.skin b/assets/sprites/gui/friends.skin index e13611d..9e26dfe 100644 --- a/assets/sprites/gui/friends.skin +++ b/assets/sprites/gui/friends.skin @@ -1,10 +1 @@ -{ - com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: { - ilotterytea: { up: ilotterytea }, - greddyss: { up: greddyss }, - enotegg: { up: enotegg }, - namesake: { up: namesake }, - saopin: { up: saopin }, - gvardovskiy: { up: gvardovskiy } - } -}
\ No newline at end of file +{}
\ No newline at end of file diff --git a/core/src/kz/ilotterytea/maxon/MaxonConstants.java b/core/src/kz/ilotterytea/maxon/MaxonConstants.java index 92db69e..2d1edea 100644 --- a/core/src/kz/ilotterytea/maxon/MaxonConstants.java +++ b/core/src/kz/ilotterytea/maxon/MaxonConstants.java @@ -5,9 +5,12 @@ import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; +import kz.ilotterytea.javaextra.tuples.Triple; import kz.ilotterytea.maxon.utils.OsUtils; import java.text.DecimalFormat; +import java.util.Arrays; +import java.util.List; public class MaxonConstants { public static final String GAME_NAME = "Maxon Petting Simulator"; @@ -17,14 +20,29 @@ public class MaxonConstants { public static final String GAME_VERSION = "1.0.0"; public static final String GAME_MAIN_DEVELOPER = "ilotterytea"; - public static final String[][] GAME_DEVELOPERS = { - {"ilotterytea", "https://ilotterytea.kz"}, - {"greddyss", "https://twitch.tv/greddyss"}, - {"enotegg", "https://twitch.tv/enotegg"}, - {"namesake", "https://twitter.com/nameisnamesake"}, - {"saopin", "https://twitch.tv/saopin_"}, - {"gvardovskiy", "https://twitch.tv/gvardovskiy"} - }; + public static final List<Triple<String, String, Integer>> GAME_DEVELOPERS = Arrays.asList( + new Triple<>("m4x0nn", "https://twitch.tv/m4x0nn", 0), + new Triple<>("ilotterytea", "https://ilotterytea.kz", 1), + new Triple<>("GreDDySS", "https://twitch.tv/greddyss", 2), + new Triple<>("enotEGG_", "https://twitch.tv/enotegg_", 2), + new Triple<>("NameIsNamesake", "https://twitter.com/nameisnamesake", 3), + new Triple<>("saopin_", "https://twitch.tv/saopin_", 3), + new Triple<>("Gvardovskiy", "https://twitch.tv/gvardovskiy", 4), + new Triple<>("4elovekkun", "https://twitch.tv/4elovekkun", 5), + new Triple<>("Art5507", "https://twitch.tv/art5507", 5), + new Triple<>("GigovichGig", "https://twitch.tv/gigovichgig", 5), + new Triple<>("IIReZortII", "https://twitch.tv/iirezortii", 5), + new Triple<>("drt_s_s", "https://twitch.tv/drt_s_s", 5), + new Triple<>("felugoz", "https://twitch.tv/felugoz", 5), + new Triple<>("iQweep", "https://twitch.tv/iqweep", 6), + new Triple<>("neizyum", "https://twitch.tv/neizyum", 5), + new Triple<>("rbch20", "https://twitch.tv/rbch20", 5), + new Triple<>("rey_ron_ro", "https://twitch.tv/rey_ron_ro", 5), + new Triple<>("shvedoff__", "https://twitch.tv/shvedoff__", 5), + new Triple<>("usatiy_", "https://twitch.tv/usatiy_", 5), + new Triple<>("vexenigmus", "https://twitch.tv/vexenigmus", 5), + new Triple<>("wanderning_", "https://twitch.tv/wanderning_", 5) + ); public static final String GAME_MAIN_FOLDER = OsUtils.getUserDataDirectory(GAME_MAIN_DEVELOPER + "/" + GAME_APP_ID); public static final String GAME_SCREENSHOT_FOLDER = GAME_MAIN_FOLDER + "/screenshots"; diff --git a/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java b/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java index 7b7fd02..c036f78 100644 --- a/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java +++ b/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java @@ -10,6 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.*; import com.badlogic.gdx.scenes.scene2d.utils.Drawable; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.viewport.*; +import kz.ilotterytea.javaextra.tuples.Triple; import kz.ilotterytea.maxon.MaxonConstants; import kz.ilotterytea.maxon.assets.AssetUtils; import kz.ilotterytea.maxon.MaxonGame; @@ -68,8 +69,8 @@ public class SplashScreen implements Screen { ArrayList<Drawable> contributors = new ArrayList<>(); contributorSkin = new Skin(Gdx.files.internal("sprites/gui/friends.skin")); - for (int i = 0; i < MaxonConstants.GAME_DEVELOPERS.length; i++) { - String name = MaxonConstants.GAME_DEVELOPERS[i][0]; + for (Triple<String, String, Integer> contributor : MaxonConstants.GAME_DEVELOPERS) { + String name = contributor.getFirst(); Drawable icon = contributorSkin.getDrawable(name); contributors.add(icon); } |
