OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Add more settings to control how loot bags are presented

Browse Source
This commit is contained in:
Oskar Wiksten
2013-07-06 15:09:46 +02:00
parent 8db91f0970
commit a0b31542e4
12 changed files with 73 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
AndorsTrail/res/values-de/strings.xml
View File

@@ -255,26 +255,18 @@
<string-array name="preferences_display_loot">
<item>Beute-Dialog anzeigen</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Kurze Nachricht</item>
<item>Show short notification only when finding items</item>
<item>Nicht anzeigen</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Sofort (keine Animation)</item>
<item>Schnell</item>
<item>Normal</item>
<item>Langsam</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Bewegung</string>
<string name="preferences_movementmethod_title">Bewegungsmethode</string>
@@ -283,10 +275,6 @@
<item>Direkt (original)</item>
<item>Hindernisse umgehen</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -323,11 +311,6 @@
<item>1,5-fache Größe</item>
<item>Doppelte Größe</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">Quickslot zuweisen</string>
<string name="inventory_assign_slot1">Quickslot 1</string>
@@ -354,17 +337,6 @@
<item>Obere rechte Ecke</item>
<item>Oben in der Mitte</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">andauernder Effekt</string>
<string name="actorconditioninfo_effect_every_round">Jede Runde</string>
@@ -549,11 +521,6 @@
<item>Nur dann eine Bestätigung anzeigen, wenn ein anderer Spielername überschrieben wird</item>
<item>Nie eine Bestätigung anzeigen</item>
</string-array>
<string-array name="preferences_display_overwrite_savegame_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string name="preferences_dialog_overwrite_savegame_title">Bestätige das Überschreiben von Spielständen</string>
<string name="preferences_dialog_overwrite_savegame">Zeigt eine Frage an ob beim Speichern auf einen bereits existierenden Spielstand dieser überschrieben werden soll.</string>

34
AndorsTrail/res/values-fr/strings.xml
View File

