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/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/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/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/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/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/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/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/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/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/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/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/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/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/app/src/main/resources/map/desert.tmx b/resources/map/desert.tmx similarity index 95% rename from app/src/main/resources/map/desert.tmx rename to resources/map/desert.tmx index f7cdc35..f571265 100644 --- a/app/src/main/resources/map/desert.tmx +++ b/resources/map/desert.tmx @@ -462,7 +462,7 @@ - eJztmNtOwzAMQAPjPi4DJK5idCvsAgP6/1+HK2rJMlliO03Xhz4cbc3S5sR22nRT59w0I5fAFTBJuMYRcJyJi8bvPNLvRDDHXRKKb6rfAXCfyEOCX2z80LX3gH1gRNpeA/1jftTlkMX+EXhS8AycAmfAWOm0zW/iace2GTBXUGb0WwF3LH/o9wZ8AO879PMxI+NK4inxk9QixslX64vMflrXmop5cb+N+6v/r47yi6wix7F48boM+UljxR2wjcYPv8f8eFzbit+SHaOPNn6588s9Oesmf1I+lX6+nNP9Az6LQoyE/ZCXgJ+kBul9D+caYizs5zvPsj7ofe8auIlwK+znOy/mUgR+i9Ve1xRbYtwnz6JDH8verAuv7+ZTcu+kz5+ypfGlSPxqp6rp26XfTyY/rBlLLfC6zuHH91MpdSvxo/sLjR+foza3Uj/tOHQ/gHu6jTGGFr/KeH3L2soRv5Cfdu1Y9mZWvzrHdI+css7bop6/7323dP/f61IoEh19eVg7W076Do+V9n+jvngPDAz4+QU9mLB5 + 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== @@ -470,14 +470,14 @@ - + - - + + 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 3cbe8b4..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,42 +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, @@ -9039,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/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 97% rename from app/src/main/java/Screen/ScreenMap.java rename to src/Screen/ScreenMap.java index 48fa8c8..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; @@ -34,11 +35,8 @@ public class ScreenMap { 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)); } @@ -46,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; 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 100% rename from app/src/main/java/testHER.java rename to src/testHER.java