Compare commits

..

4 Commits

Author SHA1 Message Date
OMGeeky
af248d3e02 Gitignore cleanup & adding modules to VCS 2022-12-12 15:38:21 +01:00
Nut.andor
ec8b114782 fix Burhczyd 2022-12-12 08:52:43 +01:00
Nut.andor
aaecb8ae4a Reformatting json for better reading 2022-12-11 03:56:15 +01:00
Nut.andor
322007e5ac Next version number v0-8-4 68 2022-11-19 00:23:26 +01:00
44 changed files with 687 additions and 6447 deletions

1
.gitignore vendored
View File

@@ -1 +0,0 @@
/AndorsTrail/.idea/workspace.xml

View File

@@ -1,55 +1,23 @@
# Android ignores
# Android Module ignores (we would overwrite them in the build script anyway)
app/src/main/res
app/src/main/assets
gen/
bin/
target/
local.properties
app/build/intermediates/
build/
debug/
release/
# Gradle files
.gradle/
build/
#IntelliJ
.idea/
out/production/
out/test/
*.iws
*.ipr
# Local configuration file (sdk path, etc)
local.properties
# Other
.metadata
.svn/
# Log/OS Files
*.log
# Android Studio generated files and folders
captures/
.externalNativeBuild/
.cxx/
*.apk
output.json
#copied from https://github.com/github/gitignore/blob/main/Gradle.gitignore
.gradle
**/build/
!src/**/build/
# Ignore Gradle GUI config
gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Avoid ignore Gradle wrappper properties
!gradle-wrapper.properties
# Cache of project
.gradletasknamecache
# Eclipse Gradle plugin generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
#copied from https://github.com/github/gitignore/blob/main/Gradle.gitignore
/AndorsTrail/.gradle
/AndorsTrail/gradle/wrapper
/AndorsTrail/app/build/
/AndorsTrail/app/debug/
/AndorsTrail/app/release/
*.jks
*.keystore

8
AndorsTrail/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
workspace.xml
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml
.editorconfig

139
AndorsTrail/.idea/codeStyles/Project.xml generated Normal file
View File

@@ -0,0 +1,139 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="JAVA">
<option name="RIGHT_MARGIN" value="110" />
<option name="KEEP_LINE_BREAKS" value="false" />
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
<option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="5" />
<option name="PREFER_PARAMETERS_WRAP" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="RESOURCE_LIST_WRAP" value="5" />
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
<option name="BINARY_OPERATION_WRAP" value="5" />
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="1" />
<option name="FOR_BRACE_FORCE" value="3" />
<option name="SOFT_MARGINS" value="100" />
</codeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme>
</component>

View File

@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

6
AndorsTrail/.idea/compiler.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
</component>
</project>

20
AndorsTrail/.idea/gradle.xml generated Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="11" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

25
AndorsTrail/.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
</component>
</project>

6
AndorsTrail/.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

View File

@@ -3,8 +3,8 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="67"
android:versionName="0.8.3dev"
android:versionCode="68"
android:versionName="0.8.4dev"
android:installLocation="auto"
>
<uses-sdk

View File

@@ -24,15 +24,15 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
public static final boolean DEVELOPMENT_FASTSPEED = false;
public static final boolean DEVELOPMENT_VALIDATEDATA = false;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
public static final String CURRENT_VERSION_DISPLAY = "0.8.3dev";
public static final boolean DEVELOPMENT_VALIDATEDATA = true;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
public static final String CURRENT_VERSION_DISPLAY = "0.8.4dev";
public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 67;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 68;
private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
private WorldContext world = new WorldContext();

View File

@@ -1,7 +0,0 @@
@echo off
echo Creating folder for worlds
mkdir %~dp0\res\xml\worlds
echo Creating worlds
python %~dp0\tools\create_worlds.py %~dp0\res\xml\
echo Done!
# pause

File diff suppressed because it is too large Load Diff

View File

