ATCS Project stoutford_combined finally integrated!

# Conflicts:
#	AndorsTrail/res/raw/conversationlist_fallhaven_south.json
#	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
#	AndorsTrail/res/raw/questlist_pathway_fallhaven.json

AndorsTrail/AndorsTrail.iml

@@ -18,7 +18,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

AndorsTrail/AndroidManifest.xml

@@ -3,13 +3,13 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="40"
-	android:versionName="0.7.1dev"
+	android:versionCode="43"
+	android:versionName="0.7.2dev"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
-		android:minSdkVersion="4" 
-		android:targetSdkVersion="17"
+		android:minSdkVersion="4"
+		android:targetSdkVersion="21"
 		/>
 	
 	<supports-screens
@@ -23,6 +23,8 @@
 	<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=".AndorsTrailApplication" 
@@ -30,6 +32,7 @@
 		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
+        android:theme="@style/AndorsTrailTheme_Blue"
 		>
 		<activity 
 		    android:name=".activity.StartScreenActivity" 
@@ -43,22 +46,22 @@
    		<activity 
 			android:name=".activity.MainActivity" 
 			android:label="@string/app_name" 
-			android:theme="@style/Theme.NoBackground"
+			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
 		<activity android:name=".activity.HeroinfoActivity" />
-		<activity android:name=".activity.MonsterInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ItemInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.LevelUpActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ConversationActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
 		<activity android:name=".activity.ShopActivity" />
 		<activity android:name=".activity.AboutActivity" />
 		<activity android:name=".activity.LoadingActivity" />
 		<activity android:name=".activity.Preferences" />
-		<activity android:name=".activity.LoadSaveActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.BulkSelectionInterface" android:theme="@android:style/Theme.Dialog" />
-		<activity android:name=".activity.SkillInfoActivity" android:theme="@android:style/Theme.Dialog" />
+		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
 		<activity android:name=".activity.DisplayWorldMapActivity" />
 	</application>
 	

AndorsTrail/assets/translation/english.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Andors Trail\n"
-"POT-Creation-Date: Sat Oct 26 09:46:51 CEST 2013\n"
+"POT-Creation-Date: Sun Nov 10 11:14:56 CET 2013\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Oskar Wiksten <oskar.wiksten@gmail.com>\n"
 "Language-Team: \n"
@@ -5020,7 +5020,7 @@ msgid "She's always nagging me about how I should move out of what she considers
 msgstr ""
 
 #: conversationlist_elwyl.json:elwyl_7
-msgid "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sakes if YOU moved out."
+msgid "Ahem. As I've told you several times, Elwyl, since it's YOU that is causing all the trouble, I think it would be best for both our sake if YOU moved out."
 msgstr ""
 
 #: conversationlist_elwyl.json:elwyl_8
@@ -12066,7 +12066,7 @@ msgid "I have discovered that if you mix some ground up claws from a beast calle
 msgstr ""
 
 #: conversationlist_lodar.json:lodar_spo3_0
-msgid "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective."
+msgid "Up in the north, I have heard tales of beast called the Arulir. Their skin is thick as bark due to the interesting oily substance that they produce. I have learned that if you extract some of that thick oily substance, and mix it with an infectious claw from some monster, you can make a potion that makes your skin almost as tough as theirs. I will require two of those skins for it to be effective, and I believe you can find the type of claws that I require on monsters that dwell underground and in caves somewhere outside Fallhaven."
 msgstr ""
 
 #: conversationlist_lodar.json:lodar_xul0
@@ -26481,7 +26481,7 @@ msgid "Lodar can create a potion of strength if I bring him a dead spider and th
 msgstr ""
 
 #: questlist_v070_lodar.json:lodar_pots:43
-msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster."
+msgid "Lodar can create a potent defensive potion if I bring him two Arulir skins and a claw from some monster. The Arulir beasts can be found somewhere up in the north, and the claws can apparently be found from creatures that dwell underground and in caves somewhere outside Fallhaven."
 msgstr ""
 
 #: questlist_v070_lodar.json:xulviir
