Compare commits

..

3 Commits

Author SHA1 Message Date
Nut.andor
19d9ecb721 factionlist bug 2022-10-01 10:54:41 +02:00
Nut.andor
66a0e34ef9 factionlist bug 2022-10-01 09:23:16 +02:00
Nut.andor
13c58fcdbc compress + resourceloader 2022-09-28 22:51:48 +02:00
43 changed files with 277 additions and 253 deletions

1
.gitignore vendored
View File

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

166
AndorsTrail/.idea/workspace.xml generated Normal file
View File

@@ -0,0 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="fb7bf33b-30cf-40b9-a238-3e2f6f604a8f" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[AQ8PSW4DBUZPMZOR]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
</projectState>
</component>
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
<projects_view>
<tree_state>
<expand>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="AndorsTrail" type="f1a62948:ProjectNode" />
</path>
</expand>
<select />
</tree_state>
</projects_view>
</state>
</system>
</component>
<component name="GenerateSignedApkSettings">
<option name="KEY_STORE_PATH" value="C:\AT\sec\AndorsTrail.keystore" />
<option name="KEY_ALIAS" value="andorstrail" />
<option name="REMEMBER_PASSWORDS" value="true" />
<option name="BUILD_TARGET_KEY" value="apk" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="ProjectId" id="2FG0LqADbxm6Q1t3yQ9BlX5APzJ" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ApkExportedModule" value="AndorsTrail.app" />
<property name="ExportApk.ApkPath" value="C:\AT\AndorsTrailRelease\andors-trail\AndorsTrail\app" />
<property name="ExportApk.BuildVariants" value="release" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="RunOnceActivity.cidr.known.project.marker" value="true" />
<property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
<property name="cidr.known.project.marker" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../sec/AndorsTrail.keystore" />
<property name="settings.editor.selected.configurable" value="device.file.explorer" />
<property name="show.inlinked.gradle.project.popup" value="false" />
</component>
<component name="RunManager">
<configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
</configuration>
<configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
</configuration>
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="AndorsTrail.app" />
<option name="DEPLOY" value="true" />
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ALL_USERS" value="false" />
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />
<Auto>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Auto>
<Hybrid>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Hybrid>
<Java />
<Native>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="TestNG">
<option name="TEST_OBJECT" value="CLASS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="fb7bf33b-30cf-40b9-a238-3e2f6f604a8f" name="Changes" comment="" />
<created>1664103080085</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1664103080085</updated>
</task>
<servers />
</component>
</project>

View File

@@ -12,41 +12,12 @@ android {
buildTypes {
release {
manifestPlaceholders icon_name: 'icon', fileproviderPath: 'AndorsTrail'
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
manifestPlaceholders icon_name: 'icon_beta', fileproviderPath: 'AndorsTrail.beta2'
applicationIdSuffix 'beta2'
}
}
}
dependencies {
implementation 'com.android.support:support-v4:28.0.0'
}
task copyRes(type: Copy) {
description "Copies the res folder to the modules res folder (& renames .tmx to .xml)"
from "${rootDir}/res"
into "${projectDir}/src/main/res"
rename "(.*)\\.tmx", "\$1.xml"
}
task copyTranslation(type: Copy) {
description("Copies the translation files to the modules translations folder")
from "${rootDir}/assets/translation"
into "${projectDir}/src/main/assets/translation"
}
task cleanup(type: Delete) {
description("Deletes the assets/translation and the res folder from the modules folder")
delete "${projectDir}/src/main/res", "${projectDir}/src/main/assets/translation"
}
afterEvaluate {
preBuild.dependsOn project.tasks.copyRes
preBuild.dependsOn project.tasks.copyTranslation
clean.dependsOn project.tasks.cleanup
}

View File

@@ -3,8 +3,8 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="66"
android:versionName="0.8.2"
android:versionCode="65"
android:versionName="0.8.1"
android:installLocation="auto"
>
<uses-sdk
@@ -27,7 +27,7 @@
<application
android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
android:label="@string/app_name"
android:icon="@drawable/${icon_name}"
android:icon="@drawable/icon"
android:description="@string/app_description"
android:allowBackup="true"
android:theme="@style/AndorsTrailTheme_Blue"
@@ -67,7 +67,7 @@
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
android:grantUriPermissions="true"
android:exported="false">
<meta-data

View File

@@ -28,11 +28,11 @@ public final class AndorsTrailApplication extends Application {
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.2";
public static final String CURRENT_VERSION_DISPLAY = "0.8.1";
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 : 66;
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 65;
private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
private WorldContext world = new WorldContext();

View File

@@ -2,7 +2,6 @@ package com.gpl.rpg.AndorsTrail.controller;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.util.SparseIntArray;
import android.view.KeyEvent;
import android.view.View;
@@ -99,36 +98,28 @@ public final class InputController implements OnClickListener, OnLongClickListen
// Keys mapping to UP_LEFT
key = KEY_MOVE_UP_LEFT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key);
}
keyMap.put(KeyEvent.KEYCODE_DPAD_UP_LEFT, key);
keyMap.put(KeyEvent.KEYCODE_NUMPAD_7, key);
keyMap.put(KeyEvent.KEYCODE_7, key);
keyMap.put(KeyEvent.KEYCODE_MOVE_HOME, key);
// Keys mapping to UP_RIGHT
key = KEY_MOVE_UP_RIGHT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key);
}
keyMap.put(KeyEvent.KEYCODE_DPAD_UP_RIGHT, key);
keyMap.put(KeyEvent.KEYCODE_NUMPAD_9, key);
keyMap.put(KeyEvent.KEYCODE_9, key);
keyMap.put(KeyEvent.KEYCODE_PAGE_UP, key);
// Keys mapping to DOWN_LEFT
key = KEY_MOVE_DOWN_LEFT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key);
}
keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_LEFT, key);
keyMap.put(KeyEvent.KEYCODE_NUMPAD_1, key);
keyMap.put(KeyEvent.KEYCODE_1, key);
keyMap.put(KeyEvent.KEYCODE_MOVE_END, key);
// Keys mapping to DOWN_RIGHT
key = KEY_MOVE_DOWN_RIGHT;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key);
}
keyMap.put(KeyEvent.KEYCODE_DPAD_DOWN_RIGHT, key);
keyMap.put(KeyEvent.KEYCODE_NUMPAD_3, key);
keyMap.put(KeyEvent.KEYCODE_3, key);
keyMap.put(KeyEvent.KEYCODE_PAGE_DOWN, key);

View File