@@ -1,48 +0,0 @@
{
"maps": [
{
"fileName": "../arulircave1.tmx",
"height": 800,
"width": 960,
"x": 64,
"y": 1440
},
{
"fileName": "../arulircave2.tmx",
"height": 480,
"width": 480,
"x": 480,
"y": 928
},
{
"fileName": "../arulircave3.tmx",
"height": 480,
"width": 480,
"x": 896,
"y": 1440
},
{
"fileName": "../arulircave4.tmx",
"height": 320,
"width": 320,
"x": 1024,
"y": 1952
},
{
"fileName": "../arulircave5.tmx",
"height": 320,
"width": 320,
"x": 928,
"y": 2304
},
{
"fileName": "../arulircave6.tmx",
"height": 480,
"width": 480,
"x": 1088,
"y": 2656
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,41 +0,0 @@
{
"maps": [
{
"fileName": "../basiliskcave1_1_1.tmx",
"height": 512,
"width": 1024,
"x": -192,
"y": -384
},
{
"fileName": "../basiliskcave1_1_2.tmx",
"height": 960,
"width": 800,
"x": 352,
"y": -160
},
{
"fileName": "../basiliskcave1_1_3.tmx",
"height": 928,
"width": 704,
"x": 384,
"y": -896
},
{
"fileName": "../basiliskcave1_1_4.tmx",
"height": 416,
"width": 768,
"x": -64,
"y": -1216
},
{
"fileName": "../basiliskcave1_1_5.tmx",
"height": 864,
"width": 416,
"x": 384,
"y": -1344
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,41 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain17.tmx",
"height": 640,
"width": 320,
"x": 3488,
"y": 11680
},
{
"fileName": "../blackwater_mountain18.tmx",
"height": 480,
"width": 704,
"x": 3904,
"y": 12032
},
{
"fileName": "../blackwater_mountain19.tmx",
"height": 320,
"width": 320,
"x": 3904,
"y": 12768
},
{
"fileName": "../blackwater_mountain20.tmx",
"height": 320,
"width": 640,
"x": 4256,
"y": 12768
},
{
"fileName": "../blackwater_mountain39.tmx",
"height": 640,
"width": 640,
"x": 4608,
"y": 12896
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain36.tmx",
"height": 352,
"width": 320,
"x": 2560,
"y": 13280
},
{
"fileName": "../blackwater_mountain37.tmx",
"height": 480,
"width": 480,
"x": 2624,
"y": 13632
},
{
"fileName": "../blackwater_mountain38.tmx",
"height": 960,
"width": 608,
"x": 1632,
"y": 13792
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,41 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain4a.tmx",
"height": 224,
"width": 864,
"x": 1728,
"y": 13344
},
{
"fileName": "../blackwater_mountain6.tmx",
"height": 320,
"width": 416,
"x": 2112,
"y": 12448
},
{
"fileName": "../blackwater_mountain5.tmx",
"height": 960,
"width": 928,
"x": 1120,
"y": 12384
},
{
"fileName": "../blackwater_mountain9.tmx",
"height": 544,
"width": 736,
"x": 1696,
"y": 11552
},
{
"fileName": "../blackwater_mountain5a.tmx",
"height": 640,
"width": 576,
"x": 448,
"y": 12832
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,13 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain7.tmx",
"height": 960,
"width": 960,
"x": 1504,
"y": 11776
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,48 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain43.tmx",
"height": 960,
"width": 960,
"x": 1184,
"y": 13248
},
{
"fileName": "../blackwater_mountain44.tmx",
"height": 640,
"width": 640,
"x": 512,
"y": 13600
},
{
"fileName": "../blackwater_mountain45.tmx",
"height": 480,
"width": 480,
"x": 0,
"y": 13568
},
{
"fileName": "../blackwater_mountain46.tmx",
"height": 288,
"width": 224,
"x": 96,
"y": 13312
},
{
"fileName": "../blackwater_mountain51.tmx",
"height": 448,
"width": 320,
"x": 3168,
"y": 13568
},
{
"fileName": "../blackwater_mountain52.tmx",
"height": 960,
"width": 320,
"x": 2176,
"y": 13600
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../crackshot_hideout1.tmx",
"height": 864,
"width": 288,
"x": -608,
"y": -320
},
{
"fileName": "../crackshot_hideout2.tmx",
"height": 288,
"width": 864,
"x": 288,
"y": -896
},
{
"fileName": "../crackshot_hideout3.tmx",
"height": 608,
"width": 608,
"x": -608,
"y": -960
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,48 +0,0 @@
{
"maps": [
{
"fileName": "../elm_4f_1.tmx",
"height": 480,
"width": 640,
"x": 64,
"y": -224
},
{
"fileName": "../elm_4f_2.tmx",
"height": 992,
"width": 320,
"x": -448,
"y": 448
},
{
"fileName": "../elm_4f_3.tmx",
"height": 480,
"width": 640,
"x": -448,
"y": -224
},
{
"fileName": "../elm_4f_4.tmx",
"height": 992,
"width": 320,
"x": -448,
"y": -576
},
{
"fileName": "../elm_4f_6.tmx",
"height": 480,
"width": 448,
"x": 64,
"y": -1056
},
{
"fileName": "../elm_4f_5.tmx",
"height": 640,
"width": 672,
"x": -1120,
"y": 96
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,20 +0,0 @@
{
"maps": [
{
"fileName": "../elm5f_1.tmx",
"height": 576,
"width": 640,
"x": 320,
"y": 448
},
{
"fileName": "../elm5f_2.tmx",
"height": 768,
"width": 960,
"x": 224,
"y": -544
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,55 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain13.tmx",
"height": 608,
"width": 960,
"x": -416,
"y": -608
},
{
"fileName": "../elm_mine0.tmx",
"height": 800,
"width": 832,
"x": -1248,
"y": -704
},
{
"fileName": "../elm_mine1.tmx",
"height": 384,
"width": 608,
"x": 224,
"y": -608
},
{
"fileName": "../elm_mine2.tmx",
"height": 608,
"width": 960,
"x": -416,
"y": -1600
},
{
"fileName": "../elm_mine3.tmx",
"height": 608,
"width": 864,
"x": -1056,
"y": -1600
},
{
"fileName": "../elm_mine4.tmx",
"height": 416,
"width": 960,
"x": 224,
"y": -1600
},
{
"fileName": "../elm_mine5.tmx",
"height": 608,
"width": 800,
"x": -416,
"y": -2432
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,20 +0,0 @@
{
"maps": [
{
"fileName": "../elm_2f_1.tmx",
"height": 768,
"width": 1152,
"x": 256,
"y": -384
},
{
"fileName": "../elm_2f_2.tmx",
"height": 256,
"width": 288,
"x": 1056,
"y": 480
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../flagstone2.tmx",
"height": 352,
"width": 960,
"x": 3968,
"y": 15456
},
{
"fileName": "../flagstone3.tmx",
"height": 640,
"width": 416,
"x": 4160,
"y": 16448
},
{
"fileName": "../flagstone4.tmx",
"height": 800,
"width": 416,
"x": 4832,
"y": 16320
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,139 +0,0 @@
{
"maps": [
{
"fileName": "../mywildcave1.tmx",
"height": 512,
"width": 384,
"x": 5920,
"y": 16576
},
{
"fileName": "../mywildcave2.tmx",
"height": 480,
"width": 800,
"x": 6080,
"y": 15744
},
{
"fileName": "../mywildcave3.tmx",
"height": 800,
"width": 640,
"x": 6048,
"y": 15072
},
{
"fileName": "../mywildcave4.tmx",
"height": 576,
"width": 512,
"x": 6336,
"y": 14528
},
{
"fileName": "../bogsten2.tmx",
"height": 512,
"width": 672,
"x": 9536,
"y": 14464
},
{
"fileName": "../bogsten3.tmx",
"height": 800,
"width": 576,
"x": 9824,
"y": 15168
},
{
"fileName": "../bogsten4.tmx",
"height": 800,
"width": 640,
"x": 10656,
"y": 15264
},
{
"fileName": "../mushroom_m2_1.tmx",
"height": 800,
"width": 416,
"x": 10656,
"y": 14816
},
{
"fileName": "../mushroom_m2_2.tmx",
"height": 576,
"width": 640,
"x": 10336,
"y": 14144
},
{
"fileName": "../mushroom_m2_3.tmx",
"height": 704,
"width": 672,
"x": 9792,
"y": 13440
},
{
"fileName": "../mushroom_m2_4.tmx",
"height": 480,
"width": 672,
"x": 10528,
"y": 13440
},
{
"fileName": "../mushroom_m2_5.tmx",
"height": 512,
"width": 512,
"x": 10400,
"y": 12896
},
{
"fileName": "../mushroom_m2_6.tmx",
"height": 576,
"width": 512,
"x": 9792,
"y": 12896
},
{
"fileName": "../mushroom_m2_7.tmx",
"height": 224,
"width": 512,
"x": 9536,
"y": 12896
},
{
"fileName": "../mushroom_m2_8.tmx",
"height": 320,
"width": 928,
"x": 9184,
"y": 12896
},
{
"fileName": "../mushroom_m2_9.tmx",
"height": 960,
"width": 288,
"x": 8192,
"y": 13536
},
{
"fileName": "../mushroom_m2_10.tmx",
"height": 320,
"width": 288,
"x": 7840,
"y": 13536
},
{
"fileName": "../mushroom_m3_1.tmx",
"height": 672,
"width": 512,
"x": 7136,
"y": 13632
},
{
"fileName": "../mushroom_m3_2.tmx",
"height": 640,
"width": 736,
"x": 6944,
"y": 14176
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,34 +0,0 @@
{
"maps": [
{
"fileName": "../gargoylecave1.tmx",
"height": 640,
"width": 640,
"x": 13440,
"y": 13568
},
{
"fileName": "../gargoylecave2.tmx",
"height": 640,
"width": 640,
"x": 12768,
"y": 13568
},
{
"fileName": "../gargoylecave3.tmx",
"height": 352,
"width": 640,
"x": 12640,
"y": 12896
},
{
"fileName": "../gargoylecave4.tmx",
"height": 384,
"width": 256,
"x": 13152,
"y": 13280
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,41 +0,0 @@
{
"maps": [
{
"fileName": "../haunted_underground_1.tmx",
"height": 800,
"width": 480,
"x": 24384,
"y": 22560
},
{
"fileName": "../haunted_underground_2.tmx",
"height": 704,
"width": 384,
"x": 25216,
"y": 22560
},
{
"fileName": "../haunted_underground_3.tmx",
"height": 576,
"width": 640,
"x": 25952,
"y": 22080
},
{
"fileName": "../haunted_underground_4.tmx",
"height": 608,
"width": 480,
"x": 26560,
"y": 22080
},
{
"fileName": "../haunted_underground_5.tmx",
"height": 448,
"width": 480,
"x": 27200,
"y": 21792
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../lakecave0.tmx",
"height": 960,
"width": 960,
"x": 11168,
"y": 14016
},
{
"fileName": "../lakecave1.tmx",
"height": 960,
"width": 960,
"x": 11168,
"y": 13024
},
{
"fileName": "../lakecave2.tmx",
"height": 960,
"width": 960,
"x": 12160,
"y": 13216
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../lodar5cave0.tmx",
"height": 960,
"width": 928,
"x": 9504,
"y": 10048
},
{
"fileName": "../lodar5cave1.tmx",
"height": 640,
"width": 960,
"x": 9760,
"y": 11008
},
{
"fileName": "../lodar5cave2.tmx",
"height": 640,
"width": 640,
"x": 9088,
"y": 11776
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,62 +0,0 @@
{
"maps": [
{
"fileName": "../lodarcave1.tmx",
"height": 576,
"width": 960,
"x": 9888,
"y": 8800
},
{
"fileName": "../lodarcave2.tmx",
"height": 480,
"width": 640,
"x": 10208,
"y": 9792
},
{
"fileName": "../lodarcave3.tmx",
"height": 960,
"width": 960,
"x": 10336,
"y": 10464
},
{
"fileName": "../lodarcave4.tmx",
"height": 800,
"width": 640,
"x": 10720,
"y": 11456
},
{
"fileName": "../lodarcave4a.tmx",
"height": 640,
"width": 640,
"x": 11552,
"y": 11456
},
{
"fileName": "../lodarcave5.tmx",
"height": 800,
"width": 640,
"x": 11136,
"y": 12128
},
{
"fileName": "../lodarcave6.tmx",
"height": 640,
"width": 736,
"x": 11264,
"y": 12800
},
{
"fileName": "../lodarcave7.tmx",
"height": 480,
"width": 640,
"x": 11936,
"y": 13184
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,41 +0,0 @@
{
"maps": [
{
"fileName": "../lostmine1.tmx",
"height": 928,
"width": 960,
"x": 2272,
"y": 1984
},
{
"fileName": "../lostmine1a.tmx",
"height": 736,
"width": 544,
"x": 1504,
"y": 1824
},
{
"fileName": "../lostmine2.tmx",
"height": 960,
"width": 960,
"x": 3008,
"y": 992
},
{
"fileName": "../lostmine2a.tmx",
"height": 608,
"width": 672,
"x": 4000,
"y": 1376
},
{
"fileName": "../lostmine3.tmx",
"height": 608,
"width": 960,
"x": 3424,
"y": 0
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../lostmine4.tmx",
"height": 480,
"width": 544,
"x": 224,
"y": 256
},
{
"fileName": "../lostmine5.tmx",
"height": 384,
"width": 928,
"x": 224,
"y": 832
},
{
"fileName": "../lostmine6.tmx",
"height": 384,
"width": 608,
"x": 288,
"y": 1792
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,20 +0,0 @@
{
"maps": [
{
"fileName": "../lostmine7.tmx",
"height": 928,
"width": 960,
"x": 512,
"y": 256
},
{
"fileName": "../lostmine8.tmx",
"height": 416,
"width": 608,
"x": 800,
"y": 1248
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../lostmine9.tmx",
"height": 896,
"width": 896,
"x": 704,
"y": 1344
},
{
"fileName": "../lostmine10.tmx",
"height": 448,
"width": 640,
"x": 1344,
"y": 672
},
{
"fileName": "../lostmine11.tmx",
"height": 544,
"width": 640,
"x": 1440,
"y": 0
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,34 +0,0 @@
{
"maps": [
{
"fileName": "../mountaincave0.tmx",
"height": 640,
"width": 640,
"x": 20320,
"y": 9504
},
{
"fileName": "../mountaincave1.tmx",
"height": 640,
"width": 640,
"x": 19648,
"y": 9504
},
{
"fileName": "../mountaincave2.tmx",
"height": 800,
"width": 960,
"x": 19264,
"y": 8512
},
{
"fileName": "../mountaincave3.tmx",
"height": 640,
"width": 640,
"x": 19168,
"y": 7840
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,48 +0,0 @@
{
"maps": [
{
"fileName": "../blackwater_mountain71.tmx",
"height": 384,
"width": 640,
"x": 352,
"y": 1600
},
{
"fileName": "../blackwater_mountain72.tmx",
"height": 384,
"width": 640,
"x": -64,
"y": 1600
},
{
"fileName": "../blackwater_mountain73.tmx",
"height": 800,
"width": 640,
"x": -64,
"y": 2272
},
{
"fileName": "../blackwater_mountain74.tmx",
"height": 800,
"width": 640,
"x": -64,
"y": 2944
},
{
"fileName": "../blackwater_mountain75.tmx",
"height": 800,
"width": 1312,
"x": -896,
"y": 2272
},
{
"fileName": "../blackwater_mountain76.tmx",
"height": 800,
"width": 640,
"x": -896,
"y": 1600
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,48 +0,0 @@
{
"maps": [
{
"fileName": "../pwcave0.tmx",
"height": 352,
"width": 960,
"x": 9824,
"y": 3904
},
{
"fileName": "../pwcave1.tmx",
"height": 960,
"width": 960,
"x": 9184,
"y": 2912
},
{
"fileName": "../pwcave2.tmx",
"height": 960,
"width": 960,
"x": 9184,
"y": 1920
},
{
"fileName": "../pwcave2a.tmx",
"height": 640,
"width": 800,
"x": 9312,
"y": 1088
},
{
"fileName": "../pwcave3.tmx",
"height": 960,
"width": 960,
"x": 10176,
"y": 1920
},
{
"fileName": "../pwcave4.tmx",
"height": 960,
"width": 960,
"x": 10176,
"y": 2912
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,27 +0,0 @@
{
"maps": [
{
"fileName": "../snakecave1.tmx",
"height": 640,
"width": 640,
"x": 4608,
"y": 12032
},
{
"fileName": "../snakecave2.tmx",
"height": 640,
"width": 640,
"x": 3936,
"y": 12032
},
{
"fileName": "../snakecave3.tmx",
"height": 480,
"width": 960,
"x": 3680,
"y": 11040
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,41 +0,0 @@
{
"maps": [
{
"fileName": "../waterwayacave1.tmx",
"height": 960,
"width": 928,
"x": 6624,
"y": 6016
},
{
"fileName": "../waterwayacave2.tmx",
"height": 960,
"width": 960,
"x": 6624,
"y": 6976
},
{
"fileName": "../waterwayacave3.tmx",
"height": 960,
"width": 960,
"x": 6880,
"y": 7968
},
{
"fileName": "../waterwayacave4.tmx",
"height": 960,
"width": 960,
"x": 6240,
"y": 8960
},
{
"fileName": "../waterwayacavex.tmx",
"height": 320,
"width": 320,
"x": 7872,
"y": 8608
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

View File

@@ -1,48 +0,0 @@
{
"maps": [
{
"fileName": "../waytobrimhavencave0.tmx",
"height": 960,
"width": 768,
"x": 11168,
"y": 8384
},
{
"fileName": "../waytobrimhavencave1.tmx",
"height": 960,
"width": 960,
"x": 12160,
"y": 8640
},
{
"fileName": "../waytobrimhavencave1a.tmx",
"height": 960,
"width": 480,
"x": 11168,
"y": 9312
},
{
"fileName": "../waytobrimhavencave2.tmx",
"height": 960,
"width": 960,
"x": 13152,
"y": 8640
},
{
"fileName": "../waytobrimhavencave3.tmx",
"height": 960,
"width": 960,
"x": 14144,
"y": 8640
},
{
"fileName": "../waytobrimhavencave4.tmx",
"height": 960,
"width": 960,
"x": 10176,
"y": 8640
}
],
"onlyShowAdjacentMaps": false,
"type": "world"
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,52 +0,0 @@
import json
import sys
from pathlib import Path
from xml.etree import ElementTree as etree
def convert(xml_path: Path, world_folder: Path):
with open(xml_path, 'r') as xml_f:
xml = etree.fromstring(xml_f.read())
maps_folder = world_folder.parent
for segment in xml.findall('segment'):
segment_id = segment.get('id')
world = {}
maps = []
for xml_map in segment.findall('map'):
x = int(xml_map.get('x'))
y = int(xml_map.get('y'))
id = xml_map.get('id')
with open(Path(maps_folder, f'{id}.tmx'), 'r') as map_f:
map_tmx = etree.fromstring(map_f.read())
tilewidth = int(map_tmx.get('tilewidth'))
tileheight = int(map_tmx.get('tileheight'))
width = int(map_tmx.get('width'))
height = int(map_tmx.get('height'))
map = {
'fileName': f'../{id}.tmx',
"height": width * tilewidth,
"width": height * tileheight,
'x': x * tilewidth,
'y': y * tileheight,
}
maps.append(map)
world['maps'] = maps
world["onlyShowAdjacentMaps"] = False
world["type"] = "world"
with open(Path(world_folder, f'{segment_id}.world'), 'w') as f:
json.dump(world, f, indent=4)
if __name__ == '__main__':
if sys.argv:
folder = Path(sys.argv[1])
else:
folder = Path('./res\\xml\\')
convert(Path(folder, 'worldmap.xml'),
Path(folder, 'worlds'))