OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2025-12-26 16:07:57 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

rename to prod version build, without debuggable and read_log

Browse Source
This commit is contained in:
Nut.andor
2022-04-15 16:50:31 +02:00
parent 09656bc4bf
commit 7f0499c701
227 changed files with 1429 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
AndorsTrail/AndroidManifest.xml
View File

@@ -2,9 +2,9 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.gpl.rpg.AndorsTrail_beta1"
package="com.gpl.rpg.AndorsTrail"
android:versionCode="64"
android:versionName="0.7.17beta"
android:versionName="0.7.17"
android:installLocation="auto"
>
<uses-sdk
@@ -22,11 +22,10 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS"/>
<application
android:name="com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication"
android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
android:label="@string/app_name"
android:icon="@drawable/icon"
android:description="@string/app_description"
@@ -35,10 +34,9 @@
android:requestLegacyExternalStorage="true"
android:hasFragileUserData="true"
android:preserveLegacyExternalStorage="true"
android:debuggable="true"
>
<activity
android:name="com.gpl.rpg.AndorsTrail_beta1.activity.StartScreenActivity"
android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
android:clearTaskOnLaunch="true"
>
<intent-filter>
@@ -47,29 +45,29 @@
</intent-filter>
</activity>
<activity
android:name="com.gpl.rpg.AndorsTrail_beta1.activity.MainActivity"
android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
android:label="@string/app_name"
android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
/>
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.HeroinfoActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ShopActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.AboutActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.LoadingActivity" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.Preferences" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
<activity android:name="com.gpl.rpg.AndorsTrail_beta1.activity.DisplayWorldMapActivity" />
<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" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.gpl.rpg.AndorsTrail_beta1.fileprovider"
android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
android:grantUriPermissions="true"
android:exported="false">
<meta-data

2
AndorsTrail/res/drawable/ui_blue_buttonbar_frame.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail_beta1" >
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
<item app:single="true" android:drawable="@drawable/ui_blue_buttonbar_frame_solo" />

2
AndorsTrail/res/drawable/ui_charcoal_buttonbar_frame.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail_beta1" >
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
<item app:single="true" android:drawable="@drawable/ui_charcoal_buttonbar_frame_solo" />

2
AndorsTrail/res/drawable/ui_green_buttonbar_frame.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail_beta1" >
xmlns:app="http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail" >
<item app:single="true" android:drawable="@drawable/ui_green_buttonbar_frame_solo" />

6
AndorsTrail/res/layout-land/title_bg_layout.xml
View File

@@ -6,7 +6,7 @@
<include layout="@layout/title_bg_sky_layout"/>
<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
android:id="@+id/ts_clouds_animator_back"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -19,7 +19,7 @@
android:scaleType="fitEnd"
android:src="@drawable/ts_background"/>
<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
android:id="@+id/ts_clouds_animator_mid"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -32,7 +32,7 @@
android:scaleType="fitEnd"
android:src="@drawable/ts_midground"/>
<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
android:id="@+id/ts_clouds_animator_front"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
AndorsTrail/res/layout/actorconditioninfo.xml
View File

@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:text="@string/actorconditioninfo_constant_effect" />
<com.gpl.rpg.AndorsTrail_beta1.view.AbilityModifierInfoView
<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
AndorsTrail/res/layout/combatview.xml
View File

@@ -29,7 +29,7 @@
android:text="@string/combat_attack"
android:textSize="@dimen/actionbar_text" />
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/combatview_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
android:padding="8dp"
android:scaleType="fitCenter" />
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/combatview_monsterhealth"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.gpl.rpg.AndorsTrail_beta1.view.SelectableTextView xmlns:android="http://schemas.android.com/apk/res/android"
<com.gpl.rpg.AndorsTrail.view.SelectableTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="@style/checkedListItem"
android:layout_width="match_parent"

10
AndorsTrail/res/layout/heroinfo_stats.xml
View File

@@ -72,18 +72,18 @@
android:background="?attr/ui_theme_stdframe_bitmap"
android:orientation="vertical" >
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_healthbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_expbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5sp" />
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/heroinfo_apbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -144,7 +144,7 @@
<include layout="@layout/traitsinfoview" />
</TableLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/actorinfo_onhiteffects"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -156,7 +156,7 @@
android:layout_height="wrap_content"
android:text="@string/actorinfo_currentconditions" />
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionList
<com.gpl.rpg.AndorsTrail.view.ActorConditionList
android:id="@+id/actorinfo_currentconditions"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