@@ -26563,3 +26563,44 @@ msgstr ""
 #: questlist_v070_misc.json:antifoodp:40
 msgid "I can bring him more ingredients if I want him to create more antidote potions in the future."
 msgstr ""
+
+#: worldmap.xml::blackwater:prim
+msgid "Prim"
+msgstr ""
+
+#: worldmap.xml::world1:charwoodh
+msgid "Charwood"
+msgstr ""
+
+#: worldmap.xml::world1:crossglen
+msgid "Crossglen"
+msgstr ""
+
+#: worldmap.xml::world1:crossroads
+msgid "Crossroads Guardhouse"
+msgstr ""
+
+#: worldmap.xml::world1:fallhaven
+msgid "Fallhaven"
+msgstr ""
+
+#: worldmap.xml::world1:flagstone
+msgid "Flagstone Prison"
+msgstr ""
+
+#: worldmap.xml::world1:fflask
+msgid "Foaming Flask Tavern"
+msgstr ""
+
+#: worldmap.xml::world1:loneford
+msgid "Loneford"
+msgstr ""
+
+#: worldmap.xml::world1:remgard
+msgid "Remgard"
+msgstr ""
+
+#: worldmap.xml::world1:vilegard
+msgid "Vilegard"
+msgstr ""
+

AndorsTrail/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-17
+target=android-21

AndorsTrail/res/anim/hidemonsterconditionbar.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:interpolator="@android:anim/accelerate_interpolator"
+	android:fromYDelta="0%"
+	android:toYDelta="-100%"
+	android:duration="300"
+	/>

AndorsTrail/res/anim/hidemonsterconditionbutton.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:interpolator="@android:anim/accelerate_interpolator"
+	android:fromXDelta="0%"
+	android:toXDelta="100%"
+	android:duration="300"
+	/>

AndorsTrail/res/anim/showmonsterconditionbar.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:interpolator="@android:anim/decelerate_interpolator"
+	android:fromYDelta="-100%"
+	android:toYDelta="0%"
+	android:duration="300"
+	/>
+	

AndorsTrail/res/anim/showmonsterconditionbutton.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:interpolator="@android:anim/decelerate_interpolator"
+	android:fromXDelta="100%"
+	android:toXDelta="0%"
+	android:duration="300"
+	/>
+	

AndorsTrail/res/color/ui_blue_textbutton_textcolor.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_pressed="true" android:color="@color/ui_blue_palette_text_gray_light"/>
+ 	<item android:state_enabled="true" android:state_checked="true" android:color="@color/ui_blue_palette_text_gray_light"/>
+ 	<item android:state_enabled="true" android:color="@color/ui_blue_palette_text_gray_mid"/>
+ 	<item android:state_enabled="false" android:color="@color/ui_blue_palette_text_gray_darker"/>
+ 	<item android:color="@color/ui_blue_palette_text_gray_mid"/>
+</selector>

AndorsTrail/res/drawable/loading_anim.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:oneshot="false">
+        
+    <item android:drawable="@drawable/loading_anim_00"
+        android:duration="150" />
+    <item android:drawable="@drawable/loading_anim_01"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_02"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_03"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_04"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_05"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_06"
+        android:duration="80" />
+    <item android:drawable="@drawable/loading_anim_00"
+        android:duration="150" />
+
+</animation-list>

AndorsTrail/res/drawable/sky_gradient_drawable.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:tileMode="repeat"
+    android:src="@drawable/ts_sky_gradient_x6"
+    android:antialias="false"
+    android:dither="false"
+    />

AndorsTrail/res/drawable/title_logo_animated.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:oneshot="false">
+        
+    <item android:drawable="@drawable/logo_anim_shine_00"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_01"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_02"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_03"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_04"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_05"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_06"
+        android:duration="180" />
+    <item android:drawable="@drawable/logo_anim_shine_07"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_08"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_09"
+        android:duration="80" />
+    <item android:drawable="@drawable/logo_anim_shine_00"
+        android:duration="5000" />
+
+</animation-list>