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

refactor results

Browse Source
This commit is contained in:
Nut.andor
2022-07-24 14:30:05 +02:00
parent e2d06ad22e
commit 8c18d38686
224 changed files with 1426 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
AndorsTrail/app/src/main/AndroidManifest.xml
View File

@@ -25,7 +25,7 @@
<application
android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
android:name=".AndorsTrailApplication"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:description="@string/app_description"
@@ -36,7 +36,7 @@
android:preserveLegacyExternalStorage="true"
>
<activity
android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
android:name=".activity.StartScreenActivity"
android:clearTaskOnLaunch="true"
>
<intent-filter>
@@ -45,29 +45,29 @@
</intent-filter>
</activity>
<activity
android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
android:name=".activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
/>
<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.ShopActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.AboutActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadingActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.Preferences" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
<activity android:name=".activity.HeroinfoActivity" />
<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ShopActivity" />
<activity android:name=".activity.AboutActivity" />
<activity android:name=".activity.LoadingActivity" />
<activity android:name=".activity.Preferences" />
<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name=".activity.DisplayWorldMapActivity" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
android:authorities="com.gpl.rpg.AndorsTrail_beta2.fileprovider"
android:grantUriPermissions="true"
android:exported="false">
<meta-data

11
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListener.java
View File

@@ -1,11 +0,0 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.util.Coord;
public interface MapLayoutListener {
void onLootBagCreated(PredefinedMap map, Coord p);
void onLootBagRemoved(PredefinedMap map, Coord p);
void onMapTilesChanged(PredefinedMap map, LayeredTileMap tileMap);
}

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListener.java
View File

@@ -1,10 +0,0 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.util.CoordRect;
public interface MonsterMovementListener {
void onMonsterSteppedOnPlayer(Monster m);
void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition);
}

7
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListener.java
View File

@@ -1,7 +0,0 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
public interface PlayerStatsListener {
void onPlayerExperienceChanged(Player p);
}

11
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/MapBundle.java
View File

@@ -1,11 +0,0 @@
package com.gpl.rpg.AndorsTrail.model;
import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
public final class MapBundle {
public PredefinedMap map;
public LayeredTileMap tileMap;
public TileCollection tiles;
}

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/AndorsTrailApplication.java
View File

@@ -1,14 +1,14 @@
package com.gpl.rpg.AndorsTrail;
package com.gpl.rpg.AndorsTrail_beta2;
import java.io.File;
import java.io.IOException;
import java.util.Locale;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.Constants;
import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail.util.Pair;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail_beta2.util.Pair;
import android.app.Activity;
import android.app.Application;

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/AndorsTrailPreferences.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail;
package com.gpl.rpg.AndorsTrail_beta2;
import android.content.Context;
import android.content.SharedPreferences;