14
AndorsTrail/res/layout/itemeffectview.xml
View File

@@ -12,14 +12,14 @@
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.AbilityModifierInfoView
<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
android:id="@+id/itemeffect_onequip_abilitymodifierinfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10sp"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
android:id="@+id/itemeffect_onequip_conditions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse
android:id="@+id/itemeffect_onuse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse
android:id="@+id/itemeffect_onhit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse
android:id="@+id/itemeffect_onkill"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnHitReceived
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnHitReceived
android:id="@+id/itemeffect_onhitreceived"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnDeath
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnDeath
android:id="@+id/itemeffect_ondeath"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
AndorsTrail/res/layout/itemeffectview_ondeath.xml
View File

@@ -21,7 +21,7 @@
>
</LinearLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
android:id="@+id/itemeffect_ondeath_conditions_source"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
AndorsTrail/res/layout/itemeffectview_onhitreceived.xml
View File

@@ -21,7 +21,7 @@
>
</LinearLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
android:id="@+id/itemeffect_onhitreceived_conditions_source"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
>
</LinearLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
android:id="@+id/itemeffect_onhitreceived_conditions_target"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
AndorsTrail/res/layout/itemeffectview_onuse.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
android:id="@+id/itemeffect_onuse_conditions_source"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionEffectList
<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
android:id="@+id/itemeffect_onuse_conditions_target"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
AndorsTrail/res/layout/iteminfo.xml
View File

@@ -55,7 +55,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/iteminfo_effects"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

12
AndorsTrail/res/layout/main.xml
View File

@@ -6,14 +6,14 @@
android:id="@+id/main_container"
>
<com.gpl.rpg.AndorsTrail_beta1.view.StatusView
<com.gpl.rpg.AndorsTrail.view.StatusView
android:id="@+id/main_statusview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.QuickitemView
<com.gpl.rpg.AndorsTrail.view.QuickitemView
android:id="@+id/main_quickitemview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
android:visibility="gone"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.CombatView
<com.gpl.rpg.AndorsTrail.view.CombatView
android:id="@+id/main_combatview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
android:visibility="gone"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.ToolboxView
<com.gpl.rpg.AndorsTrail.view.ToolboxView
android:id="@+id/main_toolboxview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
android:visibility="gone"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.MainView
<com.gpl.rpg.AndorsTrail.view.MainView
android:id="@+id/main_mainview"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -72,7 +72,7 @@
android:gravity="right"
/>
<com.gpl.rpg.AndorsTrail_beta1.view.VirtualDpadView
<com.gpl.rpg.AndorsTrail.view.VirtualDpadView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/main_virtual_dpad"

6
AndorsTrail/res/layout/monsterinfo.xml
View File

@@ -46,7 +46,7 @@
android:text="@string/monster_difficulty_normal" />
</LinearLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/monsterinfo_healthbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
<include layout="@layout/traitsinfoview" />
</TableLayout>
<com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView
<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
android:id="@+id/actorinfo_onhiteffects"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -81,7 +81,7 @@
android:layout_marginTop="@dimen/section_margin"
android:text="@string/actorinfo_currentconditions" />
<com.gpl.rpg.AndorsTrail_beta1.view.ActorConditionList
<com.gpl.rpg.AndorsTrail.view.ActorConditionList
android:id="@+id/actorinfo_currentconditions"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

4
AndorsTrail/res/layout/statusview.xml
View File

@@ -36,12 +36,12 @@
android:layout_toRightOf="@id/status_image"
android:orientation="vertical" >
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/statusview_health"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.gpl.rpg.AndorsTrail_beta1.view.RangeBar
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/statusview_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

6
AndorsTrail/res/layout/title_bg_layout.xml
View File

@@ -6,7 +6,7 @@
<include layout="@layout/title_bg_sky_layout"/>
<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
android:id="@+id/ts_clouds_animator_back"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -21,7 +21,7 @@
android:adjustViewBounds="true"
android:src="@drawable/ts_background"/>
<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
android:id="@+id/ts_clouds_animator_mid"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -36,7 +36,7 @@
android:adjustViewBounds="true"
android:src="@drawable/ts_midground"/>
<com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView
<com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView
android:id="@+id/ts_clouds_animator_front"
android:layout_width="match_parent"
android:layout_height="match_parent"

