Skip to content

Commit

Permalink
Refactor: Changed namespaces, reorganized imports.
Browse files Browse the repository at this point in the history
  • Loading branch information
@oskarwiksten
oskarwiksten committed Aug 24, 2013
1 parent 89a64bb commit a1da45c
Show file tree
Hide file tree
Showing 105 changed files with 361 additions and 501 deletions.
5 changes: 2 additions & 3 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
View file
@@ -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 {

Expand Down
5 changes: 2 additions & 3 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
View file
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
View file
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
View file
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
View file
Expand Up @@ -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;
Expand Down
57 changes: 9 additions & 48 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
})*/
Expand All @@ -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);
}
})*/
Expand All @@ -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);
}
})
*/

});
}

Expand Down
5 changes: 2 additions & 3 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
View file
@@ -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;
Expand All @@ -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;
Expand All @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
View file
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
View file
@@ -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;
Expand All @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
View file
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View file
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
View file
@@ -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
Expand Down
20 changes: 9 additions & 11 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
View file
@@ -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;
Expand All @@ -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 {

Expand Down
18 changes: 3 additions & 15 deletions AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
View file
@@ -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
Expand Down

0 comments on commit a1da45c

Please sign in to comment.