Merge branch 'master' into feature/latrine

android/augustus/src/main/java/com/github/Keriew/augustus/FileManager.java

@@ -16,6 +16,7 @@ public class FileManager {
 
     private static final int FILE_TYPE_DIR = 1;
     private static final int FILE_TYPE_FILE = 2;
+    private static final int DIRECTORY_EXISTS = -1;
 
     @SuppressWarnings("unused")
     public static String getC3Path() {
@@ -218,6 +219,45 @@ public static int openFileDescriptor(AugustusMainActivity activity, String fileP
             return 0;
         }
     }
+
+    @SuppressWarnings("unused")
+    public static int createFolder(AugustusMainActivity activity, String folderPath) {
+        try {
+            if (baseUri == Uri.EMPTY) {
+                return 0;
+            }
+            if (folderPath.startsWith("./")) {
+                folderPath = folderPath.substring(2);
+            }
+
+            String[] folderParts = folderPath.split("[\\\\/]");
+            String folderName = folderParts[folderParts.length - 1];
+            FileInfo folderInfo = getDirectoryFromPath(activity, folderParts);
+            if (folderInfo == null) {
+                return 0;
+            }
+            FileInfo newFolderInfo = findFile(activity, folderInfo, folderName);
+            if (newFolderInfo != null) {
+                return newFolderInfo.isDirectory() ? DIRECTORY_EXISTS : 0;
+            }
+            Uri folderUri = DocumentsContract.createDocument(activity.getContentResolver(),
+                folderInfo.getUri(), DocumentsContract.Document.MIME_TYPE_DIR, folderName);
+            if (folderUri == null) {
+                return 0;
+            }
+            HashMap<String, FileInfo> dirCache = directoryStructureCache.get(folderInfo.getUri());
+            if (dirCache != null) {
+                newFolderInfo = new FileInfo(DocumentsContract.getDocumentId(folderUri),
+                    folderName, DocumentsContract.Document.MIME_TYPE_DIR,
+                    System.currentTimeMillis(), folderInfo.getUri());
+                dirCache.put(folderName.toLowerCase(), newFolderInfo);
+            }
+        } catch (Exception e) {
+            Log.e("augustus", "Error in createFolder: " + e);
+            return 0;
+        }
+        return 1;
+    }
 
     @SuppressWarnings("unused")
     public static class FileInfo {

res/assets/Graphics/Industry.xml

@@ -514,7 +514,7 @@
 	<!-- Note: Sand Overlay for Supplied Workshop -->
 	<image id="Sand_Supplied_Workshop" src="Sand_Supplied_Workshop" width="25" height="21"/>
 	<!-- Note: Silver Cart -->
-	<image id="Silver_Cart_NE" width="39" height="39">
+	<!--image id="Silver_Cart_NE" width="39" height="39">
 		<layer group="97" image="0" x="0" y="0"/>
 		<layer src="Silver_Cart_NE" x="0" y="0"/>
 	</image>
@@ -545,9 +545,9 @@
 	<image id="Silver_Cart_N" width="39" height="39">
 		<layer group="97" image="7" x="0" y="0"/>
 		<layer src="Silver_Cart_N" x="0" y="0"/>
-	</image>
+	</image-->
 	<!-- Note: Silver Getting Cart -->
-	<image id="Silver_Cart_Getting_NE" width="39" height="39">
+	<!--image id="Silver_Cart_Getting_NE" width="39" height="39">
 		<layer group="97" image="0" x="0" y="0"/>
 		<layer src="Silver_Cart_Getting_NE" x="15" y="4"/>
 	</image>
@@ -578,9 +578,9 @@
 	<image id="Silver_Cart_Getting_N" width="39" height="39">
 		<layer group="97" image="7" x="0" y="0"/>
 		<layer src="Silver_Cart_Getting_N" x="15" y="4"/>
-	</image>
+	</image-->
 	<!-- Note: Silver Warehouse Tiles -->
-	<image id="Warehouse_Silver_01" isometric="true">
+	<!--image id="Warehouse_Silver_01" isometric="true">
 		<layer group="83" image="0" x="0" y="0"/>
 		<layer src="Warehouse_Silver_01" x="20" y="14"/>
 	</image>
@@ -595,7 +595,7 @@
 	<image id="Warehouse_Silver_04" isometric="true">
 		<layer group="83" image="0" x="0" y="0"/>
 		<layer src="Warehouse_Silver_04" x="9" y="1"/>
-	</image>
+	</image-->
 	<!-- Note: Plain Stone Quarry OFF - Climate Variants -->
 	<image id="Stone_Quarry_C_OFF" src="Stone_Quarry_C_OFF" width="118" height="60" isometric="true"/>
 	<image id="Stone_Quarry_N_OFF" src="Stone_Quarry_N_OFF" width="118" height="60" isometric="true"/>
@@ -750,10 +750,10 @@
 		<layer src="Warehouse_Stone_04" x="4" y="0"/>
 	</image>
 	<!-- Note: Smoke Animation Frames -->
-	<image src="Smoke_Anim_01" id="Smoke_Anim"/>
+	<!--image src="Smoke_Anim_01" id="Smoke_Anim"/>
 	<image src="Smoke_Anim_02"/>
 	<image src="Smoke_Anim_03"/>
 	<image src="Smoke_Anim_04"/>
 	<image src="Smoke_Anim_05"/>
-	<image src="Smoke_Anim_06"/>
+	<image src="Smoke_Anim_06"/-->
 </assetlist>

res/assets/Graphics/aesthetics.xml

@@ -292,33 +292,67 @@
 	<image id="L Hedge 04" src="Light_Green_Hedge_Corner_02" isometric="true"/>
 	<image id="L Hedge 05" src="Light_Green_Hedge_Corner_03" isometric="true"/>
 	<image id="L Hedge 06" src="Light_Green_Hedge_Corner_04" isometric="true"/>
-	<image id="L Hedge 07" src="Light_Green_Hedge_Intersection_01" isometric="true"/>
-	<image id="L Hedge 08" src="Light_Green_Hedge_Intersection_02" isometric="true"/>
-	<image id="L Hedge 09" src="Light_Green_Hedge_Intersection_03" isometric="true"/>
-	<image id="L Hedge 10" src="Light_Green_Hedge_Intersection_04" isometric="true"/>
-	<image id="L Hedge 11" src="Light_Green_Hedge_Intersections_4w" isometric="true"/>
+	<image id="L Hedge 07" isometric="true" width="58" height="42">
+		<layer group="this" image="L Hedge 02"/>
+		<layer src="Light_Green_Hedge_Intersection_01" x="9" y="0"/>
+	</image>
+	<image id="L Hedge 08" isometric="true" width="58" height="42">
+		<layer group="this" image="L Hedge 01"/>
+		<layer src="Light_Green_Hedge_Intersection_02" x="5" y="0"/>
+	</image>
+	<image id="L Hedge 09" isometric="true" width="58" height="42">
+		<layer group="this" image="L Hedge 01"/>
+		<layer group="this" image="L Hedge 04"/>
+	</image>
+	<image id="L Hedge 10" isometric="true" width="58" height="42">
+		<layer group="this" image="L Hedge 02"/>
+		<layer group="this" image="L Hedge 04"/>
+	</image>
+	<image id="L Hedge 11" isometric="true" width="58" height="42">
+		<layer group="this" image="L Hedge 01"/>
+		<layer group="this" image="L Hedge 02"/>
+		<layer group="this" image="L Hedge 04"/>
+	</image>
 	<!-- Note: Assets for 'Verdant Hedge' including all directions and intersection variants -->
 	<image id="D Hedge 01" src="Dark_Green_Hedge" isometric="true"/>
 	<image id="D Hedge 02" src="Dark_Green_Hedge_R" isometric="true"/>
 	<image id="D Hedge 03" src="Dark_Green_Hedge_Corner_01" isometric="true"/>
 	<image id="D Hedge 04" src="Dark_Green_Hedge_Corner_02" isometric="true"/>
 	<image id="D Hedge 05" src="Dark_Green_Hedge_Corner_03" isometric="true"/>
 	<image id="D Hedge 06" src="Dark_Green_Hedge_Corner_04" isometric="true"/>
-	<image id="D Hedge 07" src="Dark_Green_Hedge_Intersection_01" isometric="true"/>
-	<image id="D Hedge 08" src="Dark_Green_Hedge_Intersection_02" isometric="true"/>
-	<image id="D Hedge 09" src="Dark_Green_Hedge_Intersection_03" isometric="true"/>
-	<image id="D Hedge 10" src="Dark_Green_Hedge_Intersection_04" isometric="true"/>
-	<image id="D Hedge 11" src="Dark_Green_Hedge_Intersections_4w" isometric="true"/>
+	<image id="D Hedge 07" isometric="true" width="58" height="42">
+		<layer group="this" image="D Hedge 02"/>
+		<layer src="Dark_Green_Hedge_Intersection_01" x="9" y="0"/>
+	</image>
+	<image id="D Hedge 08" isometric="true" width="58" height="42">
+		<layer group="this" image="D Hedge 01"/>
+		<layer src="Dark_Green_Hedge_Intersection_02" x="5" y="0"/>
+	</image>
+	<image id="D Hedge 09" isometric="true" width="58" height="42">
+		<layer group="this" image="D Hedge 01"/>
+		<layer group="this" image="D Hedge 04"/>
+	</image>
+	<image id="D Hedge 10" isometric="true" width="58" height="42">
+		<layer group="this" image="D Hedge 02"/>
+		<layer group="this" image="D Hedge 04"/>
+	</image>
+	<image id="D Hedge 11" isometric="true" width="58" height="42">
+		<layer group="this" image="D Hedge 01"/>
+		<layer group="this" image="D Hedge 02"/>
+		<layer group="this" image="D Hedge 04"/>
+	</image>
 	<!-- Note: Assets for 'Hedge Gates' including both directions/colours -->
 	<image id="L Hedge Gate" width="58" height="56" isometric="true">
-		<layer src="Light_Green_Hedge_Gate" x="0" y="8"/>
+		<layer src="Dark_Green_Hedge_Gate" x="0" y="8"/>
+		<layer src="Light_Green_Hedge_Gate" x="10" y="8"/>
 		<layer src="Light_Green_Hedge_Gate_Top" x="15" y="0"/>
 		<animation speed="1" x="15" y="0" reversible="false">
 			<frame src="Light_Green_Hedge_Gate_Top"/>
 		</animation>
 	</image>
 	<image id="L Hedge Gate R" width="58" height="56" isometric="true">
-		<layer src="Light_Green_Hedge_R_Gate" x="24" y="8"/>
+		<layer src="Dark_Green_Hedge_R_Gate" x="24" y="8"/>
+		<layer src="Light_Green_Hedge_R_Gate" x="43" y="8"/>
 		<layer src="Light_Green_Hedge_R_Gate_Top" x="0" y="0"/>
 		<animation speed="1" x="0" y="0" reversible="false">
 			<frame src="Light_Green_Hedge_R_Gate_Top"/>
@@ -427,21 +461,42 @@
 	<image id="Garden_Wall_C_04" src="Garden_Wall_C_Corner_02" isometric="true"/>
 	<image id="Garden_Wall_C_05" src="Garden_Wall_C_Corner_03" isometric="true"/>
 	<image id="Garden_Wall_C_06" src="Garden_Wall_C_Corner_04" isometric="true"/>
-	<image id="Garden_Wall_C_07" src="Garden_Wall_C_Intersection_01" isometric="true"/>
-	<image id="Garden_Wall_C_08" src="Garden_Wall_C_Intersection_02" isometric="true"/>
-	<image id="Garden_Wall_C_09" src="Garden_Wall_C_Intersection_03" isometric="true"/>
-	<image id="Garden_Wall_C_10" src="Garden_Wall_C_Intersection_04" isometric="true"/>
-	<image id="Garden_Wall_C_11" src="Garden_Wall_C_Intersection_4w" isometric="true"/>
+	<image id="Garden_Wall_C_07" isometric="true" width="58" height="48">
+		<layer group="this" image="Garden_Wall_C_02"/>
+		<layer src="Garden_Wall_C_Intersection_01" x="12" y="0"/>
+	</image>
+	<image id="Garden_Wall_C_08" isometric="true" width="58" height="48">
+		<layer group="this" image="Garden_Wall_C_01"/>
+		<layer src="Garden_Wall_C_Intersection_02" x="29" y="0"/>
+	</image>
+	<image id="Garden_Wall_C_09" isometric="true" width="58" height="48">
+		<layer group="this" image="Garden_Wall_C_01"/>
+		<layer group="this" image="Garden_Wall_C_04"/>
+		<layer src="Garden_Wall_C_Intersection_03" x="23" y="5"/>
+	</image>
+	<image id="Garden_Wall_C_10" isometric="true" width="58" height="48">
+		<layer group="this" image="Garden_Wall_C_02"/>
+		<layer group="this" image="Garden_Wall_C_04"/>
+		<layer src="Garden_Wall_C_Intersection_04" x="30" y="5"/>
+	</image>
+	<image id="Garden_Wall_C_11" isometric="true" width="58" height="48">
+		<layer group="this" image="Garden_Wall_C_06"/>
+		<layer group="this" image="Garden_Wall_C_04"/>
+		<layer src="Garden_Wall_C_Intersection_04" x="30" y="5"/>
+		<layer src="Garden_Wall_C_Intersection_03" x="23" y="5"/>
+	</image>
 	<!-- Note: Assets for 'Panelled garden wall gate' with rotation variant -->
 	<image id="Garden_Gate_C" width="58" height="61" isometric="true">
-		<layer src="Garden_Gate_C" x="0" y="17"/>
+		<layer src="Garden_Gate_B" x="0" y="17"/>
+		<layer src="Garden_Gate_C" x="8" y="17"/>
 		<layer src="Garden_Gate_C_Top" x="7" y="0"/>
 		<animation speed="1" x="7" y="0" reversible="false">
 			<frame src="Garden_Gate_C_Top"/>
 		</animation>
 	</image>
 	<image id="Garden_Gate_C_R" width="58" height="61" isometric="true">
-		<layer src="Garden_Gate_C_R" x="23" y="17"/>
+		<layer src="Garden_Gate_B_R" x="23" y="17"/>
+		<layer src="Garden_Gate_C_R" x="46" y="17"/>
 		<layer src="Garden_Gate_C_R_Top" x="0" y="0"/>
 		<animation speed="1" x="0" y="0" reversible="false">
 			<frame src="Garden_Gate_C_R_Top"/>

res/assets/Graphics/health_culture.xml

@@ -36,7 +36,7 @@
 	<image src="Doctor_heal_plague_05"/>
 	<image src="Doctor_heal_plague_06"/>
 	<!-- Note: College Building Asset -->
-	<image id="College" src="College" isometric="true"/>
+	<!--image id="College" src="College" isometric="true"/-->
 	<!-- Note: Latrine Building Asset -->
 	<image id="Latrine_C" src="Latrine_C" width="58" height="39" isometric="true"/>
 	<image id="Latrine_N" width="58" height="39" isometric="true">

res/assets/Graphics/military.xml

@@ -632,7 +632,7 @@
 		</animation>
 	</image>
 	<!-- Note: Assets for 'Palisade tower' with rotation and climate variants -->
-	<image id="Palisade_Tower_C" width="58" height="75" isometric="true">
+	<!--image id="Palisade_Tower_C" width="58" height="75" isometric="true">
 		<layer src="Palisade_Terrain_C" x="0" y="45"/>
 		<layer src="Palisade_Tower" x="0" y="0"/>
 	</image>
@@ -658,7 +658,7 @@
 		<layer src="Palisade_Terrain_S" x="0" y="45"/>
 		<layer src="Palisade_Tower" x="0" y="0"/>
 		<layer src="Palisade_Tower_R" x="12" y="41"/>
-	</image>
+	</image-->
 	<!-- Note: Fort climate variants -->
 	<image id="Fort_Main_Central" isometric="true">
 		<layer group="66" image="0" x="0" y="0"/>