20
AndorsTrail/res/xml/preferences.xml
View File

@@ -7,14 +7,14 @@
android:defaultValue="true"
android:summary="@string/preferences_display_fullscreen"
android:key="fullscreen" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_display_theme_title"
android:summary="@string/preferences_display_theme"
android:key="selectedTheme"
android:defaultValue="0"
android:entries="@array/preferences_display_theme"
android:entryValues="@array/preferences_display_theme_values" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_display_scaling_factor_title"
android:summary="@string/preferences_display_scaling_factor"
android:key="scaling_factor"
@@ -44,14 +44,14 @@
android:defaultValue="true"
android:summary="@string/preferences_dialog_confirmattack"
android:key="confirm_attack" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_dialog_monsterloot_title"
android:summary="@string/preferences_dialog_monsterloot"
android:key="display_lootdialog"
android:defaultValue="0"
android:entries="@array/preferences_display_loot"
android:entryValues="@array/preferences_display_loot_values" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_dialog_overwrite_savegame_title"
android:summary="@string/preferences_dialog_overwrite_savegame"
android:key="display_overwrite_savegame"
@@ -61,7 +61,7 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/preferences_combat_category">
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_combat_speed_title"
android:summary="@string/preferences_combat_speed"
android:key="attackspeed"
@@ -71,21 +71,21 @@
</PreferenceCategory>
<PreferenceCategory
android:title="@string/preferences_movement_category">
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_movementmethod_title"
android:summary="@string/preferences_movementmethod"
android:key="movementmethod"
android:defaultValue="0"
android:entries="@array/preferences_movementmethods"
android:entryValues="@array/preferences_movementmethod_values" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_movement_dpad_position_title"
android:summary="@string/preferences_movement_dpad_position"
android:key="dpadposition"
android:defaultValue="0"
android:entries="@array/preferences_movement_dpad_positions"
android:entryValues="@array/preferences_movement_dpad_positions_values" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_movement_dpad_transparency_title"
android:summary="@string/preferences_movement_dpad_transparency"
android:key="dpadtransparency"
@@ -105,7 +105,7 @@
android:defaultValue="true"
android:summary="@string/preferences_ui_enable_animations"
android:key="enableUiAnimations" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_quickslots_placement"
android:summary="@string/preferences_quickslots_placement_summary"
android:key="quickslots_placement"
@@ -117,7 +117,7 @@
android:defaultValue="false"
android:summary="@string/preferences_ui_show_quickslots_when_toolbox_is_visible"
android:key="showQuickslotsWhenToolboxIsVisible" />
<com.gpl.rpg.AndorsTrail_beta1.view.CustomListPreference
<com.gpl.rpg.AndorsTrail.view.CustomListPreference
android:title="@string/preferences_language"
android:summary="@string/preferences_language_description"
android:key="language"

14
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailApplication.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
View File

@@ -1,14 +1,14 @@
package com.gpl.rpg.AndorsTrail_beta1;
package com.gpl.rpg.AndorsTrail;
import java.io.File;
import java.io.IOException;
import java.util.Locale;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.controller.Constants;
import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail_beta1.util.Pair;
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 android.app.Activity;
import android.app.Application;
@@ -28,7 +28,7 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_FASTSPEED = false;
public static final boolean DEVELOPMENT_VALIDATEDATA = false;
public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
public static final String CURRENT_VERSION_DISPLAY = "0.7.17beta";
public static final String CURRENT_VERSION_DISPLAY = "0.7.17";
public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/AndorsTrailPreferences.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
View File

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