@@ -19,7 +19,6 @@ import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.model.quest.Quest;
import com.gpl.rpg.AndorsTrail.util.HashMapHelper;
public final class GameStatistics {
private int deaths = 0;
@@ -37,10 +36,10 @@ public final class GameStatistics {
public void addMonsterKill(MonsterType monsterType) {
// Track monster kills by type ID, for savegame file
killedMonstersByTypeID.put(monsterType.id, getNumberOfKillsForMonsterType(monsterType.id) + 1);
killedMonstersByTypeID.put(monsterType.id, killedMonstersByTypeID.getOrDefault((monsterType.id), 0) + 1);
// Also track by name, for statistics display (multiple IDs w/same name don't matter to player)
killedMonstersByName.put(monsterType.name, getNumberOfKillsForMonsterName(monsterType.name) + 1);
killedMonstersByName.put(monsterType.name, killedMonstersByName.getOrDefault(monsterType.name, 0) + 1);
}
public void addPlayerDeath(int lostExp) {
@@ -51,7 +50,8 @@ public final class GameStatistics {
}
public void addItemUsage(ItemType type) {
final String n = type.id;
usedItems.put(n, HashMapHelper.getOrDefault(usedItems, n,0) + 1);
if (!usedItems.containsKey(n)) usedItems.put(n, 1);
else usedItems.put(n, usedItems.get(n) + 1);
}
public int getDeaths() {
@@ -73,11 +73,15 @@ public final class GameStatistics {
public boolean isDead() { return !hasUnlimitedLives() && getLivesLeft() < 1; }
public int getNumberOfKillsForMonsterType(String monsterTypeID) {
return HashMapHelper.getOrDefault(killedMonstersByTypeID, monsterTypeID, 0);
Integer v = killedMonstersByTypeID.get(monsterTypeID);
if (v == null) return 0;
return v;
}
public int getNumberOfKillsForMonsterName(String monsterName) {
return HashMapHelper.getOrDefault(killedMonstersByName, monsterName, 0);
Integer v = killedMonstersByName.get(monsterName);
if (v == null) return 0;
return v;
}
public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) {
@@ -140,15 +144,20 @@ public final class GameStatistics {
}
public int getNumberOfUsedItems() {
return HashMapHelper.sumIntegerValues(usedItems);
int result = 0;
for (int v : usedItems.values()) result += v;
return result;
}
public int getNumberOfTimesItemHasBeenUsed(String itemId) {
return HashMapHelper.getOrDefault(usedItems, itemId, 0);
if (!usedItems.containsKey(itemId)) return 0;
return usedItems.get(itemId);
}
public int getNumberOfKilledMonsters() {
return HashMapHelper.sumIntegerValues(killedMonstersByTypeID);
int result = 0;
for (int v : killedMonstersByTypeID.values()) result += v;
return result;
}
private static final Comparator<Entry<String, Integer>> descendingValueComparator = new Comparator<Entry<String, Integer>>() {
@@ -177,7 +186,7 @@ public final class GameStatistics {
// Also track by name, for statistics display (multiple IDs w/same name don't matter to player)
MonsterType t = world.monsterTypes.getMonsterType(id);
if (t != null) killedMonstersByName.put(t.name, getNumberOfKillsForMonsterName(t.name) + value);
if (t != null) killedMonstersByName.put(t.name, killedMonstersByName.getOrDefault(t.name, 0) + value);
}
if (fileversion <= 17) return;

View File

@@ -99,9 +99,7 @@ public final class AndroidStorage {
public static String getUrlForFile(Context context, File worldmap) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
String applicationId = context.getPackageName();
// Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);
Uri uri = FileProvider.getUriForFile(context, applicationId + ".fileprovider", worldmap);
Uri uri = FileProvider.getUriForFile(context, "com.gpl.rpg.AndorsTrail.fileprovider", worldmap);
return uri.toString();
} else {
return "file://" + worldmap.getAbsolutePath();

View File

@@ -1,16 +0,0 @@
package com.gpl.rpg.AndorsTrail.util;
import java.util.HashMap;
public final class HashMapHelper {
public static <K,V> V getOrDefault(HashMap<K,V> map, K key, V defaultValue) {
V v = map.get(key);
return v == null ? defaultValue : v;
}
public static <K> Integer sumIntegerValues(HashMap<K,Integer> map) {
int sum = 0;
for (Integer v : map.values()) sum += v;
return sum;
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,39 +1,35 @@
I put both (release notes + forum announcement) into this source, so it will be easier to maintain them parallel:
APK 66 (0.8.2) //Sullengard Bugfix
Release notes
=============
* Fix of a lost traveler in certain conditions
Forum announcement //2022-10-09
==================
Hello fellow adventurers,
we fixed a bug in the last Andor's Trail release to ensure the quest "Recovering stolen property" can be completed.
Also some more XP and better loot in Sullengard area.
Here is the link to the productive version: [url]https://andorstrail.com/static/AndorsTrail_v0.8.2.apk[/url]
Google Play and Itch will follow soon, and hopefully this version can also be provided by F-Droid again.
APK 65 (0.8.1) //Engine modernization + Sullengard
Release notes
=============
* New city Sullengard
* 71 new maps and 6 new quests
* Monster kill count
* Controller support
* Translation updates
* Engine changes to support actual Android Studio
* Reorginization of the engine! It can be compiled by actual AS versions, as well as go to F-Droid at last.
This is worth a new release number 0.8!
* The content files stay in their usual directories, so Weblate and ATCS projects needn't be changed.
* New quest: "Hunting the hunter"
* New quest: "Getting home on time"
You find these quests on your way to Sullengard.
* New quest: "Pond safety"
* New quest: "Recovering stolen property"
Look for these in Sullengard.
* New quest: "Beer Bootlegging"
Starts at the Foaming flask.
* New quest: "Another ruthless Crackshot"
Sound like thieves affairs, so ask at the Guild.
* Two more achievements
* 72 new maps
* Various small changes and bug fixes
* Translations actualized
Forum beta announcement //2022-09-28
Forum beta announcement //2022-08-27
=======================
Hello fellow adventurers,
@@ -41,7 +37,7 @@ it took a while - much longer than we planned - but it was worth the wait:
[list]We have a big update with 71 new maps and 6 new quests for you![/list]
[list]3 Additions from Guru-meditation-No42:
[list]3 Additions from Guro-meditation-No42:
[list]Kill count summed up for monsters with same name (a minor irritation)[/list]
[list]Show kills of monsters in monster stat view (often requested)[/list]
[list]Controller support (not yet tested)[/list]
@@ -66,20 +62,23 @@ The following two quests are found elsewhere:
[list]"Beer Bootlegging" starts at the Foaming flask[/list]
[list]"Another ruthless Crackshot" not only sounds like thieves affairs, so ask at the Guild.[/list]
I won't tell more about the quests, I trust you to find out yourself - it's more fun after all.
Translations are actualized, many languages are at 93% now. That would have been 100%, if we hadn't added the new quests.
This is great - Thanks to all the translators!
Maybe you will notice that a few already translated texts are now in English again. This has technical reasons which I couldn't avoid - sorry for the inconvenience.
In good tradition we first publish a beta here in the forum.
What do you think of the new parts? What is good and what is not so good? Can you play properly with a console?
Of course let us know if you find any errors or inconsistencies (preferably with a screenshot).
Here is the link to the productive version: [url]https://andorstrail.com/static/AndorsTrail_v0.8.1.apk[/url]
Keep in mind that savegames of a beta version will not work later in any product version!
The beta is a separate APK now, so you can have both (beta and product version) parallel in your device. New Android versions will keep the savegames of beta and prod.version separate too.
Google Play and Itch will follow soon, and hopefully this version can also be provided by F-Droid again.
Thx for your patience - have fun with the new release!
Here now is the link to v0.8.1 beta version: [url]https://andorstrail.com/static/AndorsTrail_v0.8.1beta.apk[/url]
As always: Best make a backup of your savegames first to be sure.
Thx for your patience - have fun with the beta!

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
[{"id":"lava_queen_dl","items":[{"itemID":"diamond_ring","chance":"100","quantity":{"min":1,"max":1}},{"itemID":"rock","chance":"100","quantity":{"min":7,"max":10}}]}]

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
[{"id":"lava_queen_entity","name":"Queen lava entity","iconID":"obj_14:61","maxHP":490,"moveCost":9,"unique":1,"monsterClass":"construct","movementAggressionType":"none","attackDamage":{"min":35,"max":45},"droplistID":"lava_queen_dl","attackCost":6,"attackChance":170,"blockChance":270,"damageResistance":16}]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -608,5 +608,4 @@
<string name="startscreen_migration_title">Migrace dat</string>
<string name="startscreen_migration_text">Migrace dat uložených her.</string>
<string name="startscreen_migration_failure">Migrace dat uložených her se nezdařila.</string>
<string name="monsterinfo_killcount">Statistika soubojů</string>
</resources>

View File

@@ -627,5 +627,4 @@ Jeder Level des Skills erhöht das Schadenspotential von zweihändigen Waffen um
<string name="startscreen_migration_failure">Migration des gespeicherten Spiels fehlgeschlagen.</string>
<string name="startscreen_migration_title">Datenmigration</string>
<string name="startscreen_migration_text">Migriere Speicherstand.</string>
<string name="monsterinfo_killcount">Frühere Tötungen</string>
</resources>

View File

@@ -626,5 +626,4 @@ Każdy poziom umiejętności podnosi obrażenia zadawane każdą broń dwuręczn
<string name="startscreen_migration_title">Przenoszenie danych</string>
<string name="startscreen_migration_text">Przeniesienie zapisów gry.</string>
<string name="startscreen_migration_failure">Przeniesienie danych nieudane.</string>
<string name="monsterinfo_killcount">Zabitych do tej pory</string>
</resources>

View File

@@ -608,5 +608,4 @@
<string name="startscreen_migration_title">Перенос данных</string>
<string name="startscreen_migration_text">Перенос данных сохраненной игры.</string>
<string name="startscreen_migration_failure">Не удалось перенести данные сохранения.</string>
<string name="monsterinfo_killcount">Предыдущие убийства</string>
</resources>

View File

@@ -140,19 +140,19 @@
<string-array name="preferences_language">
<item>@string/preferences_language_default</item>
<item>English</item>
<item>čeština (93%)</item>
<item>Deutsch (94%)</item>
<item>Español (85%)</item>
<item>Française (83%)</item>
<item>Italiano (84%)</item>
<item>Magyar (30%)</item>
<item>Polski (92%)</item>
<item>Português (77%)</item>
<item>Português Brasil (93%)</item>
<item>Русский язык (100%)</item>
<item>Türkçe (38%)</item>
<item>日本人 (93%)</item>
<item>中文 (99%)</item>
<item>čeština (84->93%)</item>
<item>Deutsch (100->93%)</item>
<item>Español (90->84%)</item>
<item>Française (89->83%)</item>
<item>Italiano (90->84%)</item>
<item>Magyar (32->30%)</item>
<item>Polski (97->92%)</item>
<item>Português (83->77%)</item>
<item>Português Brasil (98->93%)</item>
<item>Русский язык (100->93%)</item>
<item>Türkçe (41->38%)</item>
<item>日本人 (100->93%)</item>
<item>中文 (100->93%)</item>
</string-array>
<!-- see AndorsTrailApplication.localeForLanguageTag for allowed formats -->

View File

@@ -143,8 +143,6 @@
<item>@raw/droplists_v0715</item>
<!--Added by ATCS v0.6.18 for project sullengard-->
<item>@raw/droplists_sullengard</item>
<!--Added by ATCS v0.6.18 for project next_release-->
<item>@raw/droplists_next_release</item>
</array>
<array name="loadresource_quests">
@@ -163,9 +161,7 @@
<item>@raw/questlist_shortcut_lodar</item>
<item>@raw/questlist_pathway_fallhaven</item>
<item>@raw/questlist_halvor_surprise</item>
-
-
@@ -462,8 +458,6 @@
<!--Added by ATCS v0.6.18 for project sullengard-->
<item>@raw/monsterlist_hilltown</item>
<item>@raw/monsterlist_sullengard</item>
<!--Added by ATCS v0.6.18 for project next_release-->
<item>@raw/monsterlist_next_release</item>
</array>
<array name="loadresource_maps">
@@ -1165,8 +1159,6 @@
<item>@xml/way_to_sullengard_east_ravine_cabin</item>
<item>@xml/way_to_sullengard_east_ravine_north</item>
<item>@xml/way_to_sullengard_pond_road</item>
<!--Added by ATCS v0.6.18 for project next_release-->
<item>@xml/gapfillerhole</item>
</array>
</resources>

View File

@@ -45,12 +45,12 @@
</tileset>
<layer name="Ground" width="20" height="15">
<data encoding="base64" compression="zlib">
eJzjYGBg4BjFo5gCHEQkprZ5pJpLrL20CJtR86hjHgDMQhM1
eJzjYGBg4BjFo5gCHEQkprZ5pJpLrJ20CJtR86hjHgBG4RN/
</data>
</layer>
<layer name="Objects" width="20" height="15">
<data encoding="base64" compression="zlib">
eJytU70KwkAMTmsVlA46aBFxUPEtnBx8AB9A3NycRJ+is2/iouDgK7joKA4ugvQBxIQmNHcWrT+Bj1xyly9fr7kQAHwHwEMUEHlEMcX7kJwRk3jiAtQxbiB2vBcg+swb4foGiaeapRuf66nepKOIuQpzrByzZ43zmiuytGyVPp1v50yu1ht9xCP9Kq5ZG3A92UhpDF7okz2xkxULx4rvgdBX3LYnG1vxHcy77OI3X5zvMVe6Q8QGc0N4Rla7Kl6ZuV/4yI74byL+V9NcXH/G+PAhBmpurqyRZpO4FpDMQhPRYV9jL/kWe7qzGZicEb8l4pIZLSNKGbz02lt8Hsf0/rJyiYcUvrUTz7rYJ1w0GzZfldc0p//QR3sPKStQ8A==
eJytUzEOAVEQnd1FQhQUbEQUS9xCpXAABxCdTiWcQu0mGhKFK2goRaGRyB5AzGRnsvO/DbuY5GX+zP/z5u3f+UsAKDsAOUQBkUcUE3wZ4jNiEk9cgAbGTcSe93xEn3lDXN8h9lSzcqNzPdWbdBQxV2WOtWP2rHNec4WWlp3Sp/Ntz+QKPugjHulXdc1an+vJRkqj/0af7ImdrVg41nwPhL7itj3Z2IofYN5lF7/56nyPudK9RGwxN4RXpLWb4pWZ+4WP7IT/JuR/NfWi+gvGx4ywdZJGmk3iWkA8Cy1Eh32dveQD9nRnM8RA8Yb8lohLZrSCKKXw0utg8eU4pveXlks8JPBtnGjWxbJw0WzYfDVe05z+Qx/tPQGzhVCp
</data>
</layer>
<layer name="Above" width="20" height="15">

View File

@@ -22,13 +22,10 @@
<tileset firstgid="321" name="map_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_1.png"/>
</tileset>
<tileset firstgid="385" name="map_0" tilewidth="32" tileheight="32">
<image source="../drawable/map_0.png"/>
</tileset>
<tileset firstgid="449" name="map_22" tilewidth="32" tileheight="32">
<tileset firstgid="385" name="map_22" tilewidth="32" tileheight="32">
<image source="../drawable/map_22.png"/>
</tileset>
<tileset firstgid="513" name="map_2" tilewidth="32" tileheight="32">
<tileset firstgid="449" name="map_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_2.png"/>
</tileset>
<layer name="Ground" width="14" height="10">
@@ -38,17 +35,17 @@
</layer>
<layer name="Objects" width="14" height="10">
<data encoding="base64" compression="zlib">
eJxjYEAFbUDszQhhtzBgByGMCLUtULoHqk8cSOfi0AvTBwJiSOJeUPEeIuxjgJrvCbUL3e3o9rah8b2R3IDLfyBwnwHhN5BdXoyo8tj0bmGEqIe5C9kumDvEcOjlR2KD7EJWgx4uyOEOwrDwEENTg+xWmDpk8/QYUeMapEYESR8nEAuimQcATaYZNg==
eJxjYEAFbUDszQhhtzDgB21QNSC6B6pPHEjn4tDbhsQWQ2J7Qe3rIcI+Bqj5nlC7sLkHl50MDAi/MeBwIwzcZ0D4DWSXFyOqPC7/gTDMXch2wdwhhkMvPxIbZBeyGvRwQQ53EIaFhxiaGmS3wtQhm6fHiBrXIDUiSPo4gVgQzTwAThsYjg==
</data>
</layer>
<layer name="Above" width="14" height="10">
<data encoding="base64" compression="zlib">
eJxrZcANjjOi8juBuBVKkwPakMzBZj4D1Hx0QMg+bHrQ5fGZAfMXITsJmdOGRYxYt4EwtvDoRFPLgEMdNvvQ3YvMxyWHrB9bfAMAiIgWGw==
eJxrZcAN2hlR+Z1A3AqlKQEw/ejmM0DNx6UeF8CmB10enxkwfxGykxy/E+s2EMYWHp1oahlwqMNmH7p7kfm45JD1Y4tvAOprFA8=
</data>
</layer>
<layer name="Walkable" width="14" height="10" visible="0">
<layer name="Walkable" width="14" height="10">
<data encoding="base64" compression="zlib">
eJxTYWJgUEHDMIAujg8jA1LUYgOE9GIzgxz7yPEbOfYRG6749BCrl9R4JDUsAOYqDak=
eJx7wsjA8AQNwwC6OD6MDEhRiw0Q0ovNDHLsI8dv5NhHbLji00OsXlLjkdSwAADCm1JN
</data>
</layer>
<objectgroup name="Mapevents" visible="0">

View File

@@ -50,20 +50,15 @@
</layer>
<layer name="Objects" width="15" height="24">
<data encoding="base64" compression="zlib">
eJy1VDsOwjAMTUKVhaEDSOVgLIxIRWLmAAwco6cAgWDnKJU4BOqCrcSq80gLAzzJspM8x5+4LaxJsHJBbmQX8cyRntiw9krXtucwfLS9C1p4jCpyaoinsYGzI91zyojcjXE12ri3J30nnyfZD5dycn6VshckUyVYU259Jrmavk6J29iQU5mJxT5b4qxJdipH5nJPGvseS+xl5NfxzQQHG3rV2LTnfB+/D8fkeOjHYJ8q6gbeT/wYO+in+Aq/g7OhXCUv7s/cpD2fxfOL6edS5g7fT2aiM++zpGtgeJful1Av8sp0O+lpYdM+53KTfNqB+/+BsW/Nw0xoFLCuzHcQXq5+DR1vrH7M4xNnrA78DzGG5uiXbyL/S41W5YJzhXgBGqYuOA==
eJy1VDsOwjAMTUqVhaEDSOFgLIxIRWLuARg4Rk4BAsHOUSpxCNQFW42F80gLAzzJcj7P37gtrUlQkRR0NiEp453eO6VrxWG4uHZFr4XH8JFTQzyNDdwdyM8xI+Ib42q08WxH+kY2D1rfi5STs/NqvSCZKsGacvsTycW86pS4wfY5VZlYbLMlzpqkUTkyl3sS7HssWS8jvyZ9Vb73tu9VsGnP2R+/D8fkeGjHYBsfdYD3EztGA/0UW+F3cDeUq+TF/ZmbtOezeH8mWUU7mTt8P5mJzrzPkq6B4Yr0vIJ6kVelx0lPS5v2OZeb5NMO+P8Hxr41BzOhUcLem+8gvFz9GjreWP2YxyfOWB34H2IMzdEv30T+lxqtygXnCvEErTgs4Q==
</data>
</layer>
<layer name="Above" width="15" height="24">
<data encoding="base64" compression="zlib">
eJxjYEAF/EDMxMjAwMyIEONkZKAJYKWDHYTshfHpZT+yXfS0l97gKRNhNdj8jx43tLAXl1vQ+YM5bgi5D5c8KeGLrJ/cvEqMfdQIa2rHFbp/YW7EF64weUIAV7hiUwcAm+4DIQ==
eJxjYEAFnIwMGACbGDUAK5K5tLKDkL0wPr3sR7aLnvbSGzxlIqwGm//R44YW9uJyCzp/MMcNIffhkiclfJH1k5tXibGPGmFN7bhC9y/MjfjCFSZPCOAKV2zqAFlbAxU=
</data>
</layer>
<layer name="Top" width="15" height="24">
<data encoding="base64" compression="zlib">
eJxjYEAFnIwMo2AUjIJRMAoGAQAAPT8ACw==
</data>
</layer>
<layer name="Walkable" width="15" height="24" visible="0">
<layer name="Walkable" width="15" height="24">
<data encoding="base64" compression="zlib">
eJxTYWZgUKEiRgbk6iNVLy57iTGHFIBNHyFzKLETXQ8uNrFuJdVOStxLid3kqiXXXmL0EhPW+NxGjDn0AsSmHVzihPyAKzxokZ4IhTUx8UqMflIAKeUVIXUAzfcWGA==
</data>

View File

@@ -1,59 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
<map version="1.0" orientation="orthogonal" width="6" height="6" tilewidth="32" tileheight="32">
<tileset firstgid="1" name="map_6" tilewidth="32" tileheight="32">
<image source="../drawable/map_6.png"/>
</tileset>
<tileset firstgid="65" name="map_0" tilewidth="32" tileheight="32">
<image source="../drawable/map_0.png"/>
</tileset>
<tileset firstgid="129" name="map_1" tilewidth="32" tileheight="32">
<image source="../drawable/map_1.png"/>
</tileset>
<tileset firstgid="193" name="map_5" tilewidth="32" tileheight="32">
<image source="../drawable/map_5.png"/>
</tileset>
<tileset firstgid="257" name="map_17" tilewidth="32" tileheight="32">
<image source="../drawable/map_17.png"/>
</tileset>
<tileset firstgid="321" name="map_2" tilewidth="32" tileheight="32">
<image source="../drawable/map_2.png"/>
</tileset>
<layer name="Ground" width="6" height="6">
<data encoding="base64" compression="zlib">
eJzjYGBg4MCCQ6AYl3gImhpqiQMAzq8HqQ==
</data>
</layer>
<layer name="Objects" width="6" height="6">
<data encoding="base64" compression="zlib">
eJxbwcDAsAKIy4CYjZGBgYURQi8B8o8B8VqoPEzNJiAuAeKZUHwMKgbCIUh4CgFxZHNBeCFUHABQtBNn
</data>
</layer>
<layer name="Above" width="6" height="6">
<data encoding="base64" compression="zlib">
eJxjYWRgYANiFiCGAVYkNjJgwSEOApw45NiwiIPMB2FOJBpmPgAVtwBZ
</data>
</layer>
<layer name="Walkable" width="6" height="6">
<data encoding="base64" compression="zlib">
eJxLYWRgSMGCsQGYODZ5XPpJEQfRAFH5CEo=
</data>
</layer>
<objectgroup name="Mapevents">
<object name="east" type="mapchange" x="160" y="64" width="32" height="96">
<properties>
<property name="map" value="woodsettlement0"/>
<property name="place" value="west"/>
</properties>
</object>
<object name="gapfillerhole_drop" type="container" x="0" y="64" width="32" height="32"/>
</objectgroup>
<objectgroup name="Spawn">
<object name="vermin" type="spawn" x="32" y="32" width="96" height="64">
<properties>
<property name="spawngroup" value="vermin"/>
</properties>
</object>
</objectgroup>
<objectgroup name="Keys"/>
</map>

View File

@@ -116,7 +116,7 @@
</object>
</objectgroup>
<objectgroup name="Spawn">
<object name="sullengard_innkeeper_spawn" type="spawn" x="288" y="96" width="96" height="128">
<object name="sullengard_innkeeper_spawn" type="spawn" x="288" y="96" width="128" height="128">
<properties>
<property name="spawngroup" value="sullengard_innkeeper"/>
</properties>

View File

@@ -68,12 +68,12 @@
</layer>
<layer name="Objects" width="33" height="20">
<data encoding="base64" compression="zlib">
eJytVrtKQ0EQnXsTUtzKzsc3BDFeif9g0AixSMrYWYg/YZfWRtBCsAhqQGwFS7G2tLASv8M57A452ezmhQeG3dn7OGdnZh8iDntq75nISNuhWlPG+JJJVPW9mtpOLrKbuxY+xtk3lLlrPysiA2331X+uuLEim/w3dFyTlqakEfKldLXpG3APSBd80/AR0QIdLzM0pHTE4oA513WsTxoA+G8cL5o3+ncS12B5sfnZ/O1ZqKORj2MAQMNP5viBS3G5H3rOEfXv8d2SceDxWjb9ft3HAXkofR4QB+Q/Zovwcx2keA19igNgcYkhXAOhvwj4/yX1Gz4OqA/0Gz4Wq3CsqglcXJPgj8WjPT30bziTyVxYPRyrfyDT7aII6zGExZnrATlAff5mTkdtRR3nMl4Xy8DiYHtD4fkP1Y58y/4i8Zi1HizXZT7eJ2xtAuBHvxvRwfz9YJ5cw/b+vHVp4H2S94ee2kkkH2uZq6EUTPesvJW0HgymAeuz8Ptl4c8VxC3ch+chxV9GagRj2KPDPQr8LVneOuLOlGFgOG+6c77drro5ck0YUBdd8q0O6om6tzPF9vbU3SMGi7fVA/yOrwurjRvlvVV7UHuiM35dc7hZcTUYnu2xu0fsPOH65RjYngW7oHk/an9EdbKh/Fv+/nMl8bOd7x4p/lAH3yFY17fX0vKtaTutuG+gwWLP8ee7B3he/T9D/p7/Fzj/ANmJeDM=
eJytVj1LA0EQnbuEFFfZ+fEbghhP4n8waIRYJGXsLMQ/YZfWRtBCsAhqQGwFS7G2tLASf4fz2B3ystnLXYIPht3Z5Pa9nZn9EHHYU3tPRCbajtXaMsWXzKKu/2uo7aQiu6lr4WOcfUOeuvazJjLSdl/955oby5LZuaHjmrS0pRghX5GuLn0D7hHpgm8aPiJaoONlgYYiHbE4YM1NHRuSBgD+G8eL1o3+ncQ1WF5sfbZ++y3U0UqnMQCg4Sdx/MCluNyPPeeE+vf4bsk48Hgjmf9/08cBech9HhAH5D9mVfi5Dop4DUOKA2BxiSHcA6FfBTx/Tv2WjwPqA/2Wj8UqHKtqAhfXJPhj8ejOD/0bzmQ2F1YPx+ofyHxbFWE9hrA4cz0gB6jP38TpaKyo41ym+2IZWBzsbMg8/6HakW/ZrxKPRfvBcp2n03PC9iYAfvT7ER3MPwzWyTVs/y/blwY+J/l8GKidRPKxVjKn6V6Ut5z2g8E0YH9m/rzM/L2CuIXncBmK+PNIjWAMZ3R4RoG/I8tbT9ydMg4M902/5Nvtulsj14QBddEn3+qgWVD3dqfY2V709ojB4m31AL/n68Jq40Z5b9Ue1J7ojl/XHG7WXA2Gd3vs7RG7T7h+OQZ2ZsEuaN2P2p9QnWwo/5Z//1xJ/G7nt0cRf6iD3xCs69tr6fjWtJ3W3DfQYLHn+PPbAzyvfs6Qf+DnAucfafp3yg==
</data>
</layer>
<layer name="Above" width="33" height="20">
<data encoding="base64" compression="zlib">
eJxjYMAEAUDshUUcGbAyYvI5GXHzcQFBHGrqWQjrxWY/ursGGhAbDtSyh1z7cMUDqfbj4g8lQGlYDHX7kd0QCsSxWGhiAaXpQBCqn1x3UKM8EMRjPynhQW44wOICPV2QEg8wd1KjfIgiQ38oEpsUd+NyAyWAXPthYDDlTxibGm4iJS0j2xdOIG3A1N6H0vjSIKztgV6fYavfKPUzGwH9LHjsx+cOaqYPXPUqjE4DiqUzYJbXpJhJCLAQoTYaSgMAm9oSZQ==
eJxjYMAEAUDshUUcGbAyYvI5GXHzcQFBHGrqWQjrxWY/ursGGhAbDtSyh1z7cMUDqfbj4g8lQGlYDHX7kd0QCsSxWGhiAaXpQBCqn1x3UKM8EMRjPynhQW44wOICPV2QEg8wd1KjfIgiQ38oEpsUd+NyAy6QSYQ55NpPijtoDZDdAGJTw02kpGVk+8IJpA2Y2vtQGl8ahLU90OszbPUbpX5mI6CfBY/9+NxBzfSBq16F0WlAsXQGzPKaFDMJARYi1EZDaQALeBLO
</data>
</layer>
<layer name="Top" width="33" height="20">

View File

@@ -71,12 +71,12 @@
</layer>
<layer name="Objects" width="30" height="30">
<data encoding="base64" compression="zlib">
eJytVrFOw0AMdZMugKAgsbEwVJVatVLbIHWDgVKJL2CEAX6EoR/QMR/TH6hY+A8Gtk7AWc1TXNe+pMCTTpfc2X62z7n4loiuG0Q3jXJOEqJpWJ9ROWMP7yyj9ZYp0WnYO6TdmdEP+5MwsnTz/k71AL1+oTdKy72JeI5xZ0LOwqxRPiMeQOpmwgeWY47jME6KWb5rHyyuvJincr+wMXF8hg+aW3OeOnFqn5h7bNiEjPSjL+Q0l9TLS5XoOaOeLG7mGhm513mRer8FbHhc8APrOg8SryHHn3sM2JBrWbJts6f8svAt6moexkPiitJXkH0Mtp7TbfuwkTnfmPUOnYXgGyi+nnh+Cvovjo2cbFhxs2wsRoD96hRyc7EmefcB6yCejuBvF8/rCp/mEV6Z26nas3R6u0su2Fdto618ld+j5tVn6tmx5Ork2YtX55Pzx7GgVs4NW7qeY5xevIxYzBqQXRt5tjiXNb4jQNYZ27dkFhW8OVXHC+xTV4yrwP1mrF80N/OA7PNFzvQZWvUEGfim74qPkM8jskcrjG4hN0y271q2s899zWNc+Mf/tpU6i7umkYgaqNsPAcwb63n+Cu8uRrwWt4TuoxhdJWPVowbqCvFa/RZy9595gE0Zr+63LE7PB/RZw7Tst2IAb9s4Z8DrOwHZX8p+XkKfiaxnq5a9vlOet+dPDPo7slDnfMFt1Z+ErKuWEWeuZr0e80/C82Ml7hCNgzDOIjwx+/cV8jrP/B+6TDbzD0n6fAc=
eJytVrFOw0AMdZMugKBFYmNhqCq1KlLbIHWDgVKJL2CEAX6EoR/QMR/TH6hY+A8Gtk7AWeQprmtfk8KTTpfc2X62z7n4loiuG0Q3jXJOEqJpWJ9ROWMP7yyj9ZYpUTvsHdL2zBiE/UkYWfr7/k7VAL1BoTdKy72JeI5xZ0LOwqxRPiMeQOpmwgeWY47jME6KWb5rHyyuvJincr+wMXF8hg+aW3O2nTi1T8w9NmxCRvoxEHKaS+rlpUr0nFFPFjdzjYzc67xIvX0BGx4X/MC6zoPEa8jxZ40BG3ItSzZt9pVfFr5FXc3DeEhcUfoKso/B1nO6aR82Mucbs96hsxB8l4qvL56fgv6LYyMnG1bcLBuLEWC/uoXcXKxJ3jpgHcTTFfyd4nm9w6d5hFfmdqr2LJ3+9pIL9lXb6Chf5feoefWZenYsuSp59uLV+eT8cSyolTPDlq7nGKcXLyMWswZk10aeLc5lhe8IkHXG9i2ZxQ7enHbHC9SpK8ZV4H4z1s+b5bN1vsiZPkOrniAD3/Rd8RHyeUT2aIXRK+SGyeZdy3bq3Nc8xoV//G9bqbO4a9JeqNoPAcwb63n+Cu8uRrwWt4Tuoxg9JWPVowbqCvFa/RZy9595gE0Zr+63LE7PB/RZw7Tst2IAb8c4Z8DrOwHZX8p+XkKfiaxnq5a9vlOet+dPDPo7slDlfMFt1Z+ErKuWEWeuZr0e80/C82Ml7hCNgzBOIzwx+/c75HWe+T90kfzOP0tje9o=
</data>
</layer>
<layer name="Above" width="30" height="30">
<data encoding="base64" compression="zlib">
eJxjYKA+EAViWSw0McCdEcFuZGFgaGIhrAekDped+NyAbBcMuAKxJxJNyN32aGYgq0e2Gx2A7EZ3kxEzA4MBEAugmUVs2KHbSYo+EPDEIkaqGTA3DFVAjn8pBR8ZIXgUkAb+0ynMXOljDYad2PIjveweCDvp7d+BDuORFL+DGVCj7KWkzUMLu5EBMe0oUtMjIf/SKxzw2YnLDehtPGoAcuKfUruR4xnZLuT4Hoj0iA6IbcdTG6D7l9buoIb58kwQmlB8oadhZBrGJid9AQCfKB0N
eJxjYKA+EAViWSw0McCdEcFuZGFgaGIhrAekDped+NyAbBcMuAKxJxJNyN32aGYgq0e2Gx2A7EZ3kxEzA4MBEAugmUVs2KHbSYo+EPDEIkaqGTA3DFVAjn8pBR8ZIXgUkAb+0ynMXOljDYad2PIjveweCDvp7d+BDuORFL+6A2AnsYAaZS8lbR5a2I0MiGlHkZoeCfmXXuGAz05cbkBv41EDkBP/lNqNHM/IdiHH90CkR3RAbDue2gDdv7R2BzXMl2eC0ITiCz0NI9MwNjnpCwCdvx06
</data>
</layer>
<layer name="Top" width="30" height="30">

View File

@@ -82,7 +82,7 @@
</layer>
<layer name="Objects" width="20" height="29">
<data encoding="base64" compression="zlib">
eJydVblOxDAQTWxDQUezf4GERIEQdHRZoaXIV2SDxA8gpG2QKCkoaOg56t0C+BLEuRyblajooMCzHmsnEx8RT3oaxxm/ORzHfZHMsKuZaS7JJvvCUOnxIpnfXzBWaEo51wC7o7mHz2cYg2NFr+8mYWZJPT+Kgj131TzWWNXf9dCf6th6XOihXgyh+jja6J0L0zcXeBzQsz2AWjKHX5mGOUpMr56l0Xtn/bhhGjHcoXXpgdZtXGKGitSQoV6GenYPQ1pD6R4P0L7g3Afa08B6wEi6xxaveu5N89PzPdk1VctvJabHwfP9r94R5sdrfGDPVO+nXYo1PLJ+Ur1f5uuqbQPpQqn89X4LE++e7UOOtpOacV5/7dUTkTOx7TnzVK9UdS0aG8bLjhgwX8A/OXXnx/OimlTvQse+UuasUh9fvTw3rnepda5ZzTnTy9l6wCYZd1gf+F748oN+UN9J2lwLcdaRW478JtIfsyJ5FZFzPMb/XxU4b1Vgj1y+oPel7bGHU81h0o5T1Dth+fF71t7tgNg9Z+837kc1D6ThoWy+W2PfTZv70uJJNtf78gPYu39VGWtz/gMbE4NV
eJydVblOxDAQTWxDQUezf4GERIEQdHRZoaXIV2SDxA8gpG2QKCkoaOg56t0C+BLEuRyblajooMCzHmsnEx8RT3oaxxm/ORzHfZHMsKuZaS7JJvvCUOnxIpnfXzBWaEo51wC7o7mHz2cYg2NFr+8mYWZJPT+Kgj131TzWWNXf9dCf6th6XOihXgyh+jja6J0L0zcXeBzQsz2AWjKHX5mGOUpMr56l0Xtn/bhhGjHcoXXpgdZtXGKGitSQMT27hyGtoXSPB2hfcO4D7WlgPWAk3WOLVz33pvnp+Z7smqrltxLT4+D5/lfvCPPjNT6wZ6r30y7FGh5ZP6neL/N11baBdKFU/nq/hYl3z/YhR9tJzTivv/bqiciZ2PaceapXqroWjQ3jZUcMmC/gn5y68+N5UU2qd6FjXylztqiPr16eG9e71DrXrOac6eVsPWCTjDusD3wvfPlBP6jvJG2uhTjryC1HfhPpj1mRvIrIOR7j/6oKnLcqsEcuX9D70vbYw6nmMGnHKeqdsPz4PWvvdkDsnrP3G/ejmgfS8FA2362x76bNfWnxJJvrffkB7N2/qoy1Of8BIXeDVg==
</data>
</layer>
<layer name="Above" width="20" height="29">

View File

@@ -66,7 +66,7 @@
eJxjYBj8YB2F+tWo4opRQAkYjQPcYD0DJI0j0zCALM6AJg4CALClBx0=
</data>
</layer>
<layer name="Walkable" width="15" height="16">
<layer name="Walkable" width="15" height="16" visible="0">
<data encoding="base64" compression="zlib">
eJydkVEKACAIQ4PufwsPGgT9DN8mDSQ0dJvWXhcl74Orv9Bco5tD/crlatQ30UVe6M9pJ62/ehSut/OQ8rQD5e20kD+3D+JxHnT+dFfU5/adbp24E9zNyHvCASqmTFQ=
</data>
@@ -79,7 +79,7 @@
</properties>
</object>
</objectgroup>
<objectgroup name="Spawn">
<objectgroup name="Spawn" visible="0">
<object name="yellow_tooth_spawn1" type="spawn" x="96" y="0" width="32" height="32">
<properties>
<property name="spawngroup" value="yellow_tooth"/>
@@ -115,11 +115,6 @@
<property name="spawngroup" value="lava_entity"/>
</properties>
</object>
<object name="queen_lava_entity" type="spawn" x="96" y="64" width="32" height="32">
<properties>
<property name="spawngroup" value="lava_queen_entity"/>
</properties>
</object>
</objectgroup>
<objectgroup name="Keys"/>
<objectgroup name="Replace"/>

View File

@@ -63,7 +63,7 @@
</layer>
<layer name="Walkable" width="25" height="30" visible="0">
<data encoding="base64" compression="zlib">
eJy1lFEKwDAIQwe76u5/hv0OIfGlukIZ1C4x1fjc1/WU/V0uVu+o8yk+4emwEh7FTbAm+On7qvzSe139CKZ7H9ofJFfHQfCTd97SkWhI6qj6r2qZ9H3lc/HvN8XuuJSeiSaXi6sL9UTNW/3/lw6lYYtv0rvu3NV6I/eutqSXifcIB8VOdJzO7RM+MheTdepzNzM6D57ydPhbPic6iAZaL9WvCb6KOT7imcksoB6ZzJqN+UTwXw02bQo=
eJy1lF0KwDAIgwe76u5/hr0WIfHLdIVS6E9iqvG5r+sp8xzurN5R+1N8wtNhJTyKm2BN8NP/VfGl97r8EUz3P7Q+SKyOg+An/7ylI9GQ5FHVX9UyqfvK587PNcWuq/PV1Ms0FsVDPVHjVu//0qE0bPFNatftu1xvxN7lltQy8R7hoNiJjvQ9HUpX1xeT8dXnrmd0HvzK0+Fv+ZzoIBpovlS9JvjqzPERz0x6AfXIpNds9CeC/wLwBW1x
</data>
</layer>
<objectgroup name="Mapevents">
@@ -80,7 +80,7 @@
</properties>
</object>
</objectgroup>
<objectgroup name="Spawn" visible="0">
<objectgroup name="Spawn">
<object name="poisonous_jitterfly_spawn1" type="spawn" x="224" y="64" width="320" height="160">
<properties>
<property name="quantity" value="4"/>

View File

@@ -72,7 +72,7 @@
</layer>
<layer name="Walkable" width="30" height="30" visible="0">
<data encoding="base64" compression="zlib">
eJy9lEsKxDAMQwtz/1vmILMaGEoiPQm3hiwCiqXIn/W5riXOLxTmH0twNFcaLkfDufOBcieeKM42pjymHhBOmufETbBT/US0tD2lchINzQxN9FlaX8KZziKZn4n/EJzKedJC/FO7w3GmfM1/ncdKf8PbznDSp5Ocp7xO20n/7u5qrvQlNZ3yf3dvI60X8Vm9ddyEj/47neP7G+pxi2t7uQnq1xRfGm6GEl3pft3VXmEnPHI7J9m397dEP+m75DhNyYw/dd7k/AKAjHLt
eJy9lEsKxDAMQwu9/y17kFkVhpJITxp3DFkEFEuRP9d5HJc4dyjMN5bgaK40XI6Gc+UD5U48UZxtTHlMPSCcNM+Om2Cn+oloaXtK5SQaJmao8SatL+ntdBbJ/Ez8h+BUzp0W4p/aHY4z5Wv+6zxW+hvedoaTPp3k3OV12nb6V3dXc6UvqemE/yvuXyKtF/FZvXXchI/+O53j5xvqcYtre7kJ6tcUXxpuhhJd6X5d1V5hJzxyOyfZt8+3RD/pu+Q4TcmMv3X+yfkBPqxxHw==
</data>
</layer>
<objectgroup name="Mapevents">

View File

@@ -69,12 +69,12 @@
</tileset>
<layer name="Ground" width="30" height="14">
<data encoding="base64" compression="zlib">
eJzVVMsKgDAM27GfO/wo/UV3E0GhhD5SpwcPgc11adqsSmtNfoKu1muCCudC5jyxJZCLrzsceIbfvfM9gVWLXlucDEYC1G7VpfezflneWbWxvr2pzepB5FdFG9MDnTvyq6ItQ+R99U2xM/jkjXx5D2Nx3pl4nH8vtxeLPWJzeDzImf2fZnFrPQCR72tz
eJzVlMEKgDAMQ3fc5w4/Sn9RbyIolNA2qfPi4cF0kqbNZm+t9Z8wzHolVDQXsebFRui33gg0cA/fR/s7wevFrj1NhYOA3r2+7PNsXl52Xm9qbl9682aQ5VXxpszA1s7yqnhjZNlXz5R6B9kZY5m8zVKdPd53po06We3oW5yRWiPSQU32f5rl8XoCZcVsrw==
</data>
</layer>
<layer name="Objects" width="30" height="14">
<data encoding="base64" compression="zlib">
eJyVVD9LQ0EMz713fSAUOlmhdHHTgmCXojg4COIXcKggOtTFraOIfgShglNnB0Fnq+5dBGdnNwW/g4m5cGl676E/OJKXy//kXQsAvAMo8LSRbwCjiefIxTuhJK8hXXCse53QaQcfVi60BRF1kiuf2znAMdK+4/utnPVr4ZvsXzOYwX0+z4u+YBWiPYFiaR35tlRsLoHjnprY9tsrn4WrvtN9sSD5epDfYE0beN5VnVOM+5ZFma3Fq9y1zxWk+2jXBZ6fnQ2hi3QX/X7iYDZzrnEP6Q7Kxy7WTbJU7iITuoy6Qzy3qlcyp/MgG3neLYLWGzjeEcIS8L6lUFTUa6FnRnHP8tmd1PskGGaxJt2vXqIHVC/t23ewmQYqs+r7GFf+FZ2T5g/yuLukK71oQjVoNnpWv7487/Ek5PEQ9ufRMZU8B6qeDp47x7lqlO2tV7kSqK99pfflY06TIB+r+yvkRy7a6ngN5Su1t4LFEKNu4oq/E5QfKv01xbdhHlIn+ftwbF+GjspX7J6QPuO5QP5F2fYSe2ZRtu8pFCE/+/b9F/YfKnufbO/L3vu/UMEPw2c2Vw==
eJyNVD1LA0EQnc1tDoRAKiOENHYaEEwTFAsLQfwDFhFEi9jYpRTRnyBEsEptIWht1D6NYG1tp+B/cMbZYV82d9EHy9ubnc+duW0SkXdEOa8W7+ukaPA6cvHMWORV5gWnutcFOq3gI5UbNymiJnLwuZ0RHTP3nJ5vZapfDd9i/1qhKdxns3vTN6xStBdILNSx75TN5pI07mkSO/324DN388/wXlKIfD3Ib7imDV7vUOeE475VoiytxUPu6HOFeZ/tOqT9S3sj6DDvst9PbsxmpjXuMe+wfORi3SIryt1kxsusO+B1C3dlfToPsqHX2RKgXt/pjAiWSOetCPmcelNgzyTuWTY9kzhPhkEl1oT31S24A6lX5u072EwCW696Psa1fwVzwv1BFmdXdO0uGjQf0hvs1a8vr3M8Dnk8hPl5dMqWZx/qafO6c5oromxuPeQqkHvtgd6XjzmNg3wE51e8H7poi/Hq4Gvev7MYYtSSuObvhOWHoL8G+xbNwmKIvw+n9un7YmhDvmb3xPzM64L3L2DXLZizFDjvZTENecjvL72/kP5DZe8TvhmCsvf+P2z4AcQ6Nlw=
</data>
</layer>
<layer name="Objects_1" width="30" height="14" visible="0">
@@ -84,12 +84,12 @@
</layer>
<layer name="Above" width="30" height="14">
<data encoding="base64" compression="zlib">
eJzFVDkSgCAMFBwKnuw7tLe20Hfor9RxMkIMOaBwGwQTdtcVuu4fRFffuyp6d/9wBPdyBTRasSn6Dp/PgavFrwaL/661+tVg7vN5JPzCM5fbndfQl99jUJ5KfrncIC9Jm0WPJmvIS6PNAokb50Xh1jZe+0xor/QsWbml3pK29LtK/zHmkDKh6uHO4Pq4Wkojp4nzFF1+h9Wc49o+CwKhkxpxPaX1BOLTEGk=
eJzFU0ESQDAMpKaHPtk7uDs78A5+RcdktJE0iZqxl2ol2V2rTfMPQvu+d1H0bu7i8O3N5dFqxaro212+B64avxrM7nlW61eDqcv3gfALz6XcYl59x7/HoDxxfku5QV6SNoseTdaQl0abBRI3zotC1Dacc0Y0K71LVm6pl9OWftfSf4zvOq6nuKl6mFPqkzRQ55wmyRPlywKJ4wt4pJNbcT2l9QDSFhBX
</data>
</layer>
<layer name="Walkable" width="30" height="14" visible="0">
<layer name="Walkable" width="30" height="14">
<data encoding="base64" compression="zlib">
eJxLYWJgSBnFgxaDwGCyl1z3wAAxaogF1ApDQuaRayc17SU2DJDFcZlNC3sp1YfuXlx6CPmbkH3EAkLhik0tPj9SmjbJMXsoYgBdp4F/
eJxLYWJgSBnFgxaDwGCyl1z3wAAxaogF1ApDQuaRayc17SU2DJDFcZlNC3sp1YfuXkJ6iLWb3DRGqzROatocaRgAjhmGRw==
</data>
</layer>
<layer name="Walkable_1" width="30" height="14" visible="0">
@@ -128,12 +128,6 @@
<object name="sign_wdsetl0_grave2" type="sign" x="128" y="224" width="32" height="32"/>
<object name="sign_wdsetl0_grave3" type="sign" x="160" y="128" width="32" height="32"/>
<object name="algore_killed" type="script" x="896" y="224" width="32" height="64"/>
<object name="west" type="mapchange" x="0" y="320" width="32" height="96">
<properties>
<property name="map" value="gapfillerhole"/>
<property name="place" value="east"/>
</properties>
</object>
</objectgroup>
<objectgroup name="Spawn">
<object name="pig" type="spawn" x="672" y="160" width="128" height="224">

View File

@@ -489,7 +489,6 @@
<map id="way_to_sullengard_east5_filler" x="502" y="555"/>
<map id="way_to_sullengard_east2a" x="502" y="520"/>
<map id="sullengard_ravine2" x="502" y="535"/>
<map id="gapfillerhole" x="194" y="375"/>
<namedarea id="crossglen" name="Crossglen" type="settlement"/>
<namedarea id="crossroads" name="Crossroads Guardhouse" type="other"/>
<namedarea id="charwoodh" name="Charwood" type="settlement"/>