diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java index ac73f2b7f..b76881a0a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java @@ -1,13 +1,12 @@ package com.gpl.rpg.AndorsTrail; -import com.gpl.rpg.AndorsTrail.context.ControllerContext; -import com.gpl.rpg.AndorsTrail.context.WorldContext; - import android.app.Activity; import android.app.Application; import android.content.Context; import android.view.Window; import android.view.WindowManager; +import com.gpl.rpg.AndorsTrail.context.ControllerContext; +import com.gpl.rpg.AndorsTrail.context.WorldContext; public final class AndorsTrailApplication extends Application { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java index 6264f9809..001cec802 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java @@ -1,17 +1,16 @@ package com.gpl.rpg.AndorsTrail; -import java.lang.ref.WeakReference; - import android.content.Context; import android.content.res.Resources; import android.os.AsyncTask; - import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.model.ModelContainer; import com.gpl.rpg.AndorsTrail.resource.ResourceLoader; import com.gpl.rpg.AndorsTrail.savegames.Savegames; +import java.lang.ref.WeakReference; + public final class WorldSetup { private final WorldContext world; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java index de34fea2d..d65ecc1d0 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java @@ -11,7 +11,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java index e58a3d9e1..2fbb327e3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java @@ -4,12 +4,11 @@ import android.content.res.Resources; import android.os.Bundle; import android.view.View; -import android.view.Window; import android.view.View.OnClickListener; +import android.view.Window; import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.WorldContext; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java index d6058eaab..da9238ad9 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java @@ -17,7 +17,6 @@ import android.widget.EditText; import android.widget.SeekBar; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.WorldContext; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java index 731ef2d10..905f327ef 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java @@ -24,10 +24,10 @@ import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.ConversationController; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply; import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.Player; +import com.gpl.rpg.AndorsTrail.model.conversation.Reply; import com.gpl.rpg.AndorsTrail.model.item.Loot; import com.gpl.rpg.AndorsTrail.model.quest.Quest; import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java index 741f35548..036e6e73c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java @@ -7,15 +7,12 @@ import android.widget.Button; import android.widget.RelativeLayout; import android.widget.Toast; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; -import java.lang.ref.WeakReference; - @SuppressWarnings("unused") public final class DebugInterface { private final ControllerContext controllerContext; @@ -46,8 +43,7 @@ public void onClick(View arg0) { /*,new DebugButton("dmg=1", new OnClickListener() { @Override public void onClick(View arg0) { - world.model.player.traits.combatTraits.set(1, 1); - mainActivity.updateStatus(); + world.model.player.damagePotential.set(1, 1); showToast(mainActivity, "DEBUG: damagePotential=1", Toast.LENGTH_SHORT); } })*/ @@ -67,53 +63,19 @@ public void onClick(View arg0) { world.model.player.inventory.addItem(world.itemTypes.getItemType("bwm_leather_cap")); world.model.player.inventory.addItem(world.itemTypes.getItemType("chaosreaper")); - mainActivity.updateStatus(); showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT); } })*/ - /*new DebugButton("skills++", new OnClickListener() { - @Override - public void onClick(View arg0) { - int N = 1; - world.model.player.availableSkillIncreases += N * SkillCollection.NUM_SKILLS; - for(int j = 0; j < N; ++j) { - for(int i = 0; i < SkillCollection.NUM_SKILLS; ++i) { - world.model.player.addSkillLevel(i); - } - } - ActorStatsController.recalculatePlayerCombatTraits(world.model.player); - updateStatus(); - showToast(mainActivity, "DEBUG: all skills raised " + N + " levels", Toast.LENGTH_SHORT); - } - })*/ - /*,new DebugButton("bwm", new OnClickListener() { - @Override - public void onClick(View arg0) { - Player player = world.model.player; - player.addQuestProgress(new QuestProgress("bwm_agent", 1)); - player.addQuestProgress(new QuestProgress("bwm_agent", 5)); - player.addQuestProgress(new QuestProgress("bwm_agent", 10)); - player.addQuestProgress(new QuestProgress("bwm_agent", 20)); - player.addQuestProgress(new QuestProgress("bwm_agent", 25)); - player.addQuestProgress(new QuestProgress("bwm_agent", 30)); - player.addQuestProgress(new QuestProgress("bwm_agent", 40)); - player.addQuestProgress(new QuestProgress("bwm_agent", 50)); - player.addQuestProgress(new QuestProgress("bwm_agent", 60)); - - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "blackwater_mountain45", "south", 0, 0); - } - })*/ /*,new DebugButton("prim", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "blackwater_mountain29", "south", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain29", "south", 0, 0); } })*/ /*,new DebugButton("exp+=10000", new OnClickListener() { @Override public void onClick(View arg0) { - world.model.player.addExperience(10000); - mainActivity.updateStatus(); + controllerContext.actorStatsController.addExperience(10000); showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT); } })*/ @@ -140,41 +102,40 @@ public void onClick(View arg0) { ,new DebugButton("cg", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "crossglen", "hall", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossglen", "hall", 0, 0); } }) ,new DebugButton("vg", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "vilegard_s", "tavern", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "vilegard_s", "tavern", 0, 0); } }) ,new DebugButton("cr", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "houseatcrossroads4", "down", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "houseatcrossroads4", "down", 0, 0); } }) ,new DebugButton("lf", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "loneford9", "south", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford9", "south", 0, 0); } }) ,new DebugButton("fh", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "fallhaven_ne", "clothes", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_ne", "clothes", 0, 0); } }) ,new DebugButton("rc", new OnClickListener() { @Override public void onClick(View arg0) { - controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "roadtocarntower1", "left3", 0, 0); + controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "roadtocarntower1", "left3", 0, 0); } }) */ - }); } diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java index e5aea4d81..db19f5dde 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java @@ -1,7 +1,5 @@ package com.gpl.rpg.AndorsTrail.activity; -import java.io.File; - import android.annotation.SuppressLint; import android.app.Activity; import android.os.Bundle; @@ -10,7 +8,6 @@ import android.webkit.WebView; import android.widget.Button; import android.widget.Toast; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.WorldContext; @@ -19,6 +16,8 @@ import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap; import com.gpl.rpg.AndorsTrail.util.L; +import java.io.File; + public final class DisplayWorldMapActivity extends Activity { private WorldContext world; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java index f212b09cc..fd5bc7023 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java @@ -4,11 +4,10 @@ import android.content.res.Resources; import android.os.Bundle; import android.view.View; -import android.view.Window; import android.view.View.OnClickListener; +import android.view.Window; import android.widget.Button; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.ControllerContext; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java index 2ac5dd1af..d62782d42 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java @@ -1,8 +1,5 @@ package com.gpl.rpg.AndorsTrail.activity; -import java.util.Collections; -import java.util.List; - import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; @@ -14,13 +11,15 @@ import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.model.ModelContainer; import com.gpl.rpg.AndorsTrail.savegames.Savegames; import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader; -import com.gpl.rpg.AndorsTrail.model.ModelContainer; + +import java.util.Collections; +import java.util.List; public final class LoadSaveActivity extends Activity implements OnClickListener { private boolean isLoading = true; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java index 029d996af..c5b565656 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java @@ -5,16 +5,15 @@ import android.app.Dialog; import android.app.ProgressDialog; import android.content.DialogInterface; -import android.content.Intent; import android.content.DialogInterface.OnDismissListener; +import android.content.Intent; import android.os.Bundle; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.savegames.Savegames; import com.gpl.rpg.AndorsTrail.WorldSetup; import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener; import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener; +import com.gpl.rpg.AndorsTrail.savegames.Savegames; public final class LoadingActivity extends Activity implements OnResourcesLoadedListener, OnSceneLoadedListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java index 1c46686bc..3502d2810 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java @@ -15,13 +15,13 @@ import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; +import com.gpl.rpg.AndorsTrail.controller.AttackResult; import com.gpl.rpg.AndorsTrail.controller.CombatController; import com.gpl.rpg.AndorsTrail.controller.MovementController; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListener; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListener; import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListener; import com.gpl.rpg.AndorsTrail.controller.listeners.WorldEventListener; -import com.gpl.rpg.AndorsTrail.model.AttackResult; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.Player; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java index 09fcea2c0..39f759644 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java @@ -3,13 +3,12 @@ import android.app.Activity; import android.os.Bundle; import android.view.View; -import android.view.Window; import android.view.View.OnClickListener; +import android.view.Window; import android.widget.Button; import android.widget.TextView; - -import com.gpl.rpg.AndorsTrail.Dialogs; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; +import com.gpl.rpg.AndorsTrail.Dialogs; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java index 87217fb0a..c72d6ff7a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java @@ -1,9 +1,8 @@ package com.gpl.rpg.AndorsTrail.activity; -import com.gpl.rpg.AndorsTrail.R; - import android.os.Bundle; import android.preference.PreferenceActivity; +import com.gpl.rpg.AndorsTrail.R; public final class Preferences extends PreferenceActivity { @Override diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java index 85c22ac77..549e3c242 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java @@ -1,16 +1,5 @@ package com.gpl.rpg.AndorsTrail.activity; -import android.widget.*; -import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; -import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; -import com.gpl.rpg.AndorsTrail.Dialogs; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.savegames.Savegames; -import com.gpl.rpg.AndorsTrail.WorldSetup; -import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader; -import com.gpl.rpg.AndorsTrail.controller.Constants; -import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; - import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; @@ -21,6 +10,15 @@ import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; +import android.widget.Toast; +import com.gpl.rpg.AndorsTrail.*; +import com.gpl.rpg.AndorsTrail.controller.Constants; +import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; +import com.gpl.rpg.AndorsTrail.savegames.Savegames; +import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader; public final class StartScreenActivity extends Activity { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java index 6b0f110f5..4a3bc50b9 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java @@ -1,23 +1,11 @@ package com.gpl.rpg.AndorsTrail.context; -import java.lang.ref.WeakReference; - import android.content.res.Resources; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; -import com.gpl.rpg.AndorsTrail.controller.ActorStatsController; -import com.gpl.rpg.AndorsTrail.controller.CombatController; -import com.gpl.rpg.AndorsTrail.controller.MapController; -import com.gpl.rpg.AndorsTrail.controller.ConversationController; -import com.gpl.rpg.AndorsTrail.controller.GameRoundController; -import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController; -import com.gpl.rpg.AndorsTrail.controller.SkillController; -import com.gpl.rpg.AndorsTrail.controller.VisualEffectController; -import com.gpl.rpg.AndorsTrail.controller.ItemController; -import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController; -import com.gpl.rpg.AndorsTrail.controller.MovementController; -import com.gpl.rpg.AndorsTrail.controller.InputController; +import com.gpl.rpg.AndorsTrail.controller.*; + +import java.lang.ref.WeakReference; public final class ControllerContext { //Controllers diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java index 4e70f4b5a..c401fcbbd 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java @@ -1,7 +1,5 @@ package com.gpl.rpg.AndorsTrail.context; -import com.gpl.rpg.AndorsTrail.VisualEffectCollection; -import com.gpl.rpg.AndorsTrail.conversation.ConversationLoader; import com.gpl.rpg.AndorsTrail.model.ModelContainer; import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; @@ -11,6 +9,8 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection; import com.gpl.rpg.AndorsTrail.model.map.MapCollection; import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection; +import com.gpl.rpg.AndorsTrail.resource.ConversationLoader; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; public final class WorldContext { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java index 8515ebacd..b6c2f0d6c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java @@ -1,11 +1,10 @@ package com.gpl.rpg.AndorsTrail.controller; -import java.util.ArrayList; - -import com.gpl.rpg.AndorsTrail.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.model.listeners.PlayerStatsListeners; +import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListeners; +import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListeners; +import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerStatsListeners; import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect; import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType; @@ -19,10 +18,11 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip; import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; import com.gpl.rpg.AndorsTrail.model.item.ItemType; -import com.gpl.rpg.AndorsTrail.model.listeners.ActorConditionListeners; -import com.gpl.rpg.AndorsTrail.model.listeners.ActorStatsListeners; -import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea; +import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection; + +import java.util.ArrayList; public final class ActorStatsController { private final ControllerContext controllers; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/AttackResult.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java similarity index 91% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/AttackResult.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java index 32a399762..dc62a743f 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/AttackResult.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model; +package com.gpl.rpg.AndorsTrail.controller; public final class AttackResult { public final boolean isHit; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java index f70eb45fc..df2369bcd 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java @@ -4,14 +4,12 @@ import android.os.Message; import android.util.FloatMath; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; -import com.gpl.rpg.AndorsTrail.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectCompletedCallback; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListeners; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListeners; -import com.gpl.rpg.AndorsTrail.model.AttackResult; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.model.actor.Monster; @@ -20,6 +18,7 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; import com.gpl.rpg.AndorsTrail.model.item.Loot; import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.util.Coord; import java.util.ArrayList; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java index 6d2bc4392..b5782ae34 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java @@ -1,11 +1,11 @@ package com.gpl.rpg.AndorsTrail.controller; -import java.util.Random; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.util.ConstRange; import com.gpl.rpg.AndorsTrail.util.Range; +import java.util.Random; + public final class Constants { public static final int PERCENT_EXP_LOST_WHEN_DIED = 30; public static final int LEVELUP_EFFECT_HEALTH = 5; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java index 141114764..6112ee9ab 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java @@ -1,18 +1,14 @@ package com.gpl.rpg.AndorsTrail.controller; import android.content.res.Resources; -import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; +import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.conversation.ConversationCollection; -import com.gpl.rpg.AndorsTrail.conversation.Phrase; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Requirement; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reward; import com.gpl.rpg.AndorsTrail.model.ability.*; import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.Player; +import com.gpl.rpg.AndorsTrail.model.conversation.*; import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection; import com.gpl.rpg.AndorsTrail.model.item.Loot; import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java index 02a3f3431..c97cbec6b 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java @@ -4,7 +4,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; - import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.util.Coord; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java index 79bf02353..f001a6ef4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java @@ -2,13 +2,13 @@ import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListeners; import com.gpl.rpg.AndorsTrail.controller.PathFinder.EvaluateWalkable; +import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListeners; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; import com.gpl.rpg.AndorsTrail.model.actor.Monster; +import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; import com.gpl.rpg.AndorsTrail.model.map.MapObject; -import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.Coord; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java index 5c96ee7f2..8894a98ae 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java @@ -2,7 +2,6 @@ import android.content.res.Resources; import android.os.AsyncTask; - import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; @@ -11,11 +10,7 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.Player; import com.gpl.rpg.AndorsTrail.model.item.Loot; -import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; -import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; -import com.gpl.rpg.AndorsTrail.model.map.MapObject; -import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator; +import com.gpl.rpg.AndorsTrail.model.map.*; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.L; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java index deaa18945..be32ef6d3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java @@ -1,10 +1,10 @@ package com.gpl.rpg.AndorsTrail.controller; -import java.util.Arrays; - import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.CoordRect; +import java.util.Arrays; + public class PathFinder { private final int maxWidth; private final int maxHeight; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java index 5c42bf2d4..3b2615b8c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java @@ -1,10 +1,8 @@ package com.gpl.rpg.AndorsTrail.controller; -import com.gpl.rpg.AndorsTrail.context.ControllerContext; import android.util.FloatMath; - +import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.model.AttackResult; import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect; import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; @@ -13,11 +11,11 @@ import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.Player; +import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem; import com.gpl.rpg.AndorsTrail.model.item.Inventory; import com.gpl.rpg.AndorsTrail.model.item.ItemCategory; import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection; -import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem; import com.gpl.rpg.AndorsTrail.util.ConstRange; public final class SkillController { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java index bff5fb753..63812e7ab 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java @@ -4,15 +4,14 @@ import android.graphics.Paint; import android.graphics.Paint.Align; import android.os.Handler; - -import com.gpl.rpg.AndorsTrail.VisualEffectCollection; -import com.gpl.rpg.AndorsTrail.VisualEffectCollection.VisualEffect; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.listeners.VisualEffectFrameListeners; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection.VisualEffect; import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.CoordRect; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java index 686416355..edfa45c09 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java @@ -1,11 +1,5 @@ package com.gpl.rpg.AndorsTrail.controller; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.*; - import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -16,12 +10,14 @@ import android.os.AsyncTask; import android.os.Environment; import android.widget.Toast; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.model.map.*; +import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; +import com.gpl.rpg.AndorsTrail.model.map.MapLayer; +import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; +import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment; import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea; import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; @@ -30,6 +26,14 @@ import com.gpl.rpg.AndorsTrail.util.L; import com.gpl.rpg.AndorsTrail.util.Size; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + public final class WorldMapController { private static final int WORLDMAP_SCREENSHOT_TILESIZE = 8; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java similarity index 91% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListener.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java index 6db177052..0eeb1f13e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListener.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model.listeners; +package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; import com.gpl.rpg.AndorsTrail.model.actor.Actor; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java similarity index 98% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java index 5eb62fb77..62b28acf8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model.listeners; +package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; import com.gpl.rpg.AndorsTrail.model.actor.Actor; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java similarity index 84% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListener.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java index a1cc6befa..b73047249 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListener.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model.listeners; +package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Actor; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java similarity index 97% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java index bf8fec790..8bc068183 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model.listeners; +package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.util.ListOfListeners; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java index ae8840f81..a65ba89d5 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java @@ -1,6 +1,6 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; -import com.gpl.rpg.AndorsTrail.model.AttackResult; +import com.gpl.rpg.AndorsTrail.controller.AttackResult; import com.gpl.rpg.AndorsTrail.model.actor.Monster; public interface CombatActionListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java index d823ec2b5..0183b1d83 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java @@ -1,6 +1,6 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; -import com.gpl.rpg.AndorsTrail.model.AttackResult; +import com.gpl.rpg.AndorsTrail.controller.AttackResult; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.util.ListOfListeners; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java index d634b1ee1..2a72058e4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java @@ -1,8 +1,8 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Monster; -import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import com.gpl.rpg.AndorsTrail.util.Coord; +import com.gpl.rpg.AndorsTrail.util.ListOfListeners; public final class CombatSelectionListeners extends ListOfListeners implements CombatSelectionListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java index 946c36d05..ec290997a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java @@ -1,9 +1,9 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; -import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.Coord; +import com.gpl.rpg.AndorsTrail.util.ListOfListeners; public final class MapLayoutListeners extends ListOfListeners implements MapLayoutListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java index c86c9cdbd..55f6e86e0 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java @@ -1,9 +1,9 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Monster; -import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.CoordRect; +import com.gpl.rpg.AndorsTrail.util.ListOfListeners; public final class MonsterMovementListeners extends ListOfListeners implements MonsterMovementListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java index b305c3b8e..e1cb0e919 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java @@ -1,10 +1,10 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Monster; -import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.CoordRect; +import com.gpl.rpg.AndorsTrail.util.ListOfListeners; public final class MonsterSpawnListeners extends ListOfListeners implements MonsterSpawnListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java index 29e7f353e..c0a373ba2 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java @@ -1,8 +1,8 @@ package com.gpl.rpg.AndorsTrail.controller.listeners; -import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; import com.gpl.rpg.AndorsTrail.util.Coord; +import com.gpl.rpg.AndorsTrail.util.ListOfListeners; public final class PlayerMovementListeners extends ListOfListeners implements PlayerMovementListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java similarity index 71% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListener.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java index 49fd1ecb9..7f8942ceb 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListener.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model.listeners; +package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Player; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java similarity index 91% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java index a11b7eb7d..73f944930 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java @@ -1,4 +1,4 @@ -package com.gpl.rpg.AndorsTrail.model.listeners; +package com.gpl.rpg.AndorsTrail.controller.listeners; import com.gpl.rpg.AndorsTrail.model.actor.Player; import com.gpl.rpg.AndorsTrail.util.ListOfListeners; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java index b719de646..c2cd95da6 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java @@ -2,8 +2,8 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.item.Loot; -import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import com.gpl.rpg.AndorsTrail.model.map.MapObject; +import com.gpl.rpg.AndorsTrail.util.ListOfListeners; import java.util.Collection; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java deleted file mode 100644 index 9c737fc0f..000000000 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gpl.rpg.AndorsTrail.conversation; - -public final class Phrase { - private static final Reply[] NO_REPLIES = new Reply[0]; - - public final String message; - public final Reply[] replies; - public final Reward[] rewards; // If this phrase is reached, player will be awarded all these rewards - public final String switchToNPC; - - public Phrase( - String message - ,Reply[] replies - ,Reward[] rewards - ,String switchToNPC - ) { - this.message = message; - if (replies == null || replies.length == 0) replies = NO_REPLIES; - this.replies = replies; - this.rewards = rewards; - this.switchToNPC = switchToNPC; - } - - public static final class Reply { - public final String text; - public final String nextPhrase; - public final Requirement[] requires; - - public boolean hasRequirements() { - return requires != null; - } - - public Reply(String text, String nextPhrase, Requirement[] requires) { - this.text = text; - this.nextPhrase = nextPhrase; - this.requires = requires; - } - } - - public static final class Requirement { - public static enum RequirementType { - questProgress - ,inventoryRemove // Player must have item(s) in inventory. Items will be removed when selecting reply. - ,inventoryKeep // Player must have item(s) in inventory. Items will NOT be removed when selecting reply. - ,wear // Player must be wearing item(s). Items will NOT be removed when selecting reply. - ,skillLevel // Player needs to have a specific skill equal to or above a certain level - ,killedMonster - } - - public final RequirementType requireType; - public final String requireID; - public final int value; - - public Requirement(RequirementType requireType, String requireID, int value) { - this.requireType = requireType; - this.requireID = requireID; - this.value = value; - } - } - - public static final class Reward { - public static enum RewardType { - questProgress - ,dropList - ,skillIncrease - ,actorCondition - ,alignmentChange - } - - public final RewardType rewardType; - public final String rewardID; - public final int value; - - public Reward(RewardType rewardType, String rewardID, int value) { - this.rewardType = rewardType; - this.rewardID = rewardID; - this.value = value; - } - } -} diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java index 5ea965351..1235fed95 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java @@ -1,6 +1,5 @@ package com.gpl.rpg.AndorsTrail.model; -import java.util.Iterator; import java.util.LinkedList; import java.util.ListIterator; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java index f091f6eb5..1e7961a3a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java @@ -1,13 +1,13 @@ package com.gpl.rpg.AndorsTrail.model; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.util.Coord; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + public final class InterfaceData { public boolean isMainActivityVisible = false; public boolean isInCombat = false; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java index 7d4e117f7..f77ba7111 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java @@ -1,15 +1,15 @@ package com.gpl.rpg.AndorsTrail.model; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.model.actor.Player; import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + public final class ModelContainer { public final Player player; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java index 61cddd0bc..38209ba84 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java @@ -1,11 +1,11 @@ package com.gpl.rpg.AndorsTrail.model.ability; +import com.gpl.rpg.AndorsTrail.context.WorldContext; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.gpl.rpg.AndorsTrail.context.WorldContext; - public final class ActorCondition { public static final int MAGNITUDE_REMOVE_ALL = -99; public static final int DURATION_FOREVER = 999; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java index fdd15111c..fed58432f 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java @@ -1,11 +1,11 @@ package com.gpl.rpg.AndorsTrail.model.ability; -import java.util.HashMap; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.parsers.ActorConditionsTypeParser; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.HashMap; + public final class ActorConditionTypeCollection { private final HashMap conditionTypes = new HashMap(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java index 8b85c48ee..7a3f75e1e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java @@ -1,14 +1,13 @@ package com.gpl.rpg.AndorsTrail.model.ability; -import java.util.ArrayList; -import java.util.Collection; - import android.util.SparseArray; - import com.gpl.rpg.AndorsTrail.controller.Constants; import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement; import com.gpl.rpg.AndorsTrail.model.actor.Player; +import java.util.ArrayList; +import java.util.Collection; + public final class SkillCollection { public static enum SkillID { weaponChance diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java index 24ebe81f6..151e165fb 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java @@ -1,6 +1,6 @@ package com.gpl.rpg.AndorsTrail.model.ability.traits; -import com.gpl.rpg.AndorsTrail.VisualEffectCollection; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.util.ConstRange; public final class StatsModifierTraits { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java index ec2e517e0..7c6cb2c22 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java @@ -1,11 +1,6 @@ package com.gpl.rpg.AndorsTrail.model.actor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import android.util.FloatMath; - import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; import com.gpl.rpg.AndorsTrail.util.Coord; @@ -13,6 +8,10 @@ import com.gpl.rpg.AndorsTrail.util.Range; import com.gpl.rpg.AndorsTrail.util.Size; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Actor { public int iconID; public final Size tileSize; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java index 62bed101e..786d7325d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java @@ -1,9 +1,5 @@ package com.gpl.rpg.AndorsTrail.model.actor; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; @@ -15,6 +11,10 @@ import com.gpl.rpg.AndorsTrail.util.CoordRect; import com.gpl.rpg.AndorsTrail.util.Range; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + public final class Monster extends Actor { public Coord movementDestination = null; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java index 296e5a17c..2d6fad003 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java @@ -1,12 +1,12 @@ package com.gpl.rpg.AndorsTrail.model.actor; -import java.util.ArrayList; -import java.util.HashMap; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.parsers.MonsterTypeParser; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.ArrayList; +import java.util.HashMap; + public final class MonsterTypeCollection { private final HashMap monsterTypesById = new HashMap(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java similarity index 95% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java index a0c9947cf..2c708c10b 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/ConversationCollection.java @@ -1,12 +1,12 @@ -package com.gpl.rpg.AndorsTrail.conversation; - -import java.util.Collection; -import java.util.HashMap; +package com.gpl.rpg.AndorsTrail.model.conversation; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.Collection; +import java.util.HashMap; + public final class ConversationCollection { public static final String PHRASE_CLOSE = "X"; public static final String PHRASE_SHOP = "S"; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Phrase.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Phrase.java new file mode 100644 index 000000000..e7d354caa --- /dev/null +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Phrase.java @@ -0,0 +1,23 @@ +package com.gpl.rpg.AndorsTrail.model.conversation; + +public final class Phrase { + private static final Reply[] NO_REPLIES = new Reply[0]; + + public final String message; + public final Reply[] replies; + public final Reward[] rewards; // If this phrase is reached, player will be awarded all these rewards + public final String switchToNPC; + + public Phrase( + String message + ,Reply[] replies + ,Reward[] rewards + ,String switchToNPC + ) { + this.message = message; + if (replies == null || replies.length == 0) replies = NO_REPLIES; + this.replies = replies; + this.rewards = rewards; + this.switchToNPC = switchToNPC; + } +} diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reply.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reply.java new file mode 100644 index 000000000..29114604e --- /dev/null +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reply.java @@ -0,0 +1,17 @@ +package com.gpl.rpg.AndorsTrail.model.conversation; + +public final class Reply { + public final String text; + public final String nextPhrase; + public final Requirement[] requires; + + public boolean hasRequirements() { + return requires != null; + } + + public Reply(String text, String nextPhrase, Requirement[] requires) { + this.text = text; + this.nextPhrase = nextPhrase; + this.requires = requires; + } +} diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Requirement.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Requirement.java new file mode 100644 index 000000000..492161500 --- /dev/null +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Requirement.java @@ -0,0 +1,22 @@ +package com.gpl.rpg.AndorsTrail.model.conversation; + +public final class Requirement { + public static enum RequirementType { + questProgress + ,inventoryRemove // Player must have item(s) in inventory. Items will be removed when selecting reply. + ,inventoryKeep // Player must have item(s) in inventory. Items will NOT be removed when selecting reply. + ,wear // Player must be wearing item(s). Items will NOT be removed when selecting reply. + ,skillLevel // Player needs to have a specific skill equal to or above a certain level + ,killedMonster + } + + public final RequirementType requireType; + public final String requireID; + public final int value; + + public Requirement(RequirementType requireType, String requireID, int value) { + this.requireType = requireType; + this.requireID = requireID; + this.value = value; + } +} diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reward.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reward.java new file mode 100644 index 000000000..0f29c1e04 --- /dev/null +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/conversation/Reward.java @@ -0,0 +1,21 @@ +package com.gpl.rpg.AndorsTrail.model.conversation; + +public final class Reward { + public static enum RewardType { + questProgress + ,dropList + ,skillIncrease + ,actorCondition + ,alignmentChange + } + + public final RewardType rewardType; + public final String rewardID; + public final int value; + + public Reward(RewardType rewardType, String rewardID, int value) { + this.rewardType = rewardType; + this.rewardID = rewardID; + this.value = value; + } +} diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java index 9cc331e1d..a1671f768 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java @@ -1,7 +1,5 @@ package com.gpl.rpg.AndorsTrail.model.item; -import java.util.Collection; - import com.gpl.rpg.AndorsTrail.controller.Constants; import com.gpl.rpg.AndorsTrail.controller.SkillController; import com.gpl.rpg.AndorsTrail.model.actor.Player; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java index f0e428b09..171a70288 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java @@ -1,11 +1,11 @@ package com.gpl.rpg.AndorsTrail.model.item; -import java.util.HashMap; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.HashMap; + public final class DropListCollection { public static final String DROPLIST_STARTITEMS = "startitems"; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java index d31b171a8..6e8161959 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java @@ -1,12 +1,12 @@ package com.gpl.rpg.AndorsTrail.model.item; +import com.gpl.rpg.AndorsTrail.context.WorldContext; +import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer; - public final class Inventory extends ItemContainer { public static enum WearSlot { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java index ea52eb460..2c22bae4a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java @@ -1,11 +1,11 @@ package com.gpl.rpg.AndorsTrail.model.item; -import java.util.HashMap; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.HashMap; + public final class ItemCategoryCollection { private final HashMap itemCategories = new HashMap(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java index f4606547c..5067c07b8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java @@ -1,12 +1,12 @@ package com.gpl.rpg.AndorsTrail.model.item; +import com.gpl.rpg.AndorsTrail.context.WorldContext; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; -import com.gpl.rpg.AndorsTrail.context.WorldContext; - public class ItemContainer { public final ArrayList items = new ArrayList(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java index 9a6d6324f..b7a0e8f3a 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java @@ -1,11 +1,11 @@ package com.gpl.rpg.AndorsTrail.model.item; -import java.util.HashMap; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.HashMap; + public final class ItemTypeCollection { private static final String ITEMTYPE_GOLD = "gold"; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java index a603c08ab..057bdf86e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java @@ -1,14 +1,14 @@ package com.gpl.rpg.AndorsTrail.model.item; +import com.gpl.rpg.AndorsTrail.context.WorldContext; +import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer; +import com.gpl.rpg.AndorsTrail.util.Coord; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Collection; -import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer; -import com.gpl.rpg.AndorsTrail.util.Coord; - public final class Loot { public int exp = 0; public int gold = 0; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java index e2d4a499a..63d112d83 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java @@ -1,15 +1,14 @@ package com.gpl.rpg.AndorsTrail.model.map; -import java.util.Collection; - import android.graphics.ColorFilter; import android.graphics.ColorMatrixColorFilter; import android.graphics.Paint; - import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.CoordRect; import com.gpl.rpg.AndorsTrail.util.Size; +import java.util.Collection; + public final class LayeredTileMap { private static final ColorFilter colorFilterBlack20 = createGrayScaleColorFilter(0.2f); private static final ColorFilter colorFilterBlack40 = createGrayScaleColorFilter(0.4f); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java index b63a6659d..b10d64c39 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java @@ -1,6 +1,5 @@ package com.gpl.rpg.AndorsTrail.model.map; -import com.gpl.rpg.AndorsTrail.util.Coord; import com.gpl.rpg.AndorsTrail.util.Size; public final class MapLayer { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java index 38801539e..bcef3682d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java @@ -1,10 +1,5 @@ package com.gpl.rpg.AndorsTrail.model.map; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; - import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.Constants; import com.gpl.rpg.AndorsTrail.model.actor.Monster; @@ -13,6 +8,11 @@ import com.gpl.rpg.AndorsTrail.util.CoordRect; import com.gpl.rpg.AndorsTrail.util.Range; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; + public final class MonsterSpawnArea { public final CoordRect area; public final Range quantity; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java index 0321d322c..94491b493 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java @@ -1,10 +1,5 @@ package com.gpl.rpg.AndorsTrail.model.map; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; @@ -18,6 +13,11 @@ import com.gpl.rpg.AndorsTrail.util.L; import com.gpl.rpg.AndorsTrail.util.Size; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; + public final class PredefinedMap { private static final long VISIT_RESET = 0; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java index df7695466..8737b43a9 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java @@ -1,31 +1,19 @@ package com.gpl.rpg.AndorsTrail.model.map; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.*; - +import android.content.res.Resources; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection; import com.gpl.rpg.AndorsTrail.model.item.DropList; import com.gpl.rpg.AndorsTrail.model.item.DropListCollection; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXLayer; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXLayerMap; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXMap; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObjectMap; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObject; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXObjectGroup; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXProperty; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.TMXTileSet; +import com.gpl.rpg.AndorsTrail.model.map.TMXMapFileParser.*; import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache; -import com.gpl.rpg.AndorsTrail.util.Coord; -import com.gpl.rpg.AndorsTrail.util.CoordRect; -import com.gpl.rpg.AndorsTrail.util.L; -import com.gpl.rpg.AndorsTrail.util.Range; -import com.gpl.rpg.AndorsTrail.util.Size; +import com.gpl.rpg.AndorsTrail.util.*; -import android.content.res.Resources; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.*; public final class TMXMapTranslator { private final ArrayList maps = new ArrayList(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java index 7be483428..384840fad 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java @@ -1,10 +1,10 @@ package com.gpl.rpg.AndorsTrail.model.map; +import com.gpl.rpg.AndorsTrail.util.Coord; + import java.util.HashMap; import java.util.HashSet; -import com.gpl.rpg.AndorsTrail.util.Coord; - public final class WorldMapSegment { public final String name; public final HashMap maps = new HashMap(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java index 9240eaa49..f51bf8abd 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java @@ -1,14 +1,14 @@ package com.gpl.rpg.AndorsTrail.model.quest; +import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; +import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser; +import com.gpl.rpg.AndorsTrail.util.L; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; -import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser; -import com.gpl.rpg.AndorsTrail.util.L; - public final class QuestCollection { private final HashMap quests = new HashMap(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java similarity index 86% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java index a241d9396..271aa4148 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ConversationLoader.java @@ -1,14 +1,13 @@ -package com.gpl.rpg.AndorsTrail.conversation; - -import java.util.Collection; -import java.util.HashMap; +package com.gpl.rpg.AndorsTrail.resource; import android.content.res.Resources; - -import com.gpl.rpg.AndorsTrail.resource.ResourceLoader; -import com.gpl.rpg.AndorsTrail.resource.TranslationLoader; +import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection; +import com.gpl.rpg.AndorsTrail.model.conversation.Phrase; import com.gpl.rpg.AndorsTrail.resource.parsers.ConversationListParser; +import java.util.Collection; +import java.util.HashMap; + public final class ConversationLoader { private final HashMap resourceIDsPerPhraseID = new HashMap(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java index 525632447..b7b345eae 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java @@ -1,17 +1,16 @@ package com.gpl.rpg.AndorsTrail.resource; -import java.util.HashMap; -import java.util.Map; - import android.util.SparseArray; import android.util.SparseIntArray; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.resource.tiles.ResourceFileTileset; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCache; import com.gpl.rpg.AndorsTrail.util.L; import com.gpl.rpg.AndorsTrail.util.Size; +import java.util.HashMap; +import java.util.Map; + public final class DynamicTileLoader { private final TileCache tileCache; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java index 5433a41a5..6b331c96c 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java @@ -5,7 +5,7 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.conversation.ConversationCollection; +import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection; import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator; import com.gpl.rpg.AndorsTrail.resource.parsers.*; import com.gpl.rpg.AndorsTrail.util.L; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java similarity index 96% rename from AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java rename to AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java index 403489ffe..89f332e0e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/VisualEffectCollection.java @@ -1,7 +1,7 @@ -package com.gpl.rpg.AndorsTrail; +package com.gpl.rpg.AndorsTrail.resource; import android.graphics.Color; -import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader; +import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.util.ConstRange; public final class VisualEffectCollection { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java index a2efe6eb0..345a300af 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java @@ -1,10 +1,10 @@ package com.gpl.rpg.AndorsTrail.resource.parsers; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; -import com.gpl.rpg.AndorsTrail.conversation.Phrase; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Requirement; -import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reward; +import com.gpl.rpg.AndorsTrail.model.conversation.Phrase; +import com.gpl.rpg.AndorsTrail.model.conversation.Reply; +import com.gpl.rpg.AndorsTrail.model.conversation.Requirement; +import com.gpl.rpg.AndorsTrail.model.conversation.Reward; import com.gpl.rpg.AndorsTrail.resource.TranslationLoader; import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonArrayParserFor; import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonCollectionParserFor; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java index f0ea5a96e..0a564ba58 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java @@ -1,10 +1,10 @@ package com.gpl.rpg.AndorsTrail.resource.parsers; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; -import com.gpl.rpg.AndorsTrail.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits; import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits; import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader; +import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection; import com.gpl.rpg.AndorsTrail.resource.parsers.json.JsonFieldNames; import com.gpl.rpg.AndorsTrail.util.ConstRange; import com.gpl.rpg.AndorsTrail.util.L; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java index 04d128cf9..c231ad4e1 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java @@ -1,13 +1,7 @@ package com.gpl.rpg.AndorsTrail.resource.parsers; -import java.io.IOException; -import java.util.ArrayList; - -import org.xmlpull.v1.XmlPullParserException; - import android.content.res.Resources; import android.content.res.XmlResourceParser; - import com.gpl.rpg.AndorsTrail.model.map.MapCollection; import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment; import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea; @@ -16,6 +10,10 @@ import com.gpl.rpg.AndorsTrail.util.L; import com.gpl.rpg.AndorsTrail.util.Pair; import com.gpl.rpg.AndorsTrail.util.XmlResourceParserUtils; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.IOException; +import java.util.ArrayList; public final class WorldMapParser { public static void read(Resources r, int xmlResourceId, final MapCollection maps) { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java index bca042c38..5887b5ef8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/json/JsonArrayParserFor.java @@ -2,7 +2,6 @@ import org.json.JSONArray; import org.json.JSONException; -import org.json.JSONObject; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java index e51c9802b..023014e5d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java @@ -1,9 +1,7 @@ package com.gpl.rpg.AndorsTrail.resource.tiles; import android.graphics.Matrix; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; -import com.gpl.rpg.AndorsTrail.util.L; import com.gpl.rpg.AndorsTrail.util.Size; public final class ResourceFileTileset { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java index 05fc4ad2f..88308d8e4 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java @@ -1,5 +1,11 @@ package com.gpl.rpg.AndorsTrail.resource.tiles; +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.util.SparseArray; +import android.util.SparseIntArray; +import com.gpl.rpg.AndorsTrail.util.LruCache; + import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -7,13 +13,6 @@ import java.util.HashMap; import java.util.Map.Entry; -import com.gpl.rpg.AndorsTrail.util.LruCache; - -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.util.SparseArray; -import android.util.SparseIntArray; - public final class TileCache { private final ReferenceQueue gcQueue = new ReferenceQueue(); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java index ae747b949..05e141b1d 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java @@ -1,8 +1,5 @@ package com.gpl.rpg.AndorsTrail.resource.tiles; -import java.util.HashMap; -import java.util.HashSet; - import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; @@ -11,7 +8,6 @@ import android.os.AsyncTask; import android.widget.ImageView; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.context.WorldContext; @@ -20,15 +16,14 @@ import com.gpl.rpg.AndorsTrail.model.actor.Player; import com.gpl.rpg.AndorsTrail.model.item.Inventory; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer; -import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry; -import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap; -import com.gpl.rpg.AndorsTrail.model.map.MapObject; -import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea; -import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap; -import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator; +import com.gpl.rpg.AndorsTrail.model.item.ItemType; +import com.gpl.rpg.AndorsTrail.model.map.*; import com.gpl.rpg.AndorsTrail.util.L; +import java.util.HashMap; +import java.util.HashSet; + public final class TileManager { public static final int CHAR_HERO = 1; public static final int iconID_selection_red = 2; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java index a5f50497c..45b9eb0a3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java @@ -3,8 +3,8 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.model.item.Inventory; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer; -import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry; +import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.model.item.Loot; import com.gpl.rpg.AndorsTrail.util.L; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java index 7e65e682b..225aca5ea 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForMonster.java @@ -1,12 +1,12 @@ package com.gpl.rpg.AndorsTrail.savegames; -import java.io.DataInputStream; -import java.io.IOException; - import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.MonsterType; import com.gpl.rpg.AndorsTrail.util.Coord; +import java.io.DataInputStream; +import java.io.IOException; + public final class LegacySavegameFormatReaderForMonster { public static Monster readFromParcel_pre_v25(DataInputStream src, int fileversion, MonsterType monsterType) throws IOException { Monster m = new Monster(monsterType); diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java index f793dadcb..d9b2709a8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java @@ -1,10 +1,6 @@ package com.gpl.rpg.AndorsTrail.savegames; -import java.io.DataInputStream; -import java.io.IOException; - import android.util.FloatMath; - import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.Constants; @@ -16,6 +12,9 @@ import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress; import com.gpl.rpg.AndorsTrail.util.Range; +import java.io.DataInputStream; +import java.io.IOException; + public final class LegacySavegameFormatReaderForPlayer { public static void readQuestProgressPreV13(Player player, DataInputStream src, WorldContext world, int fileversion) throws IOException { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java index 8a5eb4bc0..ea33128b3 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java @@ -1,27 +1,8 @@ package com.gpl.rpg.AndorsTrail.savegames; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import android.content.Context; import android.content.res.Resources; import android.os.Environment; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; @@ -29,6 +10,13 @@ import com.gpl.rpg.AndorsTrail.model.ModelContainer; import com.gpl.rpg.AndorsTrail.util.L; +import java.io.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public final class Savegames { public static final int SLOT_QUICKSAVE = 0; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java index 4f47c1824..242fc6f91 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java @@ -1,14 +1,13 @@ package com.gpl.rpg.AndorsTrail.view; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits; - import android.content.Context; import android.content.res.Resources; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits; public final class AbilityModifierInfoView extends LinearLayout { private final TextView abilitymodifierinfo_change_maxap; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java index 4d6216492..dddfed6f0 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java @@ -1,13 +1,5 @@ package com.gpl.rpg.AndorsTrail.view; -import java.util.Collection; - -import com.gpl.rpg.AndorsTrail.Dialogs; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; -import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect; -import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType; - import android.content.Context; import android.content.res.Resources; import android.text.SpannableString; @@ -16,6 +8,13 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.Dialogs; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; +import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect; +import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType; + +import java.util.Collection; public final class ActorConditionEffectList extends LinearLayout { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java index cff8ac67d..e61ac238e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java @@ -1,21 +1,19 @@ package com.gpl.rpg.AndorsTrail.view; -import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; -import com.gpl.rpg.AndorsTrail.Dialogs; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; -import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType; - import android.content.Context; import android.content.res.Resources; import android.text.SpannableString; import android.text.style.UnderlineSpan; import android.util.AttributeSet; import android.view.View; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; +import com.gpl.rpg.AndorsTrail.Dialogs; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.context.WorldContext; +import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; +import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType; public final class ActorConditionList extends LinearLayout { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java index 7272c0e20..a68b13f73 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java @@ -12,20 +12,19 @@ import android.widget.ImageButton; import android.widget.RelativeLayout; import android.widget.TextView; - +import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.Dialogs; -import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; import com.gpl.rpg.AndorsTrail.controller.CombatController; +import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListener; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListener; import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListener; import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.model.actor.Monster; import com.gpl.rpg.AndorsTrail.model.actor.Player; -import com.gpl.rpg.AndorsTrail.model.listeners.ActorStatsListener; import com.gpl.rpg.AndorsTrail.util.Coord; public final class CombatView extends RelativeLayout implements CombatSelectionListener, CombatTurnListener, ActorStatsListener { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java index 23083b7de..06e3acb01 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java @@ -1,8 +1,5 @@ package com.gpl.rpg.AndorsTrail.view; -import java.lang.ref.WeakReference; -import java.util.ArrayList; - import android.content.Context; import android.content.res.Resources; import android.view.View; @@ -11,18 +8,20 @@ import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.RelativeLayout; -import android.widget.TextView; import android.widget.RelativeLayout.LayoutParams; - +import android.widget.TextView; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; +import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListener; import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition; import com.gpl.rpg.AndorsTrail.model.actor.Actor; -import com.gpl.rpg.AndorsTrail.model.listeners.ActorConditionListener; import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; +import java.lang.ref.WeakReference; +import java.util.ArrayList; + public final class DisplayActiveActorConditionIcons implements ActorConditionListener { private final AndorsTrailPreferences preferences; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java index e7ec92252..392e036b7 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java @@ -4,9 +4,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.ImageView; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.controller.ItemController; import com.gpl.rpg.AndorsTrail.model.actor.Player; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java index fc67c348a..e702ac772 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java @@ -1,17 +1,16 @@ package com.gpl.rpg.AndorsTrail.view; -import java.util.Arrays; -import java.util.Collection; - -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip; -import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; - import android.content.Context; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip; +import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; + +import java.util.Arrays; +import java.util.Collection; public final class ItemEffectsView extends LinearLayout { private final TextView itemeffect_onequip_title; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java index 88f555abd..61293d707 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java @@ -1,20 +1,19 @@ package com.gpl.rpg.AndorsTrail.view; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; - -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect; -import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits; -import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; - import android.content.Context; import android.content.res.Resources; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect; +import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits; +import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; public final class ItemEffectsView_OnUse extends LinearLayout { private final LinearLayout itemeffect_onuse_list; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java index 62844b3c1..660d6cadc 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java @@ -1,18 +1,17 @@ package com.gpl.rpg.AndorsTrail.view; -import android.content.res.Resources; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.model.item.ItemType; -import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; -import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; - import android.content.Context; +import android.content.res.Resources; import android.graphics.ColorFilter; import android.graphics.ColorMatrixColorFilter; import android.util.AttributeSet; import android.view.ContextMenu; import android.widget.Button; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.context.WorldContext; +import com.gpl.rpg.AndorsTrail.model.item.ItemType; +import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; +import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; public final class QuickButton extends Button { private final ColorFilter grayScaleFilter = new ColorMatrixColorFilter( diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java index b2bfc29c1..b8bb92fc9 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java @@ -1,17 +1,13 @@ package com.gpl.rpg.AndorsTrail.view; -import java.util.HashSet; - import android.R.color; import android.content.Context; import android.content.res.Resources; -import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.LinearLayout; - import android.widget.RelativeLayout; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; @@ -24,6 +20,8 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; +import java.util.HashSet; + public final class QuickitemView extends LinearLayout implements OnClickListener, QuickSlotListener { private static final int NUM_QUICK_SLOTS = Inventory.NUM_QUICK_SLOTS; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java index 5379a950c..0f4e26eee 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java @@ -1,13 +1,12 @@ package com.gpl.rpg.AndorsTrail.view; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.util.Range; - import android.content.Context; import android.util.AttributeSet; -import android.widget.RelativeLayout; import android.widget.ProgressBar; +import android.widget.RelativeLayout; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.util.Range; public final class RangeBar extends RelativeLayout { private final ProgressBar progressBar; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java index 9868c29c1..a99212911 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java @@ -3,19 +3,18 @@ import android.content.Context; import android.content.res.Resources; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; - import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.controller.ItemController; import com.gpl.rpg.AndorsTrail.model.actor.Player; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer; -import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry; +import com.gpl.rpg.AndorsTrail.model.item.ItemType; import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection; import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java index fbe29191d..7c30bf2a8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java @@ -1,18 +1,5 @@ package com.gpl.rpg.AndorsTrail.view; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity; -import com.gpl.rpg.AndorsTrail.controller.SkillController; -import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; -import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo; -import com.gpl.rpg.AndorsTrail.model.actor.Player; - import android.content.Context; import android.content.res.Resources; import android.view.View; @@ -20,6 +7,14 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity; +import com.gpl.rpg.AndorsTrail.controller.SkillController; +import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection; +import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo; +import com.gpl.rpg.AndorsTrail.model.actor.Player; + +import java.util.*; public final class SkillListAdapter extends ArrayAdapter { private final Resources r; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java index bfd35c1c5..9c1db72da 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java @@ -1,27 +1,26 @@ package com.gpl.rpg.AndorsTrail.view; +import android.content.Context; +import android.content.Intent; import android.content.res.Resources; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.LayerDrawable; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageButton; +import android.widget.RelativeLayout; import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.R; import com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity; import com.gpl.rpg.AndorsTrail.context.ControllerContext; import com.gpl.rpg.AndorsTrail.context.WorldContext; -import com.gpl.rpg.AndorsTrail.model.listeners.PlayerStatsListener; +import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListener; +import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerStatsListener; import com.gpl.rpg.AndorsTrail.model.actor.Actor; import com.gpl.rpg.AndorsTrail.model.actor.Player; -import com.gpl.rpg.AndorsTrail.model.listeners.ActorStatsListener; import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager; -import android.content.Context; -import android.content.Intent; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.LayerDrawable; -import android.util.AttributeSet; -import android.view.View; -import android.widget.RelativeLayout; -import android.widget.ImageButton; - public final class StatusView extends RelativeLayout implements PlayerStatsListener, ActorStatsListener { private final ControllerContext controllers; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java index 10d873b6e..fc3bce100 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java @@ -10,11 +10,10 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.animation.Animation; -import android.view.animation.AnimationUtils; import android.view.animation.Animation.AnimationListener; +import android.view.animation.AnimationUtils; import android.widget.ImageButton; import android.widget.LinearLayout; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.Dialogs; diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java index 9033e327d..54894782e 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java @@ -1,14 +1,13 @@ package com.gpl.rpg.AndorsTrail.view; -import com.gpl.rpg.AndorsTrail.R; -import com.gpl.rpg.AndorsTrail.model.actor.Actor; -import com.gpl.rpg.AndorsTrail.util.Range; - import android.view.View; import android.view.ViewGroup; import android.widget.TableLayout; import android.widget.TableRow; import android.widget.TextView; +import com.gpl.rpg.AndorsTrail.R; +import com.gpl.rpg.AndorsTrail.model.actor.Actor; +import com.gpl.rpg.AndorsTrail.util.Range; public final class TraitsInfoView { diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java index 5155e5127..66d1db1ee 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java @@ -8,7 +8,6 @@ import android.view.ViewGroup.LayoutParams; import android.widget.ImageView; import android.widget.RelativeLayout; - import com.gpl.rpg.AndorsTrail.AndorsTrailApplication; import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences; import com.gpl.rpg.AndorsTrail.R;