48
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/Dialogs.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1;
package com.gpl.rpg.AndorsTrail;
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_beta1.activity.ActorConditionInfoActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.BulkSelectionInterface;
import com.gpl.rpg.AndorsTrail_beta1.activity.ConversationActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.ItemInfoActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.LevelUpActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.LoadSaveActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.MainActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.MonsterEncounterActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.MonsterInfoActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.SkillInfoActivity;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_MainMenu;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta1.model.item.Inventory;
import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta1.model.item.Loot;
import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
import com.gpl.rpg.AndorsTrail_beta1.view.ItemContainerAdapter;
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;
public final class Dialogs {

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/WorldSetup.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1;
package com.gpl.rpg.AndorsTrail;
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_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta1.resource.ResourceLoader;
import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
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;
public final class WorldSetup {

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AboutActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class AboutActivity extends AndorsTrailBaseActivity implements ImageGetter {

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ActorConditionInfoActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.ability.ActorConditionType;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.AbilityModifierInfoView;
import com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView_OnUse;
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;
public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java
View File

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

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/AndorsTrailBaseFragmentActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java
View File

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

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/BulkSelectionInterface.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.controller.ItemController;
import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemType;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
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;
/**
* @author ejwessel

34
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ConversationActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
View File

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

20
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DebugInterface.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
View File

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

24
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/DisplayWorldMapActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
View File

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

18
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/HeroinfoActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Inventory;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Quests;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Skills;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.HeroinfoActivity_Stats;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
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;
public final class HeroinfoActivity extends AndorsTrailBaseFragmentActivity {
private WorldContext world;

14
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ItemInfoActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
View File

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

18
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LevelUpActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
View File

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

20
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadSaveActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.model.ModelContainer;
import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames.FileHeader;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
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;
public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
private boolean isLoading = true;

20
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/LoadingActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.WorldSetup;
import com.gpl.rpg.AndorsTrail_beta1.WorldSetup.OnResourcesLoadedListener;
import com.gpl.rpg.AndorsTrail_beta1.WorldSetup.OnSceneLoadedListener;
import com.gpl.rpg.AndorsTrail_beta1.savegames.Savegames;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
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;
public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {

70
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MainActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

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

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterEncounterActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
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;
public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {

22
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/MonsterInfoActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail_beta1.view.RangeBar;
import com.gpl.rpg.AndorsTrail_beta1.view.TraitsInfoView;
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;
public final class MonsterInfoActivity extends AndorsTrailBaseActivity {

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/Preferences.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
View File

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

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/ShopActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.ShopActivity_Buy;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.ShopActivity_Sell;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
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;
public final class ShopActivity extends AndorsTrailBaseFragmentActivity {

20
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/SkillInfoActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
View File

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

24
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/StartScreenActivity.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
View File

@@ -1,16 +1,16 @@
package com.gpl.rpg.AndorsTrail_beta1.activity;
package com.gpl.rpg.AndorsTrail.activity;
import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailPreferences;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_MainMenu;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_NewGame;
import com.gpl.rpg.AndorsTrail_beta1.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta1.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail_beta1.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail_beta1.view.CustomDialogFactory;
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 android.app.Activity;
import android.app.Dialog;

34
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Inventory.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
View File

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

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Quests.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta1.model.quest.Quest;
import com.gpl.rpg.AndorsTrail_beta1.model.quest.QuestLogEntry;
import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
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;
public final class HeroinfoActivity_Quests extends Fragment {

20
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Skills.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.ability.SkillCollection;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta1.view.SkillListAdapter;
import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
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;
public final class HeroinfoActivity_Skills extends Fragment {
private static final int INTENTREQUEST_SKILLINFO = 12;

30
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/HeroinfoActivity_Stats.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
View File

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

24
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivityFragment.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.Dialogs;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Monster;
import com.gpl.rpg.AndorsTrail_beta1.model.actor.Player;
import com.gpl.rpg.AndorsTrail_beta1.model.item.ItemContainer;
import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta1.view.ShopItemContainerAdapter;
import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
import com.gpl.rpg.AndorsTrail_beta1.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
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;
public abstract class ShopActivityFragment extends Fragment implements OnContainerItemClickedListener {

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Buy.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
View File

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

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/ShopActivity_Sell.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
View File

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

34
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_MainMenu.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java
View File

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

14
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/activity/fragment/StartScreenActivity_NewGame.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.activity.fragment;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.WorldSetup;
import com.gpl.rpg.AndorsTrail_beta1.activity.LoadingActivity;
import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail_beta1.view.SpinnerEmulator;
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;
public class StartScreenActivity_NewGame extends Fragment {

30
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/ControllerContext.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
View File

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

26
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/context/WorldContext.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
View File

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

48
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ActorStatsController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
View File

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

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/AttackResult.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/AttackResult.java
View File

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

42
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
View File

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

0
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/CombatControllerTest.java.txt → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatControllerTest.java.txt
View File

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/Constants.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail_beta1.controller;
package com.gpl.rpg.AndorsTrail.controller;
import java.util.Random;
import com.gpl.rpg.AndorsTrail_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.util.ConstRange;
import com.gpl.rpg.AndorsTrail_beta1.util.Range;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.util.ConstRange;
import com.gpl.rpg.AndorsTrail.util.Range;
public final class Constants {
public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;

54
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ConversationController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
View File

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

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/GameRoundController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
View File

@@ -1,10 +1,10 @@
package com.gpl.rpg.AndorsTrail_beta1.controller;
package com.gpl.rpg.AndorsTrail.controller;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.controller.listeners.GameRoundListeners;
import com.gpl.rpg.AndorsTrail_beta1.model.map.MapObject;
import com.gpl.rpg.AndorsTrail_beta1.util.TimedMessageTask;
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;
public final class GameRoundController implements TimedMessageTask.Callback {

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/InputController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
View File

@@ -1,13 +1,13 @@
package com.gpl.rpg.AndorsTrail_beta1.controller;
package com.gpl.rpg.AndorsTrail.controller;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
import com.gpl.rpg.AndorsTrail_beta1.context.ControllerContext;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
import com.gpl.rpg.AndorsTrail.context.ControllerContext;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.util.Coord;
public final class InputController implements OnClickListener, OnLongClickListener{
private final ControllerContext controllers;

34
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/ItemController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
View File

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

30
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MapController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
View File

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

28
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterMovementController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
View File

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

24
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MonsterSpawningController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
View File

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

38
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/MovementController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/PathFinder.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
View File

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

36
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/SkillController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
View File

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

30
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/VisualEffectController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
View File

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

34
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/WorldMapController.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
View File

@@ -1,4 +1,4 @@
package com.gpl.rpg.AndorsTrail_beta1.controller;
package com.gpl.rpg.AndorsTrail.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_beta1.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail_beta1.R;
import com.gpl.rpg.AndorsTrail_beta1.activity.DisplayWorldMapActivity;
import com.gpl.rpg.AndorsTrail_beta1.context.WorldContext;
import com.gpl.rpg.AndorsTrail_beta1.model.map.LayeredTileMap;
import com.gpl.rpg.AndorsTrail_beta1.model.map.MapLayer;
import com.gpl.rpg.AndorsTrail_beta1.model.map.PredefinedMap;
import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment;
import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.NamedWorldMapArea;
import com.gpl.rpg.AndorsTrail_beta1.model.map.WorldMapSegment.WorldMapSegmentMap;
import com.gpl.rpg.AndorsTrail_beta1.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail_beta1.util.AndroidStorage;
import com.gpl.rpg.AndorsTrail_beta1.util.Coord;
import com.gpl.rpg.AndorsTrail_beta1.util.CoordRect;
import com.gpl.rpg.AndorsTrail_beta1.util.L;
import com.gpl.rpg.AndorsTrail_beta1.util.Size;
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;
public final class WorldMapController {

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorConditionListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java
View File

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

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/ActorStatsListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListeners.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
View File

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

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatActionListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
View File

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

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListener.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatSelectionListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
View File

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

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListener.java
View File

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

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/CombatTurnListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
View File

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

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListener.java
View File

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

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/GameRoundListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
View File

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

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

@@ -0,0 +1,11 @@
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/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MapLayoutListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MapLayoutListeners.java
View File

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

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

@@ -0,0 +1,10 @@
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);
}

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterMovementListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
View File

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

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListener.java
View File

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

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/MonsterSpawnListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
View File

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

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListener.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerMovementListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
View File

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

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

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

6
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/PlayerStatsListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerStatsListeners.java
View File

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

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListener.java
View File

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

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/QuickSlotListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/QuickSlotListeners.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListener.java
View File

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

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/VisualEffectFrameListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/VisualEffectFrameListeners.java
View File

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

8
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListener.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListener.java
View File

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

10
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/controller/listeners/WorldEventListeners.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
View File

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

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail_beta1/model/CombatLog.java → AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/CombatLog.java
View File

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

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