@@ -248,26 +248,18 @@
<string-array name="preferences_display_loot">
<item>Afficher la boîte de dialogue des butins</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Afficher une simple notification</item>
<item>Show short notification only when finding items</item>
<item>Ne rien afficher</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Instantanée (pas d\'animations)</item>
<item>Rapide</item>
<item>Normale</item>
<item>Lente</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Déplacement</string>
<string name="preferences_movementmethod_title">Méthode de déplacement</string>
@@ -276,10 +268,6 @@
<item>Tout droit</item>
<item>Éviter les obstacles</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -320,11 +308,6 @@
<item>Zoom de 150%</item>
<item>Zoom de 200%</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">Affecter un emplacement rapide</string>
<string name="inventory_assign_slot1">Emplacement 1</string>
@@ -352,17 +335,6 @@
<item>En haut à droite</item>
<item>Centrée en haut</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">Effet continu</string>
<string name="actorconditioninfo_effect_every_round">À chaque tour</string>

23
AndorsTrail/res/values-it/strings.xml
View File

@@ -246,26 +246,18 @@
<string-array name="preferences_display_loot">
<item>Mostra il resoconto del bottino</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Mostra notifica corta</item>
<item>Show short notification only when finding items</item>
<item>Non mostrare</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Istantanea (nessuna animazione)</item>
<item>Veloce</item>
<item>Normale</item>
<item>Lenta</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Movimento</string>
<string name="preferences_movementmethod_title">Tipo di movimento</string>
@@ -274,10 +266,6 @@
<item>Diritto (originale)</item>
<item>Direzionale</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -314,11 +302,6 @@
<item>1.5x normale</item>
<item>Raddoppia</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<!-- =========================================== -->
<!-- Added in v0.7.0 -->

34
AndorsTrail/res/values-ja/strings.xml
View File

@@ -261,26 +261,18 @@
<string-array name="preferences_display_loot">
<item>ダイアログボックスを表示</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>短い通知を表示</item>
<item>Show short notification only when finding items</item>
<item>表示なし</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>即時（アニメーションなし）</item>
<item>速い</item>
<item>普通</item>
<item>遅い</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">移動</string>
<string name="preferences_movementmethod_title">移動方法</string>
@@ -289,10 +281,6 @@
<item>直進 (original)</item>
<item>障害物を回避する</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -329,11 +317,6 @@
<item>1.5x</item>
<item>2.0x</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">クイック・スロットに入れる</string>
<string name="inventory_assign_slot1">Slot 1</string>
@@ -360,17 +343,6 @@
<item>右上</item>
<item>上</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">状態変化を受けている間</string>
<string name="actorconditioninfo_effect_every_round">ラウンドごとに</string>

39
AndorsTrail/res/values-pl/strings.xml
View File

@@ -257,26 +257,18 @@ Translated by toudi5-bełchatów
<string-array name="preferences_display_loot">
<item>Pokaż okienko zdobytych przedmiotów</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Pokaż krótką informacje</item>
<item>Show short notification only when finding items</item>
<item>Nie wyświetlaj</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Natychmiastowe (bez animacji)</item>
<item>Szybkie</item>
<item>Normalne</item>
<item>Wolne</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Ruch</string>
<string name="preferences_movementmethod_title">Metoda poruszania się</string>
@@ -285,10 +277,6 @@ Translated by toudi5-bełchatów
<item>Prosta (oryginalna)</item>
<item>Omijanie obiektów</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -325,11 +313,6 @@ Translated by toudi5-bełchatów
<item>1.5x powiększony</item>
<item>Podwójnie powiększony</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">Przypisz szybki slot</string>
<string name="inventory_assign_slot1">Slot 1</string>
@@ -356,17 +339,6 @@ Translated by toudi5-bełchatów
<item>Prawy górny róg</item>
<item>Na górze po środku</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">Stały efekt</string>
<string name="actorconditioninfo_effect_every_round">Co turę</string>
@@ -551,11 +523,6 @@ Translated by toudi5-bełchatów
<item>Pokazuj tylko, gdy nadpisuję plik z innym imieniem bohatera</item>
<item>Nigdy nie pokazuj okienka potwierdzeń</item>
</string-array>
<string-array name="preferences_display_overwrite_savegame_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string name="preferences_dialog_overwrite_savegame_title">Potwierdź nadpisanie gry</string>
<string name="preferences_dialog_overwrite_savegame">Zadaje pytanie zawsze, gdy chcesz nadpisać grę na slocie, który jest już zajęty.</string>

39
AndorsTrail/res/values-pt-rBR/strings.xml
View File

@@ -256,26 +256,18 @@
<string-array name="preferences_display_loot">
<item>Mostrar caixa de diálogo com despojos</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Mostrar notificação curta</item>
<item>Show short notification only when finding items</item>
<item>Não mostrar</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Instantânea (sem animações)</item>
<item>Rápida</item>
<item>Normal</item>
<item>Lenta</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Deslocamento</string>
<string name="preferences_movementmethod_title">Método de deslocamento</string>
@@ -284,10 +276,6 @@
<item>Linha reta (modo padrão)</item>
<item>Contornar obstáculos</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -324,11 +312,6 @@
<item>1.5x o tamanho</item>
<item>Dobro do tamanho</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">Atribuir posição rápida</string>
<string name="inventory_assign_slot1">Posição 1</string>
@@ -355,17 +338,6 @@
<item>Canto superior direito</item>
<item>Cima</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">Efeito constante</string>
<string name="actorconditioninfo_effect_every_round">Todos os turnos</string>
@@ -551,11 +523,6 @@
<item>Mostra apenas quando sobre-estcrevendo em cima de salvamento de outro jogador</item>
<item>Nunca mostra diálogo de confirmação</item>
</string-array>
<string-array name="preferences_display_overwrite_savegame_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string name="preferences_dialog_overwrite_savegame_title">Confirma re-escrita de salvamento</string>
<string name="preferences_dialog_overwrite_savegame">Pergunta o que deve ser feito caso tente-se gravar sobre um salvamento anterior.</string>

34
AndorsTrail/res/values-pt/strings.xml
View File

@@ -255,26 +255,18 @@
<string-array name="preferences_display_loot">
<item>Mostrar caixa de diálogo com despojos</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Mostrar notificação curta</item>
<item>Show short notification only when finding items</item>
<item>Não mostrar</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Instantânea (sem animações)</item>
<item>Rápida</item>
<item>Normal</item>
<item>Lenta</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Deslocação</string>
<string name="preferences_movementmethod_title">Método de deslocação</string>
@@ -283,10 +275,6 @@
<item>Linha recta (original)</item>
<item>Contornar obstáculos</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -323,11 +311,6 @@
<item>1.5x o tamanho</item>
<item>Dobro do tamanho</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">Atribuir posição rápida</string>
<string name="inventory_assign_slot1">Posição 1</string>
@@ -354,17 +337,6 @@
<item>Canto superior direito</item>
<item>Cima</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">Efeito constante</string>
<string name="actorconditioninfo_effect_every_round">Todos os turnos</string>

34
AndorsTrail/res/values-ru/strings.xml
View File

@@ -255,26 +255,18 @@
<string-array name="preferences_display_loot">
<item>Показывать диалог</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Короткое уведомление</item>
<item>Show short notification only when finding items</item>
<item>Не показывать</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">
<item>Мгновенно (без анимации)</item>
<item>Быстро</item>
<item>Нормально</item>
<item>Медленно</item>
</string-array>
<string-array name="preferences_attackspeed_values">
<item>0</item>
<item>400</item>
<item>1000</item>
<item>1500</item>
</string-array>
<string name="preferences_movement_category">Движение</string>
<string name="preferences_movementmethod_title">Способ движения</string>
@@ -283,10 +275,6 @@
<item>Прямо (базовый)</item>
<item>Обходить препятствия</item>
</string-array>
<string-array name="preferences_movementmethod_values">
<item>0</item>
<item>1</item>
</string-array>
<!-- =========================================== -->
@@ -323,11 +311,6 @@
<item>Крупнее в 1.5 раза</item>
<item>Двойной размер</item>
</string-array>
<string-array name="preferences_display_scaling_factor_values">
<item>1.0f</item>
<item>1.5f</item>
<item>2.0f</item>
</string-array>
<string name="inventory_assign">Назначить быстрый слот</string>
<string name="inventory_assign_slot1">Слот №1</string>
@@ -354,17 +337,6 @@
<item>Правый верхний угол</item>
<item>Сверху в центре</item>
</string-array>
<string-array name="preferences_movement_dpad_positions_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string name="actorconditioninfo_constant_effect">Постоянный эффект</string>
<string name="actorconditioninfo_effect_every_round">Каждый ход</string>

10
AndorsTrail/res/values/strings.xml
View File

@@ -254,13 +254,19 @@
<string name="preferences_combat_speed">Determines how fast monsters attack.</string>
<string-array name="preferences_display_loot">
<item>Show loot dialog box</item>
<item>Always show loot dialog box</item>
<item>Show loot dialog box when finding items</item>
<item>Show loot dialog box when finding items, short notification otherwise</item>
<item>Show short notification</item>
<item>Do not display</item>
<item>Show short notification only when finding items</item>
<item>Do not display</item>
</string-array>
<string-array name="preferences_display_loot_values">
<item>0</item>
<item>3</item>
<item>4</item>
<item>1</item>
<item>5</item>
<item>2</item>
</string-array>
<string-array name="preferences_attackspeed">

11
AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
View File

@@ -5,8 +5,11 @@ import android.content.SharedPreferences;
import android.preference.PreferenceManager;
public final class AndorsTrailPreferences {
public static final int DISPLAYLOOT_DIALOG = 0;
public static final int DISPLAYLOOT_DIALOG_ALWAYS = 0;
public static final int DISPLAYLOOT_DIALOG_FOR_ITEMS = 3;
public static final int DISPLAYLOOT_DIALOG_FOR_ITEMS_ELSE_TOAST = 4;
public static final int DISPLAYLOOT_TOAST = 1;
public static final int DISPLAYLOOT_TOAST_FOR_ITEMS = 5;
public static final int DISPLAYLOOT_NONE = 2;
public static final int MOVEMENTMETHOD_STRAIGHT = 0;
public static final int MOVEMENTMETHOD_DIRECTIONAL = 1;
@@ -35,7 +38,7 @@ public final class AndorsTrailPreferences {
public boolean confirmRest = true;
public boolean confirmAttack = true;
public int displayLoot = DISPLAYLOOT_DIALOG;
public int displayLoot = DISPLAYLOOT_DIALOG_ALWAYS;
public boolean fullscreen = true;
public int attackspeed_milliseconds = 1000;
public int movementMethod = MOVEMENTMETHOD_STRAIGHT;
@@ -54,7 +57,7 @@ public final class AndorsTrailPreferences {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
dest.confirmRest = prefs.getBoolean("confirm_rest", true);
dest.confirmAttack = prefs.getBoolean("confirm_attack", true);
dest.displayLoot = Integer.parseInt(prefs.getString("display_lootdialog", Integer.toString(DISPLAYLOOT_DIALOG)));
dest.displayLoot = Integer.parseInt(prefs.getString("display_lootdialog", Integer.toString(DISPLAYLOOT_DIALOG_ALWAYS)));
dest.fullscreen = prefs.getBoolean("fullscreen", true);
dest.attackspeed_milliseconds = Integer.parseInt(prefs.getString("attackspeed", "1000"));
dest.movementMethod = Integer.parseInt(prefs.getString("movementmethod", Integer.toString(MOVEMENTMETHOD_STRAIGHT)));
@@ -71,7 +74,7 @@ public final class AndorsTrailPreferences {
} catch (Exception e) {
dest.confirmRest = true;
dest.confirmAttack = true;
dest.displayLoot = DISPLAYLOOT_DIALOG;
dest.displayLoot = DISPLAYLOOT_DIALOG_ALWAYS;
dest.fullscreen = true;
dest.attackspeed_milliseconds = 1000;
dest.movementMethod = MOVEMENTMETHOD_STRAIGHT;

18
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

@@ -369,11 +369,23 @@ public final class MainActivity extends Activity implements PlayerMovementListen
@Override
public void onPlayerPickedUpGroundLoot(Loot loot) {
if (controllers.preferences.displayLoot == AndorsTrailPreferences.DISPLAYLOOT_NONE) return;
if (!showToastForPickedUpItems(loot)) return;
final String msg = Dialogs.getGroundLootPickedUpMessage(this, loot);
showToast(msg, Toast.LENGTH_LONG);
}
private boolean showToastForPickedUpItems(Loot loot) {
switch (controllers.preferences.displayLoot) {
case AndorsTrailPreferences.DISPLAYLOOT_TOAST:
case AndorsTrailPreferences.DISPLAYLOOT_DIALOG_FOR_ITEMS_ELSE_TOAST:
return true;
case AndorsTrailPreferences.DISPLAYLOOT_TOAST_FOR_ITEMS:
return loot.hasItems();
}
return false;
}
@Override
public void onPlayerFoundMonsterLoot(Collection<Loot> loot, int exp) {
final Loot combinedLoot = Loot.combine(loot);
@@ -384,8 +396,10 @@ public final class MainActivity extends Activity implements PlayerMovementListen
@Override
public void onPlayerPickedUpMonsterLoot(Collection<Loot> loot, int exp) {
if (controllers.preferences.displayLoot == AndorsTrailPreferences.DISPLAYLOOT_NONE) return;
final Loot combinedLoot = Loot.combine(loot);
if (!showToastForPickedUpItems(combinedLoot)) return;
final String msg = Dialogs.getMonsterLootPickedUpMessage(this, combinedLoot, exp);
showToast(msg, Toast.LENGTH_LONG);
}

22
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
View File

@@ -97,7 +97,7 @@ public final class ItemController {
}
public void playerSteppedOnLootBag(Loot loot) {
if (loot.isVisible && pickupLootBagWithoutConfirmation()) {
if (pickupLootBagWithoutConfirmation(loot)) {
controllers.mapController.worldEventListeners.onPlayerPickedUpGroundLoot(loot);
pickupAll(loot);
removeLootBagIfEmpty(loot);
@@ -108,7 +108,7 @@ public final class ItemController {
}
public void lootMonsterBags(Collection<Loot> killedMonsterBags, int totalExpThisFight) {
if (pickupLootBagWithoutConfirmation() || !Loot.hasItems(killedMonsterBags)) {
if (pickupLootBagsWithoutConfirmation(killedMonsterBags)) {
controllers.mapController.worldEventListeners.onPlayerPickedUpMonsterLoot(killedMonsterBags, totalExpThisFight);
pickupAll(killedMonsterBags);
removeLootBagIfEmpty(killedMonsterBags);
@@ -119,8 +119,22 @@ public final class ItemController {
}
}
private boolean pickupLootBagWithoutConfirmation() {
if (controllers.preferences.displayLoot == AndorsTrailPreferences.DISPLAYLOOT_DIALOG) return false;
private boolean pickupLootBagWithoutConfirmation(Loot bag) {
if (bag.isContainer()) return false;
switch (controllers.preferences.displayLoot) {
case AndorsTrailPreferences.DISPLAYLOOT_DIALOG_ALWAYS:
return false;
case AndorsTrailPreferences.DISPLAYLOOT_DIALOG_FOR_ITEMS:
case AndorsTrailPreferences.DISPLAYLOOT_DIALOG_FOR_ITEMS_ELSE_TOAST:
if (bag.hasItems()) return false;
}
return true;
}
private boolean pickupLootBagsWithoutConfirmation(Collection<Loot> bags) {
for(Loot bag : bags) {
if (!pickupLootBagWithoutConfirmation(bag)) return false;
}
return true;
}