diff --git a/.vscode/settings.json b/.vscode/settings.json index 9cc64d4..e112a70 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,7 @@ { - "java.configuration.updateBuildConfiguration": "interactive" - "cSpell.words": [ - "pokemudry", - "Spritesheet" - ], - "java.configuration.updateBuildConfiguration": "disabled" -} \ No newline at end of file + "java.project.sourcePaths": ["src"], + "java.project.outputPath": "bin", + "java.project.referencedLibraries": [ + "lib/**/*.jar" + ] +} diff --git a/README.md b/README.md new file mode 100644 index 0000000..7c03a53 --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +## Getting Started + +Welcome to the VS Code Java world. Here is a guideline to help you get started to write Java code in Visual Studio Code. + +## Folder Structure + +The workspace contains two folders by default, where: + +- `src`: the folder to maintain sources +- `lib`: the folder to maintain dependencies + +Meanwhile, the compiled output files will be generated in the `bin` folder by default. + +> If you want to customize the folder structure, open `.vscode/settings.json` and update the related settings there. + +## Dependency Management + +The `JAVA PROJECTS` view allows you to manage your dependencies. More details can be found [here](https://github.com/microsoft/vscode-java-dependency#manage-dependencies). diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index c4019a9..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Java application project to get you started. - * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle - * User Manual available at https://docs.gradle.org/7.3/userguide/building_java_projects.html - */ - -plugins { - // Apply the application plugin to add support for building a CLI application in Java. - id 'application' -} - -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() -} - -dependencies { - // Use JUnit Jupiter for testing. - testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' - - // This dependency is used by the application. - implementation 'com.google.guava:guava:30.1.1-jre' - - implementation 'ch.hevs.gdx2d:gdx2d-desktop:1.2.1' - implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.5.6' - implementation 'com.badlogicgames.gdx:gdx-platform:1.5.6' - implementation 'com.badlogicgames.gdx:gdx-box2d-platform:1.5.6' - implementation 'com.badlogicgames.gdx:gdx-freetype-platform:1.5.6' -} - -application { - // Define the main class for the application. - mainClass = 'PokeMudry' -} -/* -tasks.named('test') { - // Use JUnit Platform for unit tests. - useJUnitPlatform() -} -*/ diff --git a/bin/Entity/Character.class b/bin/Entity/Character.class new file mode 100644 index 0000000..02b1e72 Binary files /dev/null and b/bin/Entity/Character.class differ diff --git a/bin/Entity/Enemy.class b/bin/Entity/Enemy.class new file mode 100644 index 0000000..68f86ae Binary files /dev/null and b/bin/Entity/Enemy.class differ diff --git a/bin/Entity/Entity.class b/bin/Entity/Entity.class new file mode 100644 index 0000000..b7a8f9e Binary files /dev/null and b/bin/Entity/Entity.class differ diff --git a/bin/Entity/Player.class b/bin/Entity/Player.class new file mode 100644 index 0000000..0408b7a Binary files /dev/null and b/bin/Entity/Player.class differ diff --git a/bin/Entity/Stuff.class b/bin/Entity/Stuff.class new file mode 100644 index 0000000..5b389fe Binary files /dev/null and b/bin/Entity/Stuff.class differ diff --git a/bin/PokeMudry.class b/bin/PokeMudry.class new file mode 100644 index 0000000..4e0a6c6 Binary files /dev/null and b/bin/PokeMudry.class differ diff --git a/bin/Screen/Hero$Direction.class b/bin/Screen/Hero$Direction.class new file mode 100644 index 0000000..4bbc909 Binary files /dev/null and b/bin/Screen/Hero$Direction.class differ diff --git a/bin/Screen/Hero.class b/bin/Screen/Hero.class new file mode 100644 index 0000000..d40d1c9 Binary files /dev/null and b/bin/Screen/Hero.class differ diff --git a/bin/Screen/ScreenBattle.class b/bin/Screen/ScreenBattle.class new file mode 100644 index 0000000..04a2c2c Binary files /dev/null and b/bin/Screen/ScreenBattle.class differ diff --git a/bin/Screen/ScreenMap$Door.class b/bin/Screen/ScreenMap$Door.class new file mode 100644 index 0000000..86696ed Binary files /dev/null and b/bin/Screen/ScreenMap$Door.class differ diff --git a/bin/Screen/ScreenMap.class b/bin/Screen/ScreenMap.class new file mode 100644 index 0000000..61fb66b Binary files /dev/null and b/bin/Screen/ScreenMap.class differ diff --git a/bin/Screen/ScreenPlayer.class b/bin/Screen/ScreenPlayer.class new file mode 100644 index 0000000..6b981b7 Binary files /dev/null and b/bin/Screen/ScreenPlayer.class differ diff --git a/bin/testHER.class b/bin/testHER.class new file mode 100644 index 0000000..e6c891d Binary files /dev/null and b/bin/testHER.class differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7454180..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e750102..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100644 index 1b6c787..0000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/lib/gdx2d-desktop-1.2.2-sources.jar b/lib/gdx2d-desktop-1.2.2-sources.jar new file mode 100644 index 0000000..69e9535 Binary files /dev/null and b/lib/gdx2d-desktop-1.2.2-sources.jar differ diff --git a/lib/gdx2d-desktop-1.2.2.jar b/lib/gdx2d-desktop-1.2.2.jar new file mode 100644 index 0000000..68fd6e2 Binary files /dev/null and b/lib/gdx2d-desktop-1.2.2.jar differ diff --git a/resources/icon/pokeMudry.ico b/resources/icon/pokeMudry.ico new file mode 100644 index 0000000..940aae5 Binary files /dev/null and b/resources/icon/pokeMudry.ico differ diff --git a/resources/icon/pokeMudry.png b/resources/icon/pokeMudry.png new file mode 100644 index 0000000..17dc75f Binary files /dev/null and b/resources/icon/pokeMudry.png differ diff --git a/resources/icon/pokeMudry.xcf b/resources/icon/pokeMudry.xcf new file mode 100644 index 0000000..d5fa83f Binary files /dev/null and b/resources/icon/pokeMudry.xcf differ diff --git a/app/src/main/resources/lumberjack_sheet32.png b/resources/lumberjack_sheet32.png similarity index 100% rename from app/src/main/resources/lumberjack_sheet32.png rename to resources/lumberjack_sheet32.png diff --git a/resources/map/Maps.tiled-project b/resources/map/Maps.tiled-project new file mode 100644 index 0000000..cc94a63 --- /dev/null +++ b/resources/map/Maps.tiled-project @@ -0,0 +1,56 @@ +{ + "automappingRulesFile": "", + "commands": [ + ], + "extensionsPath": ".", + "folders": [ + "." + ], + "objectTypesFile": "", + "propertyTypes": [ + { + "id": 4, + "members": [ + { + "name": "door", + "type": "bool", + "value": false + }, + { + "name": "speed", + "type": "float", + "value": 1 + }, + { + "name": "walkable", + "type": "bool", + "value": false + } + ], + "name": "moves", + "type": "class" + }, + { + "id": 5, + "members": [ + { + "name": "name", + "type": "string", + "value": "" + }, + { + "name": "x", + "type": "int", + "value": 0 + }, + { + "name": "y", + "type": "int", + "value": 0 + } + ], + "name": "nextMap", + "type": "class" + } + ] +} diff --git a/resources/map/Maps.tiled-session b/resources/map/Maps.tiled-session new file mode 100644 index 0000000..69b88ad --- /dev/null +++ b/resources/map/Maps.tiled-session @@ -0,0 +1,318 @@ +{ + "Map/SizeTest": { + "height": 4300, + "width": 2 + }, + "activeFile": "test_couloir.tmx", + "expandedProjectPaths": [ + "." + ], + "file.lastUsedOpenFilter": "Fichiers de jeu de tuiles Tiled (*.tsx *.xml)", + "fileStates": { + "": { + "scaleInDock": 1 + }, + "C:/Users/remi/AppData/Roaming/Tiled/#Tests": { + "dynamicWrapping": true + }, + "C:/Users/remi/Desktop/16x16 dungeon ii wall reconfig v04 spritesheet.tsx": { + "scaleInDock": 2, + "scaleInEditor": 3 + }, + "C:/Users/remi/Desktop/Tests.tsx": { + "dynamicWrapping": false, + "scaleInDock": 1, + "scaleInEditor": 0.33 + }, + "C:/Users/remi/Desktop/desert.tmx": { + "scale": 0.56109375, + "selectedLayer": 1, + "viewCenter": { + "x": 640.7128933444724, + "y": 640.7128933444724 + } + }, + "C:/Users/remi/Desktop/desert.tmx#Desert": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/Desktop/dungeon.tmx": { + "scale": 3, + "selectedLayer": 0, + "viewCenter": { + "x": -77.16666666666667, + "y": -39.5 + } + }, + "C:/Users/remi/Desktop/pokemon.tsx": { + "scaleInDock": 2, + "scaleInEditor": 2 + }, + "C:/Users/remi/Desktop/pokemon_rbgy__gen_1__complete_tileset_for_rmxp_by_cynthiacelestic_d97m9jw-pre.tsx": { + "scaleInDock": 1, + "scaleInEditor": 4 + }, + "C:/Users/remi/Desktop/test.tmx": { + "scale": 0.75, + "selectedLayer": 0, + "viewCenter": { + "x": 253.3333333333333, + "y": 234 + } + }, + "C:/Users/remi/Desktop/test.tmx#test": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/Desktop/test.tsx": { + "scaleInDock": 2 + }, + "C:/Users/remi/Desktop/tmw_desert_spacing.tsx": { + "scaleInDock": 1, + "scaleInEditor": 3 + }, + "C:/Users/remi/Downloads/desert.tsx": { + "scaleInDock": 1, + "scaleInEditor": 2 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/32x32 first tileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/Dungeon_Tileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/InteriorTileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1.5 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/OuterTileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/RPG Nature Tileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/TileSet_V2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/Tiny Platform Quest Tiles.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1.5 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/pokemon.tsx": { + "scaleInDock": 1, + "scaleInEditor": 3 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/sRandomWorldItems.tsx": { + "scaleInDock": 1, + "scaleInEditor": 3 + }, + "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/transparent-bg-tiles.tsx": { + "scaleInDock": 1, + "scaleInEditor": 5.5 + }, + "assets/32x32 first tileset.tsx": { + "dynamicWrapping": false, + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/Dungeon.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/Dungeon_Tileset.tsx": { + "dynamicWrapping": false, + "scaleInDock": 1.5, + "scaleInEditor": 1 + }, + "assets/Dungeon_v2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/HKU tileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/InteriorTileset.tsx": { + "dynamicWrapping": false, + "scaleInDock": 1, + "scaleInEditor": 2 + }, + "assets/Interior_v2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/OuterTileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/PokeMudry.tsx": { + "dynamicWrapping": true, + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/RPG Nature Tileset.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/Slates v.2 [32x32px orthogonal tileset by Ivan Voirol].tsx": { + "dynamicWrapping": false, + "scaleInDock": 2, + "scaleInEditor": 2 + }, + "assets/Slates_v2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/TileSet_V2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/Tiny Platform Quest Tiles.tsx": { + "dynamicWrapping": false, + "scaleInDock": 1, + "scaleInEditor": 1.5 + }, + "assets/pokemon.tsx": { + "dynamicWrapping": false, + "scaleInDock": 2, + "scaleInEditor": 1.5 + }, + "assets/pokemon_v2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "assets/tpq_v2.tsx": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "desert.tmx": { + "expandedObjectLayers": [ + 3 + ], + "scale": 0.75, + "selectedLayer": 1, + "viewCenter": { + "x": 117.33333333333331, + "y": 452 + } + }, + "desert.tmx#Desert": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test.tmx": { + "expandedObjectLayers": [ + 2 + ], + "scale": 1.5, + "selectedLayer": 1, + "viewCenter": { + "x": 119.33333333333331, + "y": 119.33333333333333 + } + }, + "test.tmx#test": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx": { + "expandedObjectLayers": [ + 9 + ], + "scale": 1, + "selectedLayer": 4, + "viewCenter": { + "x": 115, + "y": 74 + } + }, + "test_couloir.tmx#Dungeon_Tileset": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#Dungeon_v2": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#InteriorTileset": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#Interior_v2": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#Slates v.2": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#Slates_v2": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#TPQT": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#pokemon": { + "scaleInDock": 2, + "scaleInEditor": 1 + }, + "test_couloir.tmx#pokemon_v2": { + "scaleInDock": 1, + "scaleInEditor": 1 + }, + "test_couloir.tmx#tpq_v2": { + "scaleInDock": 1 + } + }, + "last.exportedFilePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/vscode/tests_gdx2d_gradle/app/src/main/java/test_map/data", + "last.externalTilesetPath": "C:/Users/remi/Desktop", + "last.imagePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map/assets", + "last.objectTypesPath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map/propertytypes.json", + "last.worldFilePath": "C:/Users/remi/OneDrive/Documents/Cours/05-HEVS/S2fb/informatic/projet/map", + "lastUsedTilesetExportFilter": "Tous les Fichiers (*)", + "loadedWorlds": [ + ], + "map.fixedSize": true, + "map.height": 10, + "map.lastUsedExportFilter": "Fichiers de carte Tiled (*.tmx *.xml)", + "map.lastUsedFormat": "tmx", + "map.tileHeight": 32, + "map.tileWidth": 32, + "map.width": 20, + "openFiles": [ + "test_couloir.tmx", + "test.tmx", + "desert.tmx" + ], + "project": "Maps.tiled-project", + "property.type": "string", + "recentFiles": [ + "desert.tmx", + "test.tmx", + "test_couloir.tmx", + "assets/Dungeon_v2.tsx", + "assets/Interior_v2.tsx", + "assets/pokemon_v2.tsx", + "assets/Slates_v2.tsx", + "assets/TileSet_V2.tsx", + "assets/tpq_v2.tsx", + "assets/Dungeon.tsx", + "assets/pokemon.tsx", + "assets/Tiny Platform Quest Tiles.tsx" + ], + "tileset.lastUsedFormat": "tsx", + "tileset.margin": 0, + "tileset.spacing": 0, + "tileset.tileSize": { + "height": 32, + "width": 32 + }, + "tileset.type": 0 +} diff --git a/app/src/main/resources/map/assets/Dungeon.png b/resources/map/assets/Dungeon.png similarity index 100% rename from app/src/main/resources/map/assets/Dungeon.png rename to resources/map/assets/Dungeon.png diff --git a/resources/map/assets/Dungeon.tsx b/resources/map/assets/Dungeon.tsx new file mode 100644 index 0000000..cfc9be4 --- /dev/null +++ b/resources/map/assets/Dungeon.tsx @@ -0,0 +1,2244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/map/assets/Dungeon_v2.png b/resources/map/assets/Dungeon_v2.png similarity index 100% rename from app/src/main/resources/map/assets/Dungeon_v2.png rename to resources/map/assets/Dungeon_v2.png diff --git a/resources/map/assets/Dungeon_v2.tsx b/resources/map/assets/Dungeon_v2.tsx new file mode 100644 index 0000000..6fe7894 --- /dev/null +++ b/resources/map/assets/Dungeon_v2.tsx @@ -0,0 +1,1372 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/map/assets/Interior.png b/resources/map/assets/Interior.png similarity index 100% rename from app/src/main/resources/map/assets/Interior.png rename to resources/map/assets/Interior.png diff --git a/resources/map/assets/Interior.tsx b/resources/map/assets/Interior.tsx new file mode 100644 index 0000000..1ac82a1 --- /dev/null +++ b/resources/map/assets/Interior.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/map/assets/Interior_v2.png b/resources/map/assets/Interior_v2.png similarity index 100% rename from app/src/main/resources/map/assets/Interior_v2.png rename to resources/map/assets/Interior_v2.png diff --git a/resources/map/assets/Interior_v2.tsx b/resources/map/assets/Interior_v2.tsx new file mode 100644 index 0000000..3fa48f7 --- /dev/null +++ b/resources/map/assets/Interior_v2.tsx @@ -0,0 +1,292 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/assets/Nature.tsx b/resources/map/assets/Nature.tsx new file mode 100644 index 0000000..7d2974a --- /dev/null +++ b/resources/map/assets/Nature.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/resources/map/assets/Outer.tsx b/resources/map/assets/Outer.tsx new file mode 100644 index 0000000..d50a596 --- /dev/null +++ b/resources/map/assets/Outer.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/resources/map/assets/PokeMudry.tsx b/resources/map/assets/PokeMudry.tsx new file mode 100644 index 0000000..431d513 --- /dev/null +++ b/resources/map/assets/PokeMudry.tsx @@ -0,0 +1,963 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/map/assets/Slates.png b/resources/map/assets/Slates.png similarity index 100% rename from app/src/main/resources/map/assets/Slates.png rename to resources/map/assets/Slates.png diff --git a/resources/map/assets/Slates.tsx b/resources/map/assets/Slates.tsx new file mode 100644 index 0000000..a6175a3 --- /dev/null +++ b/resources/map/assets/Slates.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/map/assets/Slates_v2.png b/resources/map/assets/Slates_v2.png similarity index 100% rename from app/src/main/resources/map/assets/Slates_v2.png rename to resources/map/assets/Slates_v2.png diff --git a/resources/map/assets/Slates_v2.tsx b/resources/map/assets/Slates_v2.tsx new file mode 100644 index 0000000..36aa55b --- /dev/null +++ b/resources/map/assets/Slates_v2.tsx @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/assets/TileSet_V2.tsx b/resources/map/assets/TileSet_V2.tsx new file mode 100644 index 0000000..bd90bef --- /dev/null +++ b/resources/map/assets/TileSet_V2.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/map/assets/desert.png b/resources/map/assets/desert.png similarity index 100% rename from app/src/main/resources/map/assets/desert.png rename to resources/map/assets/desert.png diff --git a/resources/map/assets/firstTileset.tsx b/resources/map/assets/firstTileset.tsx new file mode 100644 index 0000000..3e2c393 --- /dev/null +++ b/resources/map/assets/firstTileset.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/map/assets/pokemon.png b/resources/map/assets/pokemon.png similarity index 100% rename from app/src/main/resources/map/assets/pokemon.png rename to resources/map/assets/pokemon.png diff --git a/resources/map/assets/pokemon.tsx b/resources/map/assets/pokemon.tsx new file mode 100644 index 0000000..1be817f --- /dev/null +++ b/resources/map/assets/pokemon.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/map/assets/pokemon_v2.png b/resources/map/assets/pokemon_v2.png similarity index 100% rename from app/src/main/resources/map/assets/pokemon_v2.png rename to resources/map/assets/pokemon_v2.png diff --git a/resources/map/assets/pokemon_v2.tsx b/resources/map/assets/pokemon_v2.tsx new file mode 100644 index 0000000..b807936 --- /dev/null +++ b/resources/map/assets/pokemon_v2.tsx @@ -0,0 +1,5920 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/map/assets/test.png b/resources/map/assets/test.png similarity index 100% rename from app/src/main/resources/map/assets/test.png rename to resources/map/assets/test.png diff --git a/resources/map/assets/test.tsx b/resources/map/assets/test.tsx new file mode 100644 index 0000000..7f1a5c4 --- /dev/null +++ b/resources/map/assets/test.tsx @@ -0,0 +1,1804 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/map/assets/tpq.png b/resources/map/assets/tpq.png similarity index 100% rename from app/src/main/resources/map/assets/tpq.png rename to resources/map/assets/tpq.png diff --git a/resources/map/assets/tpq.tsx b/resources/map/assets/tpq.tsx new file mode 100644 index 0000000..c3d2f94 --- /dev/null +++ b/resources/map/assets/tpq.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/map/assets/tpq_v2.png b/resources/map/assets/tpq_v2.png similarity index 100% rename from app/src/main/resources/map/assets/tpq_v2.png rename to resources/map/assets/tpq_v2.png diff --git a/resources/map/assets/tpq_v2.tsx b/resources/map/assets/tpq_v2.tsx new file mode 100644 index 0000000..177c264 --- /dev/null +++ b/resources/map/assets/tpq_v2.tsx @@ -0,0 +1,994 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/desert.tmx b/resources/map/desert.tmx new file mode 100644 index 0000000..f571265 --- /dev/null +++ b/resources/map/desert.tmx @@ -0,0 +1,485 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eJztmNtOwzAMQAPjPmADJG4To2OwCwzo/38drqgly8oS20nWPfThSGuXJie2m2SbOuemBbkGRsA4oY8T4LQQV63fZaTdmWCOXRKKb6rfEfCQyGOCX2z8UN8HwCEwIPdeA+1jftTlmMX+CXhWMAHOgQtgqHTa5jf23Md7M+BNwbyg3wq4Z/lDv3fgE/jo0M/HjIwriafET1KLGCdfrS8K+2ldG2rmxf027r/+v3eUX2QVuY7Fi9dlyE8aK+6A92j88HPMj8c1V/yW7Bp9tPErnV/uyVm3+ZPypfTz5ZyeH3AvCjEQtkNeAn6SGqTrHs41xFDYzvec5f2g694NcBvhTtjO91zMpQp856s9PA9MhHPNSbUlxtST7xddOIbe2Zx+lrNZrM8cfj+sL+n+IxkzZ/wkfs04ddt2l36/Bf1GRj9e1yXjh/t+yloj8aPnC40fn6M2t1I/7Tj0PIBnuo0xhha/2ti/pR5LxC/kp937LGczq1+TY3pG7nKfpvP3/d6du7zreJXo6MvD2tlysu/wWGn/N9oX756eHj9/jGawrg== + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/propertytypes.json b/resources/map/propertytypes.json new file mode 100644 index 0000000..9156c46 --- /dev/null +++ b/resources/map/propertytypes.json @@ -0,0 +1,46 @@ +[ + { + "id": 4, + "members": [ + { + "name": "door", + "type": "bool", + "value": false + }, + { + "name": "speed", + "type": "float", + "value": 1 + }, + { + "name": "walkable", + "type": "bool", + "value": false + } + ], + "name": "moves", + "type": "class" + }, + { + "id": 5, + "members": [ + { + "name": "name", + "type": "string", + "value": "" + }, + { + "name": "x", + "type": "int", + "value": 0 + }, + { + "name": "y", + "type": "int", + "value": 0 + } + ], + "name": "nextMap", + "type": "class" + } +] diff --git a/app/src/main/resources/map/test.tmx b/resources/map/test.tmx similarity index 65% rename from app/src/main/resources/map/test.tmx rename to resources/map/test.tmx index aaf2dfb..e6b6c8b 100644 --- a/app/src/main/resources/map/test.tmx +++ b/resources/map/test.tmx @@ -1,5 +1,5 @@ - + @@ -8,1801 +8,1801 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1812,12 +1812,28 @@ 121,63,64,64,64,64,65,249,249,249, 121,63,64,64,64,64,65,249,249,249, 121,63,64,64,64,64,65,249,249,249, -121,92,94,94,94,94,95,249,249,249, -121,127,123,124,124,124,125,249,249,249, -121,122,153,154,154,154,155,249,249,249, -121,122,183,184,184,184,185,249,249,249, +121,92,64,64,64,64,65,249,249,249, +121,127,63,64,64,64,65,249,249,249, 121,122,63,64,64,64,65,249,249,249, -121,122,93,94,94,94,95,249,249,249 +121,122,63,64,64,64,65,249,249,249, +121,122,63,64,72,64,65,249,249,249, +121,122,69,64,64,64,69,249,249,249 + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/map/test_couloir.tmx b/resources/map/test_couloir.tmx similarity index 98% rename from app/src/main/resources/map/test_couloir.tmx rename to resources/map/test_couloir.tmx index 1a13639..d86b1d1 100644 --- a/app/src/main/resources/map/test_couloir.tmx +++ b/resources/map/test_couloir.tmx @@ -1,5 +1,5 @@ - + @@ -4625,37 +4625,37 @@ - + - + - + - + - + - + @@ -4829,37 +4829,37 @@ - + - + - + - + - + - + @@ -5033,37 +5033,37 @@ - + - + - + - + - + - + @@ -5237,37 +5237,37 @@ - + - + - + - + - + - + @@ -5441,37 +5441,37 @@ - + - + - + - + - + - + @@ -5645,37 +5645,37 @@ - + - + - + - + - + - + @@ -5849,37 +5849,37 @@ - + - + - + - + - + - + @@ -6053,37 +6053,37 @@ - + - + - + - + - + - + @@ -6257,37 +6257,37 @@ - + - + - + - + - + - + @@ -6461,19 +6461,19 @@ - + - + - + @@ -6665,19 +6665,19 @@ - + - + - + @@ -6869,19 +6869,19 @@ - + - + - + @@ -8967,7 +8967,7 @@ - + 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, @@ -8981,7 +8981,7 @@ 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21 - + 956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956, 956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956, @@ -8990,38 +8990,26 @@ 1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113, 1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113, 1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113, -1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113, +1113,1113,1113,1113,1113,1113,1113,1113,909,1113,1113,909,1113,1113,1113,1113,1113,1113,1113,1113, 1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147, 921,921,921,921,921,921,921,921,921,921,921,921,921,921,921,921,921,921,921,921 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +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,17,2147483665,0,0,0,0,0,0,0,0,0,0,17,2147483665,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21, 40,40,40,8,9,40,40,40,40,40,40,40,40,40,40,8,9,40,40,40, @@ -9035,4 +9023,34 @@ 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/map/texture_splitter.py b/resources/map/texture_splitter.py new file mode 100644 index 0000000..8cb16fb --- /dev/null +++ b/resources/map/texture_splitter.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +import os +from PIL import Image +import numpy as np + +W, H = 32, 32 + +def split(path): + if not os.path.exists(path): + print(f"File '{path}' not found") + return + + dir_ = os.path.dirname(path) + base = os.path.basename(path) + base, ext = os.path.splitext(base) + + try: + img = Image.open(path) + + except: + print(f"Could not load '{path}'. Maybe its not an image") + return + + a = np.array(img) + w, h = a.shape[1]//W, a.shape[0]//H + n = 0 + + for y in range(h): + for x in range(w): + try: + i = Image.fromarray(a[y*H:y*H+H, x*W:x*W+W]) + i.save(os.path.join(dir_, f"{base}_{x+y*w}{ext}")) + + except: + print(f"Could not create texture {x+y*w}") + + else: + n += 1 + + img.close() + + print(f"Succesfully created {n} textures") + + if a.shape[1] % 32 or a.shape[0] % 32: + print(f"The texture's shape was not a multiple of 32x32 ({a.shape[1]}x{a.shape[0]}). Only fully visible tiles have been extracted.") + +if __name__ == "__main__": + path = input("Path to tileset texture: ") + + split(path) \ No newline at end of file diff --git a/resources/map/texture_splitter_v2.py b/resources/map/texture_splitter_v2.py new file mode 100644 index 0000000..837c55a --- /dev/null +++ b/resources/map/texture_splitter_v2.py @@ -0,0 +1,237 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +import os +from PIL import Image +import numpy as np +import pygame + +W, H = 32, 32 + +def pilToPygame(pilImage): + return pygame.image.fromstring( + pilImage.tobytes(), pilImage.size, pilImage.mode).convert() + +def rect(p1, p2): + x = min(p1[0], p2[0]) + y = min(p1[1], p2[1]) + w = max(p1[0], p2[0])-x + 1 + h = max(p1[1], p2[1])-y + 1 + + return x,y,w,h + +class Rect: + def __init__(self, ox1, oy1, ox2, oy2): + self.ox1, self.oy1 = min(ox1, ox2), min(oy1, oy2) + self.ox2, self.oy2 = max(ox1, ox2), max(oy1, oy2) + self.x, self.y, self.w, self.h = None, None, self.ox2-self.ox1+1, self.oy2-self.oy1+1 + self.hover = False + + def render(self, w, sx, sy, mouse, original=False): + self.hover = False + x, y = self.x, self.y + if original: + x, y = self.ox1, self.oy1 + + color = (255,200,200) + if x*W <= mouse[0] < x*W+self.w*W \ + and y*H <= mouse[1] < y*H+self.h*H: + color = (0,255,0) + self.hover = True + + pygame.draw.rect(w, color, [x*W-sx, y*H-sy, self.w*W, self.h*H], 1) + + @property + def area(self): + return self.w*self.h + +class Editor: + WIDTH = 600 + HEIGHT = 600 + SCROLL_SPEED = 10 + FPS = 30 + + def __init__(self, path): + self.running = False + + if not os.path.exists(path): + print(f"File '{path}' not found") + return + + self.path = path + self.dir_ = os.path.dirname(path) + self.base = os.path.basename(path) + self.base, self.ext = os.path.splitext(self.base) + + try: + img = Image.open(path) + + except: + print(f"Could not load '{path}'. Maybe its not an image") + return + + self.WIDTH = min(img.width, self.WIDTH) + self.HEIGHT = min(img.height, self.HEIGHT) + + pygame.init() + self.win = pygame.display.set_mode([self.WIDTH, self.HEIGHT], pygame.SRCALPHA) + self.over = pygame.Surface([self.WIDTH, self.HEIGHT], pygame.SRCALPHA) + self.clock = pygame.time.Clock() + + self.img = pilToPygame(img) + self.a = np.array(img) + self.w, self.h = self.a.shape[1]//W, self.a.shape[0]//H + self.w2, self.h2 = 0, 0 + + img.close() + + if self.a.shape[1] % 32 or self.a.shape[0] % 32: + print(f"The texture's shape is not a multiple of 32x32 ({self.a.shape[1]}x{self.a.shape[0]}).") + + self.running = True + self.rects = [] + self.sel = (False, None) + self.scroll_x, self.scroll_y = 0, 0 + + def mainloop(self): + while self.running: + self.handle_events() + self.render() + self.clock.tick(self.FPS) + + def render(self): + mouse = pygame.mouse.get_pos() + mouse = (mouse[0]+self.scroll_x, mouse[1]+self.scroll_y) + + self.win.fill(0) + self.over.fill((0,0,0,0)) + + self.win.blit(self.img, (-self.scroll_x, -self.scroll_y)) + + for r in self.rects: + r.render(self.win, self.scroll_x, self.scroll_y, mouse, True) + + pygame.draw.rect(self.over, (255,255,255,50), [self.mx*W-self.scroll_x, self.my*H-self.scroll_y, W, H]) + + if self.sel[0]: + x,y,w,h = rect(self.sel[1], (self.mx, self.my)) + pygame.draw.rect(self.over, (255,255,255), [x*W-self.scroll_x, y*H-self.scroll_y, w*W, h*H], 1) + + self.win.blit(self.over, (0, 0)) + + pygame.display.flip() + + def handle_events(self): + events = pygame.event.get() + mouse = pygame.mouse.get_pos() + self.mx, self.my = (mouse[0]+self.scroll_x)//W, (mouse[1]+self.scroll_y)//H + + for event in events: + if event.type == pygame.QUIT \ + or (event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE): + + self.running = False + + elif event.type == pygame.MOUSEBUTTONDOWN: + if event.button == 1: + if not self.sel[0]: + self.sel = (True, (self.mx, self.my)) + + elif event.button in [4, 5]: + speed = self.SCROLL_SPEED if event.button == 5 else -self.SCROLL_SPEED + if pygame.key.get_pressed()[pygame.K_LSHIFT]: + self.scroll_x += speed + self.scroll_x = min(self.a.shape[1]-self.WIDTH, self.scroll_x) + self.scroll_x = max(0, self.scroll_x) + else: + self.scroll_y += speed + self.scroll_y = min(self.a.shape[0]-self.HEIGHT, self.scroll_y) + self.scroll_y = max(0, self.scroll_y) + + elif event.button == 3: + self.rects = list(filter(lambda r: not r.hover, self.rects)) + + elif event.type == pygame.MOUSEBUTTONUP: + if event.button == 1: + if self.sel[0]: + self.rects.append(Rect(*self.sel[1], self.mx, self.my)) + self.sel = (False, None) + self.organize() + + elif event.type == pygame.KEYDOWN: + if event.key == pygame.K_s and event.mod & pygame.KMOD_CTRL: + self.save() + + def organize(self): + for rect in self.rects: + rect.x = None + rect.y = None + + self.rects = sorted(self.rects, key=lambda r: r.area, reverse=True) + + w, h = 0, 0 + a = np.zeros([h, w]) + + for r in self.rects: + placed = False + best = (None, None) + for y in range(h): + for x in range(w): + if a[y:y+r.h, x:x+r.w].any(): + continue + + d_area = max(x+r.w, w)*max(y+r.h, h)-w*h + + if d_area > 0: + if best[0] is None or d_area < best[0]: + best = (d_area, (x,y)) + + continue + + placed = True + best = (0, (x,y)) + break + + if placed: + break + + if best[0] is None: + if h+r.h > w+r.w: + p = (w, 0) + else: + p = (0, h) + + best = (r.w*r.h, p) + + if best[0] > 0: + a2 = np.zeros([max(h,best[1][1]+r.h), max(w,best[1][0]+r.w)]) + a2[:h, :w] = a + a = a2 + h, w = a.shape + + r.x, r.y = best[1] + a[r.y:r.y+r.h, r.x:r.x+r.w] = 1 + + self.w2, self.h2 = w, h + + def save(self): + img2 = np.zeros([self.h2*H, self.w2*W, *self.a.shape[2:]], dtype=self.a.dtype) + for r in self.rects: + img2[r.y*H:(r.y+r.h)*H, r.x*W:(r.x+r.w)*W] = \ + self.a[r.oy1*H:(r.oy1+r.h)*H, r.ox1*W:(r.ox1+r.w)*W] + + path = os.path.join(self.dir_, f"{self.base}_modified{self.ext}") + try: + img2 = Image.fromarray(img2) + img2.save(path) + + except: + print("Could not save modified texture") + + else: + print(f"Succesfully saved modified texture as {path}") + +if __name__ == "__main__": + path = input("Path to tileset texture: ") + + editor = Editor(path) + editor.mainloop() \ No newline at end of file diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/000-pocketmonsters2.jpg b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/000-pocketmonsters2.jpg new file mode 100644 index 0000000..49b2d02 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/000-pocketmonsters2.jpg differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/000-pocketmonsters3.jpg b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/000-pocketmonsters3.jpg new file mode 100644 index 0000000..3b12d04 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/000-pocketmonsters3.jpg differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/101-opening.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/101-opening.mp3 new file mode 100644 index 0000000..121d659 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/101-opening.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/102-palette town theme.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/102-palette town theme.mp3 new file mode 100644 index 0000000..b9ac259 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/102-palette town theme.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/103-professor oak.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/103-professor oak.mp3 new file mode 100644 index 0000000..a368ad0 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/103-professor oak.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/104-oak research lab.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/104-oak research lab.mp3 new file mode 100644 index 0000000..2f80204 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/104-oak research lab.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/105-rival appears.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/105-rival appears.mp3 new file mode 100644 index 0000000..33e670b Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/105-rival appears.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/106-the road to viridian city - from palette.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/106-the road to viridian city - from palette.mp3 new file mode 100644 index 0000000..38fa68e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/106-the road to viridian city - from palette.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/107-battle (vs wild pokemon).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/107-battle (vs wild pokemon).mp3 new file mode 100644 index 0000000..ab69359 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/107-battle (vs wild pokemon).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/108-victory (vs wild pokemon).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/108-victory (vs wild pokemon).mp3 new file mode 100644 index 0000000..9724a24 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/108-victory (vs wild pokemon).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/109-pewter city's theme.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/109-pewter city's theme.mp3 new file mode 100644 index 0000000..7630294 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/109-pewter city's theme.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/110-pokemon center.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/110-pokemon center.mp3 new file mode 100644 index 0000000..ef52032 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/110-pokemon center.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/111-pokemon recovery.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/111-pokemon recovery.mp3 new file mode 100644 index 0000000..8065119 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/111-pokemon recovery.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/112-viridian forest.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/112-viridian forest.mp3 new file mode 100644 index 0000000..805a803 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/112-viridian forest.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/113-guidepost.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/113-guidepost.mp3 new file mode 100644 index 0000000..0a4f8ab Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/113-guidepost.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/114-trainer appears (girl chapter).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/114-trainer appears (girl chapter).mp3 new file mode 100644 index 0000000..4200721 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/114-trainer appears (girl chapter).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/115-battle (vs trainer).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/115-battle (vs trainer).mp3 new file mode 100644 index 0000000..414ab70 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/115-battle (vs trainer).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/116-victory (vs trainer).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/116-victory (vs trainer).mp3 new file mode 100644 index 0000000..09bc097 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/116-victory (vs trainer).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/117-mt. moon cave.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/117-mt. moon cave.mp3 new file mode 100644 index 0000000..e4c4d08 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/117-mt. moon cave.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/118-the road to cerulean from mt. moon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/118-the road to cerulean from mt. moon.mp3 new file mode 100644 index 0000000..bbeb429 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/118-the road to cerulean from mt. moon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/119-cerulean city's theme.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/119-cerulean city's theme.mp3 new file mode 100644 index 0000000..8ab3b02 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/119-cerulean city's theme.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/120-pokemon gym.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/120-pokemon gym.mp3 new file mode 100644 index 0000000..1ab0d63 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/120-pokemon gym.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/121-to bill's origin - from cerulean.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/121-to bill's origin - from cerulean.mp3 new file mode 100644 index 0000000..66dff91 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/121-to bill's origin - from cerulean.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/122-jigglypuff's song.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/122-jigglypuff's song.mp3 new file mode 100644 index 0000000..14541ee Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/122-jigglypuff's song.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/123-vermillion city's theme.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/123-vermillion city's theme.mp3 new file mode 100644 index 0000000..b340d9d Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/123-vermillion city's theme.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/124-codename- st. anne.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/124-codename- st. anne.mp3 new file mode 100644 index 0000000..86cb821 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/124-codename- st. anne.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/125-the road to lavender town - from vermillion.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/125-the road to lavender town - from vermillion.mp3 new file mode 100644 index 0000000..c18544a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/125-the road to lavender town - from vermillion.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/126-pokemon whistle.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/126-pokemon whistle.mp3 new file mode 100644 index 0000000..7d7d1d1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/126-pokemon whistle.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/127-trainer appears (boy chapter).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/127-trainer appears (boy chapter).mp3 new file mode 100644 index 0000000..bde21a9 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/127-trainer appears (boy chapter).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/128-battle (vs gym leader).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/128-battle (vs gym leader).mp3 new file mode 100644 index 0000000..335c3af Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/128-battle (vs gym leader).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/129-victory (vs gym leader).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/129-victory (vs gym leader).mp3 new file mode 100644 index 0000000..e858e25 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/129-victory (vs gym leader).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/130-cycling.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/130-cycling.mp3 new file mode 100644 index 0000000..ac9c48e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/130-cycling.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/131-lavender town's theme.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/131-lavender town's theme.mp3 new file mode 100644 index 0000000..9ce294e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/131-lavender town's theme.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/132-pokemon tower.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/132-pokemon tower.mp3 new file mode 100644 index 0000000..b842d49 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/132-pokemon tower.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/133-celadon city.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/133-celadon city.mp3 new file mode 100644 index 0000000..ea64a44 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/133-celadon city.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/134-casino.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/134-casino.mp3 new file mode 100644 index 0000000..b11687f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/134-casino.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/135-trainer appears (bad guy chapter).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/135-trainer appears (bad guy chapter).mp3 new file mode 100644 index 0000000..c5e5abd Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/135-trainer appears (bad guy chapter).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/136-team rocket hideout.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/136-team rocket hideout.mp3 new file mode 100644 index 0000000..cbbddec Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/136-team rocket hideout.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/137-sylph company.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/137-sylph company.mp3 new file mode 100644 index 0000000..8921676 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/137-sylph company.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/138-ocean.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/138-ocean.mp3 new file mode 100644 index 0000000..196367a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/138-ocean.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/139-cinnabar islands' theme.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/139-cinnabar islands' theme.mp3 new file mode 100644 index 0000000..40468db Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/139-cinnabar islands' theme.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/140-pokemon mansion.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/140-pokemon mansion.mp3 new file mode 100644 index 0000000..718351a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/140-pokemon mansion.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/141-evolution.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/141-evolution.mp3 new file mode 100644 index 0000000..1bd3add Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/141-evolution.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/142-the final road.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/142-the final road.mp3 new file mode 100644 index 0000000..4db9487 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/142-the final road.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/143-last battle (vs rival).mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/143-last battle (vs rival).mp3 new file mode 100644 index 0000000..026b2db Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/143-last battle (vs rival).mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/144-into the palace.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/144-into the palace.mp3 new file mode 100644 index 0000000..94ce9ae Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/144-into the palace.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/145-ending.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/145-ending.mp3 new file mode 100644 index 0000000..da845e9 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/145-ending.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/146-bulbasaur.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/146-bulbasaur.mp3 new file mode 100644 index 0000000..91dd05c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/146-bulbasaur.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/147-ivysaur.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/147-ivysaur.mp3 new file mode 100644 index 0000000..c575e29 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/147-ivysaur.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/148-venusaur.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/148-venusaur.mp3 new file mode 100644 index 0000000..242192f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/148-venusaur.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/149-charmander.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/149-charmander.mp3 new file mode 100644 index 0000000..c6847bd Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/149-charmander.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/150-charmeleon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/150-charmeleon.mp3 new file mode 100644 index 0000000..60dd276 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/150-charmeleon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/151-charizard.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/151-charizard.mp3 new file mode 100644 index 0000000..d5ae835 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/151-charizard.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/152-squirtle.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/152-squirtle.mp3 new file mode 100644 index 0000000..b712768 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/152-squirtle.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/153-wartortle.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/153-wartortle.mp3 new file mode 100644 index 0000000..6891862 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/153-wartortle.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/154-blastoise.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/154-blastoise.mp3 new file mode 100644 index 0000000..42c0496 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/154-blastoise.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/155-caterpie.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/155-caterpie.mp3 new file mode 100644 index 0000000..eea312d Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/155-caterpie.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/156-metapod.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/156-metapod.mp3 new file mode 100644 index 0000000..f48d4fc Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/156-metapod.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/157-butterfree.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/157-butterfree.mp3 new file mode 100644 index 0000000..b547e54 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/157-butterfree.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/158-weedle.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/158-weedle.mp3 new file mode 100644 index 0000000..b1539ff Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/158-weedle.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/159-kakuna.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/159-kakuna.mp3 new file mode 100644 index 0000000..ca19d61 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/159-kakuna.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/160-beedrill.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/160-beedrill.mp3 new file mode 100644 index 0000000..63b62cf Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/160-beedrill.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/161-pidgey.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/161-pidgey.mp3 new file mode 100644 index 0000000..2a2b9f0 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/161-pidgey.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/162-pidgeotto.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/162-pidgeotto.mp3 new file mode 100644 index 0000000..fe5bbd0 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/162-pidgeotto.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/163-pidgeot.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/163-pidgeot.mp3 new file mode 100644 index 0000000..1963479 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/163-pidgeot.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/164-rattata.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/164-rattata.mp3 new file mode 100644 index 0000000..ac8e977 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/164-rattata.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/165-raticate.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/165-raticate.mp3 new file mode 100644 index 0000000..b1d91b0 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/165-raticate.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/166-spearow.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/166-spearow.mp3 new file mode 100644 index 0000000..b894e0e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/166-spearow.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/167-fearow.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/167-fearow.mp3 new file mode 100644 index 0000000..c14b35f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/167-fearow.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/168-ekans.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/168-ekans.mp3 new file mode 100644 index 0000000..e1c598b Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/168-ekans.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/169-arbok.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/169-arbok.mp3 new file mode 100644 index 0000000..b13def0 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/169-arbok.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/170-pikachu.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/170-pikachu.mp3 new file mode 100644 index 0000000..ceff21f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/170-pikachu.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/171-raichu.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/171-raichu.mp3 new file mode 100644 index 0000000..094d8be Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/171-raichu.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/172-sandshrew.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/172-sandshrew.mp3 new file mode 100644 index 0000000..4d885f1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/172-sandshrew.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/173-sandslash.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/173-sandslash.mp3 new file mode 100644 index 0000000..ad55147 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/173-sandslash.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/174-nidoran.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/174-nidoran.mp3 new file mode 100644 index 0000000..23a4412 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/174-nidoran.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/175-nidorina.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/175-nidorina.mp3 new file mode 100644 index 0000000..bd4c07f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/175-nidorina.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/176-nidoqueen.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/176-nidoqueen.mp3 new file mode 100644 index 0000000..226179c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/176-nidoqueen.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/177-nidoran.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/177-nidoran.mp3 new file mode 100644 index 0000000..ff4724b Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/177-nidoran.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/178-nidorino.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/178-nidorino.mp3 new file mode 100644 index 0000000..24833d1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/178-nidorino.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/179-nidoking.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/179-nidoking.mp3 new file mode 100644 index 0000000..62b2f7f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/179-nidoking.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/180-clefairy.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/180-clefairy.mp3 new file mode 100644 index 0000000..7bc21a7 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/180-clefairy.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/181-clefable.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/181-clefable.mp3 new file mode 100644 index 0000000..c2fa50f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/181-clefable.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/182-vulpix.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/182-vulpix.mp3 new file mode 100644 index 0000000..1a71e39 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/182-vulpix.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/183-ninetails.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/183-ninetails.mp3 new file mode 100644 index 0000000..d89e558 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/183-ninetails.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/184-jigglypuff.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/184-jigglypuff.mp3 new file mode 100644 index 0000000..4509339 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/184-jigglypuff.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/185-wigglypuff.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/185-wigglypuff.mp3 new file mode 100644 index 0000000..56a2a90 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/185-wigglypuff.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/186-zubat.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/186-zubat.mp3 new file mode 100644 index 0000000..ec47dbc Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/186-zubat.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/187-golbat.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/187-golbat.mp3 new file mode 100644 index 0000000..2995e03 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/187-golbat.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/188-oddish.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/188-oddish.mp3 new file mode 100644 index 0000000..d576ce7 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/188-oddish.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/189-gloom.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/189-gloom.mp3 new file mode 100644 index 0000000..f2a11c9 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/189-gloom.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/190-vileplume.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/190-vileplume.mp3 new file mode 100644 index 0000000..55e42f3 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/190-vileplume.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/191-paras.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/191-paras.mp3 new file mode 100644 index 0000000..cb97dd0 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/191-paras.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/192-parasect.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/192-parasect.mp3 new file mode 100644 index 0000000..cacccde Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/192-parasect.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/193-venonat.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/193-venonat.mp3 new file mode 100644 index 0000000..e70b52d Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/193-venonat.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/194-venomoth.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/194-venomoth.mp3 new file mode 100644 index 0000000..fe56b13 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/194-venomoth.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/195-diglett.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/195-diglett.mp3 new file mode 100644 index 0000000..e4aeeb2 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/195-diglett.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/196-dugtrio.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/196-dugtrio.mp3 new file mode 100644 index 0000000..9aa4c50 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/196-dugtrio.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/197-nyaasu.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/197-nyaasu.mp3 new file mode 100644 index 0000000..2d72441 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/197-nyaasu.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/198-persian.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/198-persian.mp3 new file mode 100644 index 0000000..c847ba1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/198-persian.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/201-psyduck.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/201-psyduck.mp3 new file mode 100644 index 0000000..8b86ff2 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/201-psyduck.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/202-golduck.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/202-golduck.mp3 new file mode 100644 index 0000000..c215c40 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/202-golduck.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/203-mankey.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/203-mankey.mp3 new file mode 100644 index 0000000..977423e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/203-mankey.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/204-primeape.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/204-primeape.mp3 new file mode 100644 index 0000000..9604192 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/204-primeape.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/205-growlithe.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/205-growlithe.mp3 new file mode 100644 index 0000000..0d51bf8 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/205-growlithe.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/206-arcanine.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/206-arcanine.mp3 new file mode 100644 index 0000000..7ee44f5 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/206-arcanine.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/207-poliwag.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/207-poliwag.mp3 new file mode 100644 index 0000000..0a40957 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/207-poliwag.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/208-poliwhirl.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/208-poliwhirl.mp3 new file mode 100644 index 0000000..15dc424 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/208-poliwhirl.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/209-poliwrath.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/209-poliwrath.mp3 new file mode 100644 index 0000000..5f76dbf Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/209-poliwrath.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/210-abra.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/210-abra.mp3 new file mode 100644 index 0000000..70e0434 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/210-abra.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/211-kadabra.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/211-kadabra.mp3 new file mode 100644 index 0000000..0791e93 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/211-kadabra.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/212-alakazam.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/212-alakazam.mp3 new file mode 100644 index 0000000..cb24d62 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/212-alakazam.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/213-machop.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/213-machop.mp3 new file mode 100644 index 0000000..98dfdae Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/213-machop.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/214-machoke.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/214-machoke.mp3 new file mode 100644 index 0000000..d08620c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/214-machoke.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/215-machamp.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/215-machamp.mp3 new file mode 100644 index 0000000..b9a5e6b Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/215-machamp.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/216-bellsprout.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/216-bellsprout.mp3 new file mode 100644 index 0000000..edc1703 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/216-bellsprout.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/217-weepinbell.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/217-weepinbell.mp3 new file mode 100644 index 0000000..6b18c11 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/217-weepinbell.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/218-victreebell.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/218-victreebell.mp3 new file mode 100644 index 0000000..0910126 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/218-victreebell.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/219-tentacool.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/219-tentacool.mp3 new file mode 100644 index 0000000..1f0046d Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/219-tentacool.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/220-tentacruel.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/220-tentacruel.mp3 new file mode 100644 index 0000000..68be521 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/220-tentacruel.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/221-geodude.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/221-geodude.mp3 new file mode 100644 index 0000000..da19943 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/221-geodude.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/222-graveler.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/222-graveler.mp3 new file mode 100644 index 0000000..5f1a404 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/222-graveler.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/223-golem.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/223-golem.mp3 new file mode 100644 index 0000000..0c23345 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/223-golem.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/224-ponyta.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/224-ponyta.mp3 new file mode 100644 index 0000000..dc09d42 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/224-ponyta.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/225-rapidash.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/225-rapidash.mp3 new file mode 100644 index 0000000..b61363c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/225-rapidash.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/226-slowpoke.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/226-slowpoke.mp3 new file mode 100644 index 0000000..87e771e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/226-slowpoke.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/227-slowbro.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/227-slowbro.mp3 new file mode 100644 index 0000000..0d3018d Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/227-slowbro.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/228-magnemite.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/228-magnemite.mp3 new file mode 100644 index 0000000..4259333 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/228-magnemite.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/229-magneton.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/229-magneton.mp3 new file mode 100644 index 0000000..03d22d8 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/229-magneton.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/230-farfetch'd.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/230-farfetch'd.mp3 new file mode 100644 index 0000000..9b7b21a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/230-farfetch'd.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/231-doduo.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/231-doduo.mp3 new file mode 100644 index 0000000..7cffe4d Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/231-doduo.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/232-dodrio.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/232-dodrio.mp3 new file mode 100644 index 0000000..c7ae6cc Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/232-dodrio.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/233-seel.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/233-seel.mp3 new file mode 100644 index 0000000..65b5f81 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/233-seel.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/234-dewgong.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/234-dewgong.mp3 new file mode 100644 index 0000000..83a394e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/234-dewgong.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/235-grimer.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/235-grimer.mp3 new file mode 100644 index 0000000..628ed83 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/235-grimer.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/236-muk.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/236-muk.mp3 new file mode 100644 index 0000000..61abb39 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/236-muk.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/237-shellder.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/237-shellder.mp3 new file mode 100644 index 0000000..3f97301 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/237-shellder.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/238-cloyster.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/238-cloyster.mp3 new file mode 100644 index 0000000..a59a275 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/238-cloyster.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/239-ghastly.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/239-ghastly.mp3 new file mode 100644 index 0000000..77c6a93 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/239-ghastly.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/240-haunter.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/240-haunter.mp3 new file mode 100644 index 0000000..83dbdff Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/240-haunter.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/241-gengar.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/241-gengar.mp3 new file mode 100644 index 0000000..c83d791 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/241-gengar.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/242-onix.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/242-onix.mp3 new file mode 100644 index 0000000..5457147 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/242-onix.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/243-drowzee.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/243-drowzee.mp3 new file mode 100644 index 0000000..0a49bcc Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/243-drowzee.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/244-hypno.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/244-hypno.mp3 new file mode 100644 index 0000000..ba4bdef Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/244-hypno.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/245-krabby.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/245-krabby.mp3 new file mode 100644 index 0000000..197c148 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/245-krabby.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/246-kingler.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/246-kingler.mp3 new file mode 100644 index 0000000..b4baea8 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/246-kingler.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/247-voltorb.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/247-voltorb.mp3 new file mode 100644 index 0000000..3262805 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/247-voltorb.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/248-electrode.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/248-electrode.mp3 new file mode 100644 index 0000000..999ba9a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/248-electrode.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/249-exeggcute.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/249-exeggcute.mp3 new file mode 100644 index 0000000..797e983 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/249-exeggcute.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/250-exeggutor.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/250-exeggutor.mp3 new file mode 100644 index 0000000..1fb7c14 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/250-exeggutor.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/251-cubone.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/251-cubone.mp3 new file mode 100644 index 0000000..b8e9028 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/251-cubone.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/252-marowak.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/252-marowak.mp3 new file mode 100644 index 0000000..2a7c809 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/252-marowak.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/253-hitmonlee.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/253-hitmonlee.mp3 new file mode 100644 index 0000000..74238c5 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/253-hitmonlee.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/254-hitmonchan.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/254-hitmonchan.mp3 new file mode 100644 index 0000000..60b344c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/254-hitmonchan.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/255-lickitung.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/255-lickitung.mp3 new file mode 100644 index 0000000..c6173d1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/255-lickitung.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/256-koffing.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/256-koffing.mp3 new file mode 100644 index 0000000..c388de3 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/256-koffing.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/257-weezing.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/257-weezing.mp3 new file mode 100644 index 0000000..1dad0e3 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/257-weezing.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/258-rhyhorn.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/258-rhyhorn.mp3 new file mode 100644 index 0000000..e091d95 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/258-rhyhorn.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/259-rhydon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/259-rhydon.mp3 new file mode 100644 index 0000000..85fdc6e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/259-rhydon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/260-chansey.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/260-chansey.mp3 new file mode 100644 index 0000000..3f85107 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/260-chansey.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/261-tangela.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/261-tangela.mp3 new file mode 100644 index 0000000..6e4efad Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/261-tangela.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/262-kangaskhan.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/262-kangaskhan.mp3 new file mode 100644 index 0000000..070569f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/262-kangaskhan.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/263-horsea.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/263-horsea.mp3 new file mode 100644 index 0000000..8f2a5e4 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/263-horsea.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/264-seadra.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/264-seadra.mp3 new file mode 100644 index 0000000..3a10ec1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/264-seadra.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/265-goldeen.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/265-goldeen.mp3 new file mode 100644 index 0000000..48b7640 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/265-goldeen.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/266-sea king.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/266-sea king.mp3 new file mode 100644 index 0000000..6dd9080 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/266-sea king.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/267-staryu.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/267-staryu.mp3 new file mode 100644 index 0000000..ffd0b15 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/267-staryu.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/268-starmie.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/268-starmie.mp3 new file mode 100644 index 0000000..9564342 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/268-starmie.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/269-mr. mime.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/269-mr. mime.mp3 new file mode 100644 index 0000000..9fd0561 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/269-mr. mime.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/270-scyther.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/270-scyther.mp3 new file mode 100644 index 0000000..ac75c9e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/270-scyther.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/271-jynx.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/271-jynx.mp3 new file mode 100644 index 0000000..678280a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/271-jynx.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/272-electabuzz.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/272-electabuzz.mp3 new file mode 100644 index 0000000..c0ccc46 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/272-electabuzz.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/273-magmar.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/273-magmar.mp3 new file mode 100644 index 0000000..c67c32a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/273-magmar.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/274-pinsir.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/274-pinsir.mp3 new file mode 100644 index 0000000..a19d756 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/274-pinsir.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/275-tauros.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/275-tauros.mp3 new file mode 100644 index 0000000..9fffe22 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/275-tauros.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/276-magikarp.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/276-magikarp.mp3 new file mode 100644 index 0000000..2f999e8 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/276-magikarp.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/277-gyarados.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/277-gyarados.mp3 new file mode 100644 index 0000000..e557efc Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/277-gyarados.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/278-lapras.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/278-lapras.mp3 new file mode 100644 index 0000000..af38e23 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/278-lapras.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/279-ditto.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/279-ditto.mp3 new file mode 100644 index 0000000..77d4194 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/279-ditto.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/280-eevee.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/280-eevee.mp3 new file mode 100644 index 0000000..936f1a1 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/280-eevee.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/281-vaporeaon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/281-vaporeaon.mp3 new file mode 100644 index 0000000..e89f6af Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/281-vaporeaon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/282-jolteon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/282-jolteon.mp3 new file mode 100644 index 0000000..d57d19b Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/282-jolteon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/283-flareon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/283-flareon.mp3 new file mode 100644 index 0000000..60a61c6 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/283-flareon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/284-porygon.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/284-porygon.mp3 new file mode 100644 index 0000000..6ebb064 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/284-porygon.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/285-omanyte.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/285-omanyte.mp3 new file mode 100644 index 0000000..82c163e Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/285-omanyte.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/286-omastar.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/286-omastar.mp3 new file mode 100644 index 0000000..740cfd7 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/286-omastar.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/287-kabuto.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/287-kabuto.mp3 new file mode 100644 index 0000000..a08d46c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/287-kabuto.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/288-kabutops.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/288-kabutops.mp3 new file mode 100644 index 0000000..cf2fd35 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/288-kabutops.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/289-aerodactyl.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/289-aerodactyl.mp3 new file mode 100644 index 0000000..5eb4291 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/289-aerodactyl.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/290-snorlax.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/290-snorlax.mp3 new file mode 100644 index 0000000..4b9473c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/290-snorlax.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/291-articuno.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/291-articuno.mp3 new file mode 100644 index 0000000..536a84c Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/291-articuno.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/292-zapdos.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/292-zapdos.mp3 new file mode 100644 index 0000000..54e7df7 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/292-zapdos.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/293-moltres.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/293-moltres.mp3 new file mode 100644 index 0000000..8dfef71 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/293-moltres.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/294-dratini.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/294-dratini.mp3 new file mode 100644 index 0000000..b2d0b0b Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/294-dratini.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/295-dragonair.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/295-dragonair.mp3 new file mode 100644 index 0000000..325fe42 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/295-dragonair.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/296-dragonite.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/296-dragonite.mp3 new file mode 100644 index 0000000..13b7352 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/296-dragonite.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/297-mewto.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/297-mewto.mp3 new file mode 100644 index 0000000..174f02a Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/297-mewto.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/298-mew.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/298-mew.mp3 new file mode 100644 index 0000000..a095090 Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/298-mew.mp3 differ diff --git a/resources/sound/Pokemon Gameboy Sound Collection (MP3)/299-sound effect collection.mp3 b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/299-sound effect collection.mp3 new file mode 100644 index 0000000..a699e6f Binary files /dev/null and b/resources/sound/Pokemon Gameboy Sound Collection (MP3)/299-sound effect collection.mp3 differ diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 58ce714..0000000 --- a/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.3/userguide/multi_project_builds.html - */ - -rootProject.name = 'PokeMudry' -include('app') diff --git a/app/src/main/java/Entity/Character.java b/src/Entity/Character.java similarity index 100% rename from app/src/main/java/Entity/Character.java rename to src/Entity/Character.java diff --git a/app/src/main/java/Entity/Enemy.java b/src/Entity/Enemy.java similarity index 100% rename from app/src/main/java/Entity/Enemy.java rename to src/Entity/Enemy.java diff --git a/app/src/main/java/Entity/Entity.java b/src/Entity/Entity.java similarity index 100% rename from app/src/main/java/Entity/Entity.java rename to src/Entity/Entity.java diff --git a/app/src/main/java/Entity/Player.java b/src/Entity/Player.java similarity index 100% rename from app/src/main/java/Entity/Player.java rename to src/Entity/Player.java diff --git a/app/src/main/java/Entity/Stuff.java b/src/Entity/Stuff.java similarity index 100% rename from app/src/main/java/Entity/Stuff.java rename to src/Entity/Stuff.java diff --git a/app/src/main/java/PokeMudry.java b/src/PokeMudry.java similarity index 100% rename from app/src/main/java/PokeMudry.java rename to src/PokeMudry.java diff --git a/app/src/main/java/Screen/Hero.java b/src/Screen/Hero.java similarity index 97% rename from app/src/main/java/Screen/Hero.java rename to src/Screen/Hero.java index af4d88a..484fffd 100644 --- a/app/src/main/java/Screen/Hero.java +++ b/src/Screen/Hero.java @@ -70,7 +70,7 @@ public class Hero implements DrawableObject { newPosition = new Vector2(initialPosition); position = new Vector2(initialPosition); - ss = new Spritesheet("app/src/main/resources/lumberjack_sheet32.png", SPRITE_WIDTH, SPRITE_HEIGHT); + ss = new Spritesheet("./resources/lumberjack_sheet32.png", SPRITE_WIDTH, SPRITE_HEIGHT); } /** diff --git a/app/src/main/java/Screen/ScreenBattle.java b/src/Screen/ScreenBattle.java similarity index 100% rename from app/src/main/java/Screen/ScreenBattle.java rename to src/Screen/ScreenBattle.java diff --git a/app/src/main/java/Screen/ScreenMap.java b/src/Screen/ScreenMap.java similarity index 71% rename from app/src/main/java/Screen/ScreenMap.java rename to src/Screen/ScreenMap.java index b17e20b..ff0469c 100644 --- a/app/src/main/java/Screen/ScreenMap.java +++ b/src/Screen/ScreenMap.java @@ -3,6 +3,7 @@ package Screen; import ch.hevs.gdx2d.lib.GdxGraphics; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.maps.MapObject; import com.badlogic.gdx.maps.MapObjects; import com.badlogic.gdx.maps.MapProperties; @@ -26,18 +27,16 @@ public class ScreenMap { private MapObjects doors; Map tMap = new TreeMap(); Map tMapRenderer = new TreeMap(); - private String map = "test_couloir"; + private String map = "desert"; public float zoom; private int width; private int tileWidth; private int height; private int tileHeight; - // position - Vector2 pannel = new Vector2(30, 30); private void createMap(String name){ - TiledMap tm =new TmxMapLoader().load("app/src/main/resources/map/"+ name + ".tmx"); + TiledMap tm =new TmxMapLoader().load("./resources/map/"+ name + ".tmx"); tMap.put(name,tm); tMapRenderer.put(name,new OrthogonalTiledMapRenderer(tm)); } @@ -45,7 +44,7 @@ public class ScreenMap { public void init() { // Create hero - hero = new Hero(9, 4); + hero = new Hero(8, 15); // Set initial zoom zoom = 1; @@ -59,14 +58,17 @@ public class ScreenMap { // create map createMap("test"); createMap("test_couloir"); + createMap("desert"); } public void graphicRender(GdxGraphics g) { g.clear(); - for (int i = 0; i < 100; i++) { + tiledLayer.clear(); + for (int i = 0; i < 50; i++) { try { tiledLayer.add((TiledMapTileLayer) tMap.get(map).getLayers().get(i)); } catch (Exception e) { } } + //System.out.println(tiledLayer.size() + " layers imported"); TiledMapTileLayer tl = tiledLayer.get(0); width = tl.getWidth(); tileWidth = (int) tl.getTileWidth(); @@ -75,11 +77,11 @@ public class ScreenMap { //System.out.println(width + " x " + height + " - " + tileWidth + " x " + tileHeight); try { doors = tMap.get(map).getLayers().get("door").getObjects(); - } catch (Exception e) { } + } catch (Exception e) { doors = null; } // Hero activity manageHero(); - // System.out.println(hero.getPosition().x + " - " + hero.getPosition().y); + System.out.println("Hero: " + (int)hero.getPosition().x/tileWidth + " x " + (int)hero.getPosition().y/tileHeight); // Camera follows the hero g.zoom(zoom); @@ -99,20 +101,13 @@ public class ScreenMap { private Vector getTile(Vector2 position, int offsetX, int offsetY) { Vector tiles = new Vector<>(); for (TiledMapTileLayer tl : tiledLayer) { - int x = (int) (position.x / width) + offsetX; - int y = (int) (position.y / height) + offsetY; - System.out.println("tl: " + tl); + int x = (int) (position.x / tileWidth) + offsetX; + int y = (int) (position.y / tileHeight) + offsetY; try { - System.out.println("begin"); - System.out.println( tl.getName()); Cell cell = tl.getCell(x, y); - System.out.println("cell: "+ cell); - if (tl.getCell(x, y) == null) continue; - System.out.println("not null"); - TiledMapTile t = cell.getTile(); - System.out.println("t: " + t); - tiles.add(t); - } catch (Exception e) { System.out.println("shit");} + if (cell == null) continue; + tiles.add(cell.getTile()); + } catch (Exception e) { } } return tiles; @@ -121,15 +116,10 @@ public class ScreenMap { private boolean isWalkable(Vector tile) { if (tile == null) return false; boolean walkable = false; - System.out.println("tile: " + tile); - for (TiledMapTile tiledMapTile : tile) { - System.out.println("tiledMapTile: " + tiledMapTile); Object test = tiledMapTile.getProperties().get("walkable"); walkable = Boolean.parseBoolean(test.toString()) ? true:walkable; } - - //System.out.println(" walkable: " + walkable); return walkable; } @@ -143,20 +133,16 @@ public class ScreenMap { return speed; } - private String getName(TiledMap tile) { - Object test = tile.getProperties().get("name"); - return test.toString(); - } - private boolean isDoor(Vector2 position) { + if (doors == null) return false; boolean onDoor = false; Integer x = null; Integer y = null; int ox = 0; int oy = 0; try { - x = (int) (position.x / 32); //tiledLayer.getTileWidth() - y = (int) (position.y / 32); //tiledLayer.getTileHeight() + x = (int) (position.x / tileWidth); + y = (int) (position.y / tileHeight); } catch (Exception e) { } for (MapObject object : doors){ @@ -165,17 +151,15 @@ public class ScreenMap { try { ox = (int) ((float) mapProperties.get("x")); } catch (Exception e) { } try { oy = (int) ((float) mapProperties.get("y")); } catch (Exception e) { } - oy-=288; - oy/=-1; + ox /= tileWidth; + oy /= tileHeight; - ox /= 32; - oy /= 32; - - String id = null; - try { id = mapProperties.get("id").toString(); } catch (Exception e) { } - //if(x != null && y != null) System.out.println(id + ": " + x + " x " + y + " - " + ox + " x " + oy); - - if (x != null || y != null) onDoor = (x == ox && y == oy) ? true:onDoor; + if ((x != null || y != null) && (x == ox && y == oy)) { + onDoor = true; + try { Door.nextMap = mapProperties.get("nextMap").toString(); } catch (Exception e) { System.out.println("shit 1"); } + try { Door.nextX = Integer.parseInt(mapProperties.get("nextX").toString()); } catch (Exception e) { System.out.println("shit 2"); } + try { Door.nextY = Integer.parseInt(mapProperties.get("nextY").toString()); } catch (Exception e) { System.out.println("shit 3"); } + } } return onDoor; @@ -216,23 +200,33 @@ public class ScreenMap { if(isDoor(hero.getPosition())){ - /* - switch(getName(tMap.get(map))){ - case "test": - if(hero.getPosition().x == 32 && hero.getPosition().y == 288){ - hero.setPosition(576, 256); - map = "desert"; - } - break; - default: - - break; - } - */ - - System.out.println("it's a door"); + String nMap = null; + Integer x = null; + Integer y = null; + try { + nMap = Door.nextMap; + x = Door.nextX; + y = Door.nextY; + } catch (Exception e) { } + Door.reset(); + if (nMap == null || x == null || y == null) return; + map = nMap; + hero.setPosition(x*tileWidth, y*tileHeight); + System.out.println("Go to: " + map + " in " + x + " x " + y); } } } + static class Door { + static String nextMap; + static Integer nextX; + static Integer nextY; + + static void reset(){ + nextMap = null; + nextX = null; + nextY = null; + } + } + } diff --git a/app/src/main/java/Screen/ScreenPlayer.java b/src/Screen/ScreenPlayer.java similarity index 100% rename from app/src/main/java/Screen/ScreenPlayer.java rename to src/Screen/ScreenPlayer.java diff --git a/app/src/main/java/testHER.java b/src/testHER.java similarity index 92% rename from app/src/main/java/testHER.java rename to src/testHER.java index 03b5f7f..5bf95d0 100644 --- a/app/src/main/java/testHER.java +++ b/src/testHER.java @@ -38,9 +38,9 @@ public class testHER extends PortableApplication{ switch (keycode) { case Input.Keys.Z: if (sm.zoom == 1.0) { - sm.zoom = 2.0f; - } else if (sm.zoom == 2.0) { - sm.zoom = 4; + sm.zoom = 0.5f; + } else if (sm.zoom == 0.5) { + sm.zoom = 0.25f; } else { sm.zoom = 1; }