48
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/Dialogs.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail;
package com.gpl.rpg.AndorsTrail_beta2;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,29 +24,29 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;
import com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity;
import com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface;
import com.gpl.rpg.AndorsTrail.activity.ConversationActivity;
import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail.activity.LevelUpActivity;
import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
import com.gpl.rpg.AndorsTrail.activity.MainActivity;
import com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity;
import com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity;
import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.item.Inventory;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
import com.gpl.rpg.AndorsTrail_beta2.activity.ActorConditionInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.BulkSelectionInterface;
import com.gpl.rpg.AndorsTrail_beta2.activity.ConversationActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.LevelUpActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.LoadSaveActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.MainActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.MonsterEncounterActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.MonsterInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.SkillInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_MainMenu;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemContainerAdapter;
public final class Dialogs {

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/WorldSetup.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/WorldSetup.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail;
package com.gpl.rpg.AndorsTrail_beta2;
import java.lang.ref.WeakReference;
@@ -6,11 +6,11 @@ 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 com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta2.resource.ResourceLoader;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
public final class WorldSetup {

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/AboutActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
@@ -11,9 +11,9 @@ 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;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class AboutActivity extends AndorsTrailBaseActivity implements ImageGetter {

16
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/ActorConditionInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.content.res.Resources;
import android.os.Bundle;
@@ -9,13 +9,13 @@ 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;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView;
import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.AbilityModifierInfoView;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView_OnUse;
public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/AndorsTrailBaseActivity.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.app.Activity;
import android.os.Bundle;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
public abstract class AndorsTrailBaseActivity extends Activity {
@Override

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/AndorsTrailBaseFragmentActivity.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
public abstract class AndorsTrailBaseFragmentActivity extends FragmentActivity {
@Override

16
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/BulkSelectionInterface.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.app.Dialog;
import android.content.Intent;
@@ -16,13 +16,13 @@ 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;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
/**
* @author ejwessel

34
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/ConversationActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import java.util.ArrayList;
@@ -29,22 +29,22 @@ import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.TextView.BufferType;
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.controller.ConversationController;
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;
import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.ConversationController;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Reply;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.Quest;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestProgress;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class ConversationActivity
extends AndorsTrailBaseActivity

20
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/DebugInterface.java
View File

@@ -1,18 +1,18 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
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.Constants;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.view.MainView;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.view.MainView;
import android.content.Context;
import android.content.res.Resources;

24
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/DisplayWorldMapActivity.java
View File

@@ -1,18 +1,18 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import java.io.File;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.L;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.WorldMapController;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment;
import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment.WorldMapSegmentMap;
import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import android.annotation.SuppressLint;
import android.os.Bundle;

18
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/HeroinfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.content.res.Resources;
import android.os.Bundle;
@@ -8,14 +8,14 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Inventory;
import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Quests;
import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Skills;
import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Stats;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Inventory;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Quests;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Skills;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Stats;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class HeroinfoActivity extends AndorsTrailBaseFragmentActivity {
private WorldContext world;

14
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/ItemInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import java.util.Collections;
@@ -11,12 +11,12 @@ 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;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView;
public final class ItemInfoActivity extends AndorsTrailBaseActivity {

18
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/LevelUpActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.content.res.Resources;
import android.os.Bundle;
@@ -8,14 +8,14 @@ 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;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
import com.gpl.rpg.AndorsTrail.controller.Constants;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.ActorStatsController;
import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class LevelUpActivity extends AndorsTrailBaseActivity {
private WorldContext world;

20
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/LoadSaveActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import java.util.Collections;
import java.util.List;
@@ -19,15 +19,15 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
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.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.savegames.Savegames;
import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames.FileHeader;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
private boolean isLoading = true;

20
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/LoadingActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.app.Dialog;
import android.content.DialogInterface;
@@ -11,15 +11,15 @@ import android.view.ViewTreeObserver;
import android.widget.ImageView;
import android.widget.TextView;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
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;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.WorldSetup;
import com.gpl.rpg.AndorsTrail_beta2.WorldSetup.OnResourcesLoadedListener;
import com.gpl.rpg.AndorsTrail_beta2.WorldSetup.OnSceneLoadedListener;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {

70
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/MainActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import java.lang.ref.WeakReference;
import java.util.Collection;
@@ -18,40 +18,40 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
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.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.Constants;
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.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail.savegames.Savegames;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CombatView;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
import com.gpl.rpg.AndorsTrail.view.MainView;
import com.gpl.rpg.AndorsTrail.view.QuickButton;
import com.gpl.rpg.AndorsTrail.view.QuickitemView;
import com.gpl.rpg.AndorsTrail.view.QuickslotsItemContainerAdapter;
import com.gpl.rpg.AndorsTrail.view.StatusView;
import com.gpl.rpg.AndorsTrail.view.ToolboxView;
import com.gpl.rpg.AndorsTrail.view.VirtualDpadView;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.AttackResult;
import com.gpl.rpg.AndorsTrail_beta2.controller.CombatController;
import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListener;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatTurnListener;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.PlayerMovementListener;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.WorldEventListener;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CombatView;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.view.DisplayActiveActorConditionIcons;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemContainerAdapter;
import com.gpl.rpg.AndorsTrail_beta2.view.MainView;
import com.gpl.rpg.AndorsTrail_beta2.view.QuickButton;
import com.gpl.rpg.AndorsTrail_beta2.view.QuickitemView;
import com.gpl.rpg.AndorsTrail_beta2.view.QuickslotsItemContainerAdapter;
import com.gpl.rpg.AndorsTrail_beta2.view.StatusView;
import com.gpl.rpg.AndorsTrail_beta2.view.ToolboxView;
import com.gpl.rpg.AndorsTrail_beta2.view.VirtualDpadView;
public final class MainActivity
extends AndorsTrailBaseActivity

16
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/MonsterEncounterActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.os.Bundle;
import android.view.View;
@@ -7,13 +7,13 @@ import android.view.Window;
import android.widget.Button;
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.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {

22
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/MonsterInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.os.Bundle;
import android.view.View;
@@ -8,16 +8,16 @@ import android.view.Window;
import android.widget.Button;
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.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail.view.RangeBar;
import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail_beta2.view.RangeBar;
import com.gpl.rpg.AndorsTrail_beta2.view.TraitsInfoView;
public final class MonsterInfoActivity extends AndorsTrailBaseActivity {

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/Preferences.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/Preferences.java
View File

@@ -1,13 +1,13 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.view.Window;
import android.view.WindowManager;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class Preferences extends PreferenceActivity {
@Override

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/ShopActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.content.res.Resources;
import android.os.Bundle;
@@ -8,11 +8,11 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Buy;
import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.ShopActivity_Buy;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.ShopActivity_Sell;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class ShopActivity extends AndorsTrailBaseFragmentActivity {

20
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/SkillInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import android.content.Intent;
import android.content.res.Resources;
@@ -10,15 +10,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.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
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.ability.SkillInfo.SkillLevelRequirement;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.SkillController;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo.SkillLevelRequirement;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
public final class SkillInfoActivity extends AndorsTrailBaseActivity {

24
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/StartScreenActivity.java
View File

@@ -1,16 +1,16 @@
package com.gpl.rpg.AndorsTrail.activity;
package com.gpl.rpg.AndorsTrail_beta2.activity;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame;
import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_MainMenu;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_NewGame;
import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
import android.app.Activity;
import android.app.Dialog;

34
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/HeroinfoActivity_Inventory.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import java.util.Arrays;
@@ -21,22 +21,22 @@ import android.widget.ImageView;
import android.widget.ListView;
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.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
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.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail.view.CustomMenuInflater;
import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.HeroCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomMenuInflater;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemContainerAdapter;
import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
public final class HeroinfoActivity_Inventory extends Fragment implements CustomMenuInflater.MenuItemSelectedListener {

16
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/HeroinfoActivity_Quests.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import java.util.ArrayList;
import java.util.HashMap;
@@ -15,13 +15,13 @@ import android.view.ViewGroup;
import android.widget.ExpandableListView;
import android.widget.SimpleExpandableListAdapter;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.model.quest.Quest;
import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.Quest;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
public final class HeroinfoActivity_Quests extends Fragment {

20
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/HeroinfoActivity_Skills.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import java.util.ArrayList;
@@ -14,15 +14,15 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.ListView;
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.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.view.SkillListAdapter;
import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
public final class HeroinfoActivity_Skills extends Fragment {
private static final int INTENTREQUEST_SKILLINFO = 12;

30
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/HeroinfoActivity_Stats.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import java.util.ArrayList;
@@ -15,20 +15,20 @@ import android.widget.TableLayout;
import android.widget.TableRow;
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.GameStatistics;
import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.model.item.Inventory;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail.view.RangeBar;
import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.GameStatistics;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.HeroCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail_beta2.view.RangeBar;
import com.gpl.rpg.AndorsTrail_beta2.view.TraitsInfoView;
public final class HeroinfoActivity_Stats extends Fragment {

24
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/ShopActivityFragment.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import java.util.HashSet;
@@ -13,17 +13,17 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
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.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter;
import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta2.view.ShopItemContainerAdapter;
import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail_beta2.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
public abstract class ShopActivityFragment extends Fragment implements OnContainerItemClickedListener {

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/ShopActivity_Buy.java
View File

@@ -1,13 +1,13 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import android.app.Activity;
import android.content.Intent;
import com.gpl.rpg.AndorsTrail.Dialogs;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
public final class ShopActivity_Buy extends ShopActivityFragment {

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/ShopActivity_Sell.java
View File

@@ -1,13 +1,13 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import android.app.Activity;
import android.content.Intent;
import com.gpl.rpg.AndorsTrail.Dialogs;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
public final class ShopActivity_Sell extends ShopActivityFragment {

34
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/StartScreenActivity_MainMenu.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import android.Manifest;
import android.annotation.SuppressLint;
@@ -22,22 +22,22 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
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.WorldSetup;
import com.gpl.rpg.AndorsTrail.activity.AboutActivity;
import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
import com.gpl.rpg.AndorsTrail.activity.Preferences;
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;
import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail.util.L;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.WorldSetup;
import com.gpl.rpg.AndorsTrail_beta2.activity.AboutActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.LoadingActivity;
import com.gpl.rpg.AndorsTrail_beta2.activity.Preferences;
import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames.FileHeader;
import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
public class StartScreenActivity_MainMenu extends Fragment {

14
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/activity/fragment/StartScreenActivity_NewGame.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;
package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
import android.app.Activity;
import android.content.Intent;
@@ -15,12 +15,12 @@ import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.WorldSetup;
import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.WorldSetup;
import com.gpl.rpg.AndorsTrail_beta2.activity.LoadingActivity;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
public class StartScreenActivity_NewGame extends Fragment {

30
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/context/ControllerContext.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/context/ControllerContext.java
View File

@@ -1,24 +1,24 @@
package com.gpl.rpg.AndorsTrail.context;
package com.gpl.rpg.AndorsTrail_beta2.context;
import java.lang.ref.WeakReference;
import android.content.Context;
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.ConversationController;
import com.gpl.rpg.AndorsTrail.controller.GameRoundController;
import com.gpl.rpg.AndorsTrail.controller.InputController;
import com.gpl.rpg.AndorsTrail.controller.ItemController;
import com.gpl.rpg.AndorsTrail.controller.MapController;
import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController;
import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController;
import com.gpl.rpg.AndorsTrail.controller.MovementController;
import com.gpl.rpg.AndorsTrail.controller.SkillController;
import com.gpl.rpg.AndorsTrail.controller.VisualEffectController;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.controller.ActorStatsController;
import com.gpl.rpg.AndorsTrail_beta2.controller.CombatController;
import com.gpl.rpg.AndorsTrail_beta2.controller.ConversationController;
import com.gpl.rpg.AndorsTrail_beta2.controller.GameRoundController;
import com.gpl.rpg.AndorsTrail_beta2.controller.InputController;
import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
import com.gpl.rpg.AndorsTrail_beta2.controller.MapController;
import com.gpl.rpg.AndorsTrail_beta2.controller.MonsterMovementController;
import com.gpl.rpg.AndorsTrail_beta2.controller.MonsterSpawningController;
import com.gpl.rpg.AndorsTrail_beta2.controller.MovementController;
import com.gpl.rpg.AndorsTrail_beta2.controller.SkillController;
import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController;
public final class ControllerContext {
//Controllers

26
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/context/WorldContext.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/context/WorldContext.java
View File

@@ -1,17 +1,17 @@
package com.gpl.rpg.AndorsTrail.context;
package com.gpl.rpg.AndorsTrail_beta2.context;
import com.gpl.rpg.AndorsTrail.model.ModelContainer;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
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;
import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionTypeCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterTypeCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.item.DropListCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemCategoryCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTypeCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestCollection;
import com.gpl.rpg.AndorsTrail_beta2.resource.ConversationLoader;
import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
public final class WorldContext {
//Objectcollections

48
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/ActorStatsController.java
View File

@@ -1,31 +1,31 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.util.ArrayList;
import java.util.List;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListeners;
import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListeners;
import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
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;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
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.Inventory;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.ActorConditionListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.ActorStatsListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.PlayerStatsListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.AbilityModifierTraits;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.StatsModifierTraits;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnEquip;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
public final class ActorStatsController {
private final ControllerContext controllers;

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/AttackResult.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/AttackResult.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
public final class AttackResult {
public final boolean isHit;

42
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/CombatController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/CombatController.java
View File

@@ -1,30 +1,30 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.util.ArrayList;
import android.os.Handler;
import android.os.Message;
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.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.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
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 com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController.VisualEffectCompletedCallback;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatSelectionListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatTurnListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import static java.lang.Math.max;

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/Constants.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.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 com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
import com.gpl.rpg.AndorsTrail_beta2.util.Range;
public final class Constants {
public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;

54
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/ConversationController.java
View File

@@ -1,35 +1,35 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.util.ArrayList;
import android.content.res.Resources;
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.model.GameStatistics;
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 com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
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.ConversationCollection;
import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
import com.gpl.rpg.AndorsTrail.model.script.Requirement;
import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
import com.gpl.rpg.AndorsTrail.util.ConstRange;
import com.gpl.rpg.AndorsTrail.util.L;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.GameStatistics;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.conversation.ConversationCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Phrase;
import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Reply;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTypeCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestProgress;
import com.gpl.rpg.AndorsTrail_beta2.model.script.Requirement;
import com.gpl.rpg.AndorsTrail_beta2.model.script.ScriptEffect;
import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
public final class ConversationController {

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/GameRoundController.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListeners;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.GameRoundListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.util.TimedMessageTask;
public final class GameRoundController implements TimedMessageTask.Callback {

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/InputController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/InputController.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import android.content.Context;
import android.content.Intent;
@@ -8,11 +8,11 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
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.util.Coord;
import com.gpl.rpg.AndorsTrail.util.L;
import com.gpl.rpg.AndorsTrail_beta2.activity.HeroinfoActivity;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
public final class InputController implements OnClickListener, OnLongClickListener{
private final ControllerContext controllers;

34
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ItemController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/ItemController.java
View File

@@ -1,24 +1,24 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.util.ArrayList;
import java.util.Collection;
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.QuickSlotListeners;
import com.gpl.rpg.AndorsTrail.model.ModelContainer;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
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.ItemContainer.ItemEntry;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.QuickSlotListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.AbilityModifierTraits;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer.ItemEntry;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import static java.lang.Math.min;

30
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/MapController.java
View File

@@ -1,23 +1,23 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.util.List;
import android.content.res.Resources;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListeners;
import com.gpl.rpg.AndorsTrail.controller.listeners.WorldEventListeners;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
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.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.model.map.ReplaceableMapSection;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.MapLayoutListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.WorldEventListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Reply;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.ReplaceableMapSection;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
public final class MapController {

28
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/MonsterMovementController.java
View File

@@ -1,18 +1,18 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
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.map.MonsterSpawnArea;
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_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.PathFinder.EvaluateWalkable;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.MonsterMovementListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
public final class MonsterMovementController implements EvaluateWalkable {
private final ControllerContext controllers;

24
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/MonsterSpawningController.java
View File

@@ -1,16 +1,16 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterSpawnListeners;
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.MonsterSpawnArea;
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.Size;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.MonsterSpawnListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.Size;
public final class MonsterSpawningController {
private final ControllerContext controllers;

38
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MovementController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/MovementController.java
View File

@@ -1,26 +1,26 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
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;
import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListeners;
import com.gpl.rpg.AndorsTrail.model.MapBundle;
import com.gpl.rpg.AndorsTrail.model.ModelContainer;
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.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.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.L;
import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.PlayerMovementListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.MapBundle;
import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.TMXMapTranslator;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
import com.gpl.rpg.AndorsTrail_beta2.util.TimedMessageTask;
public final class MovementController implements TimedMessageTask.Callback {
private final ControllerContext controllers;

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/PathFinder.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/PathFinder.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.util.Arrays;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
public class PathFinder {
private final int maxWidth;

36
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/SkillController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/SkillController.java
View File

@@ -1,22 +1,22 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection.SkillID;
import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
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.util.ConstRange;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection.SkillID;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.item.DropList.DropItem;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemCategory;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTypeCollection;
import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
public final class SkillController {
private final ControllerContext controllers;

30
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/VisualEffectController.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import android.graphics.Color;
import android.graphics.Paint;
@@ -6,20 +6,20 @@ import android.graphics.Paint.Align;
import android.graphics.Rect;
import android.os.Handler;
import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
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.Actor;
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;
import com.gpl.rpg.AndorsTrail.util.Size;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.VisualEffectFrameListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection.VisualEffect;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.Size;
public final class VisualEffectController {
private int effectCount = 0;

34
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/WorldMapController.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.controller;
package com.gpl.rpg.AndorsTrail_beta2.controller;
import java.io.File;
import java.io.FileOutputStream;
@@ -18,22 +18,22 @@ import android.graphics.Paint;
import android.os.AsyncTask;
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.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;
import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
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.Size;
import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.activity.DisplayWorldMapActivity;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapLayer;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment;
import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment.NamedWorldMapArea;
import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment.WorldMapSegmentMap;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
import com.gpl.rpg.AndorsTrail_beta2.util.Size;
public final class WorldMapController {

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/ActorConditionListener.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
public interface ActorConditionListener {
public void onActorConditionAdded(Actor actor, ActorCondition condition);

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/ActorConditionListeners.java
View File

@@ -1,8 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class ActorConditionListeners extends ListOfListeners<ActorConditionListener> implements ActorConditionListener {

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/ActorStatsListener.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
public interface ActorStatsListener {
void onActorHealthChanged(Actor actor);

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/ActorStatsListeners.java
View File

@@ -1,8 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Actor;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class ActorStatsListeners extends ListOfListeners<ActorStatsListener> implements ActorStatsListener {

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/CombatActionListener.java
View File

@@ -1,8 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.controller.AttackResult;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.controller.AttackResult;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
public interface CombatActionListener {
void onPlayerAttackMissed(Monster target, AttackResult attackResult);

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/CombatActionListeners.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.controller.AttackResult;
import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.AttackResult;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class CombatActionListeners extends ListOfListeners<CombatActionListener> implements CombatActionListener {

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/CombatSelectionListener.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
public interface CombatSelectionListener {
void onMonsterSelected(Monster m, Coord selectedPosition, Coord previousSelection);

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/CombatSelectionListeners.java
View File

@@ -1,8 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class CombatSelectionListeners extends ListOfListeners<CombatSelectionListener> implements CombatSelectionListener {

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/CombatTurnListener.java
View File

@@ -1,6 +1,6 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
public interface CombatTurnListener {
void onCombatStarted();

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/CombatTurnListeners.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class CombatTurnListeners extends ListOfListeners<CombatTurnListener> implements CombatTurnListener {

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/GameRoundListener.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
public interface GameRoundListener {
void onNewTick();

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/GameRoundListeners.java
View File

@@ -1,6 +1,6 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class GameRoundListeners extends ListOfListeners<GameRoundListener> implements GameRoundListener {

11
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/MapLayoutListener.java Normal file
View File

@@ -0,0 +1,11 @@
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
public interface MapLayoutListener {
void onLootBagCreated(PredefinedMap map, Coord p);
void onLootBagRemoved(PredefinedMap map, Coord p);
void onMapTilesChanged(PredefinedMap map, LayeredTileMap tileMap);
}

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/MapLayoutListeners.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class MapLayoutListeners extends ListOfListeners<MapLayoutListener> implements MapLayoutListener {

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/MonsterMovementListener.java Normal file
View File

@@ -0,0 +1,10 @@
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
public interface MonsterMovementListener {
void onMonsterSteppedOnPlayer(Monster m);
void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition);
}

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/MonsterMovementListeners.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.util.CoordRect;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class MonsterMovementListeners extends ListOfListeners<MonsterMovementListener> implements MonsterMovementListener {

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/MonsterSpawnListener.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
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_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
public interface MonsterSpawnListener {
void onMonsterSpawned(PredefinedMap map, Monster m);

12
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/MonsterSpawnListeners.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
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;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class MonsterSpawnListeners extends ListOfListeners<MonsterSpawnListener> implements MonsterSpawnListener {

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/PlayerMovementListener.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
public interface PlayerMovementListener {
void onPlayerMoved(PredefinedMap map, Coord newPosition, Coord previousPosition);

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/PlayerMovementListeners.java
View File

@@ -1,8 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class PlayerMovementListeners extends ListOfListeners<PlayerMovementListener> implements PlayerMovementListener {

7
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/PlayerStatsListener.java Normal file
View File

@@ -0,0 +1,7 @@
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
public interface PlayerStatsListener {
void onPlayerExperienceChanged(Player p);
}

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/PlayerStatsListeners.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class PlayerStatsListeners extends ListOfListeners<PlayerStatsListener> implements PlayerStatsListener {

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/QuickSlotListener.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
public interface QuickSlotListener {
void onQuickSlotChanged(int slotId);

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/QuickSlotListeners.java
View File

@@ -1,6 +1,6 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class QuickSlotListeners extends ListOfListeners<QuickSlotListener> implements QuickSlotListener {

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/VisualEffectFrameListener.java
View File

@@ -1,8 +1,8 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
import com.gpl.rpg.AndorsTrail.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController.SpriteMoveAnimation;
import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController.VisualEffectAnimation;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
public interface VisualEffectFrameListener {
void onNewAnimationFrame(VisualEffectAnimation animation, int tileID, int textYOffset);

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/VisualEffectFrameListeners.java
View File

@@ -1,9 +1,9 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.SpriteMoveAnimation;
import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectAnimation;
import com.gpl.rpg.AndorsTrail.util.CoordRect;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController.SpriteMoveAnimation;
import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController.VisualEffectAnimation;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class VisualEffectFrameListeners extends ListOfListeners<VisualEffectFrameListener> implements VisualEffectFrameListener {

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/WorldEventListener.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import java.util.Collection;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
public interface WorldEventListener {
void onPlayerStartedConversation(Monster m, String phraseID);

10
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/controller/listeners/WorldEventListeners.java
View File

@@ -1,11 +1,11 @@
package com.gpl.rpg.AndorsTrail.controller.listeners;
package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
import java.util.Collection;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.model.item.Loot;
import com.gpl.rpg.AndorsTrail.model.map.MapObject;
import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
public final class WorldEventListeners extends ListOfListeners<WorldEventListener> implements WorldEventListener {

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/CombatLog.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/CombatLog.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.model;
package com.gpl.rpg.AndorsTrail_beta2.model;
import java.util.LinkedList;
import java.util.ListIterator;

14
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/GameStatistics.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/GameStatistics.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.model;
package com.gpl.rpg.AndorsTrail_beta2.model;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -13,12 +13,12 @@ import java.util.Set;
import android.content.res.Resources;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail.model.quest.Quest;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.model.quest.Quest;
public final class GameStatistics {
private int deaths = 0;

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/InterfaceData.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/InterfaceData.java
View File

@@ -1,11 +1,11 @@
package com.gpl.rpg.AndorsTrail.model;
package com.gpl.rpg.AndorsTrail_beta2.model;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
public final class InterfaceData {
public boolean isMainActivityVisible = false;

11
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/MapBundle.java Normal file
View File

@@ -0,0 +1,11 @@
package com.gpl.rpg.AndorsTrail_beta2.model;
import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
public final class MapBundle {
public PredefinedMap map;
public LayeredTileMap tileMap;
public TileCollection tiles;
}

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ModelContainer.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ModelContainer.java
View File

@@ -1,12 +1,12 @@
package com.gpl.rpg.AndorsTrail.model;
package com.gpl.rpg.AndorsTrail_beta2.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_beta2.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
public final class ModelContainer {

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/WorldData.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/WorldData.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.model;
package com.gpl.rpg.AndorsTrail_beta2.model;
import java.io.DataInputStream;
import java.io.DataOutputStream;

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/ActorCondition.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.model.ability;
package com.gpl.rpg.AndorsTrail_beta2.model.ability;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
public final class ActorCondition {
public static final int MAGNITUDE_REMOVE_ALL = -99;

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/ActorConditionEffect.java
View File

@@ -1,6 +1,6 @@
package com.gpl.rpg.AndorsTrail.model.ability;
package com.gpl.rpg.AndorsTrail_beta2.model.ability;
import com.gpl.rpg.AndorsTrail.util.ConstRange;
import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
public final class ActorConditionEffect {
public final ActorConditionType conditionType;

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/ActorConditionType.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.model.ability;
package com.gpl.rpg.AndorsTrail_beta2.model.ability;
import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.AbilityModifierTraits;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.StatsModifierTraits;
public final class ActorConditionType {
public static enum ConditionCategory {

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/ActorConditionTypeCollection.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.model.ability;
package com.gpl.rpg.AndorsTrail_beta2.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 com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta2.resource.parsers.ActorConditionsTypeParser;
import com.gpl.rpg.AndorsTrail_beta2.util.L;
public final class ActorConditionTypeCollection {
private final HashMap<String, ActorConditionType> conditionTypes = new HashMap<String, ActorConditionType>();

8
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/SkillCollection.java
View File

@@ -1,12 +1,12 @@
package com.gpl.rpg.AndorsTrail.model.ability;
package com.gpl.rpg.AndorsTrail_beta2.model.ability;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
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 com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo.SkillLevelRequirement;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
public final class SkillCollection {
public static enum SkillID {

4
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/SkillInfo.java
View File

@@ -1,6 +1,6 @@
package com.gpl.rpg.AndorsTrail.model.ability;
package com.gpl.rpg.AndorsTrail_beta2.model.ability;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
public final class SkillInfo {
public static final int MAXLEVEL_NONE = -1;

2
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/traits/AbilityModifierTraits.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail.model.ability.traits;
package com.gpl.rpg.AndorsTrail_beta2.model.ability.traits;
public final class AbilityModifierTraits {
public final int increaseMaxHP;

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/ability/traits/StatsModifierTraits.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.model.ability.traits;
package com.gpl.rpg.AndorsTrail_beta2.model.ability.traits;
import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail.util.ConstRange;
import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
public final class StatsModifierTraits {
public final VisualEffectCollection.VisualEffectID visualEffectID;

16
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/Actor.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/actor/Actor.java
View File

@@ -1,16 +1,16 @@
package com.gpl.rpg.AndorsTrail.model.actor;
package com.gpl.rpg.AndorsTrail_beta2.model.actor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.CoordRect;
import com.gpl.rpg.AndorsTrail.util.Range;
import com.gpl.rpg.AndorsTrail.util.Size;
import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta2.util.Range;
import com.gpl.rpg.AndorsTrail_beta2.util.Size;
public class Actor {
public int iconID;

6
AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/actor/HeroCollection.java → AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail_beta2/model/actor/HeroCollection.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail.model.actor;
package com.gpl.rpg.AndorsTrail_beta2.model.actor;
import java.util.LinkedList;
import java.util.List;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.resource.DynamicTileLoader;
import com.gpl.rpg.AndorsTrail_beta2.R;
import com.gpl.rpg.AndorsTrail_beta2.resource.DynamicTileLoader;
public class HeroCollection {

Some files were not shown because too many files have changed in this diff Show More