From: fred-boy <fredboy@protonmail.com>
Date: Mon, 15 Jun 2020 20:44:40 +0000 (+0700)
Subject: Update items and textures
X-Git-Tag: alpha0.4~8
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=919c74edce6bafc2dc7364e2c898e44f9b6c9ae3;p=cavedroid.git

Update items and textures
---

diff --git a/android/assets/allitems.png b/android/assets/allitems.png
index 58dfb47..e829d77 100644
Binary files a/android/assets/allitems.png and b/android/assets/allitems.png differ
diff --git a/android/assets/background.png b/android/assets/background.png
index 1774f86..9dd527e 100644
Binary files a/android/assets/background.png and b/android/assets/background.png differ
diff --git a/android/assets/background_top.png b/android/assets/background_top.png
new file mode 100644
index 0000000..1a5d850
Binary files /dev/null and b/android/assets/background_top.png differ
diff --git a/android/assets/buttons.png b/android/assets/buttons.png
index 8528014..a99c611 100644
Binary files a/android/assets/buttons.png and b/android/assets/buttons.png differ
diff --git a/android/assets/gui.png b/android/assets/gui.png
index 6542140..8423be2 100644
Binary files a/android/assets/gui.png and b/android/assets/gui.png differ
diff --git a/android/assets/items.png b/android/assets/items.png
deleted file mode 100644
index 1da9653..0000000
Binary files a/android/assets/items.png and /dev/null differ
diff --git a/android/assets/json/game_items.json b/android/assets/json/game_items.json
index aa7bb3e..042f0c9 100644
--- a/android/assets/json/game_items.json
+++ b/android/assets/json/game_items.json
@@ -71,8 +71,9 @@
     "log_oak": {
       "hp": 180
     },
-    "leaves": {
-      "hp": 21
+    "leaves_oak": {
+      "hp": 21,
+      "transparent": true
     },
     "sponge": {
       "hp": 54
@@ -272,7 +273,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16
@@ -284,7 +285,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16,
@@ -297,7 +298,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16,
@@ -310,7 +311,7 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "texture": "water_still",
+      "texture": "water_flow",
       "meta": "water",
       "animated": true,
       "frames": 16,
@@ -321,7 +322,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16
@@ -332,7 +333,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16,
@@ -344,7 +345,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16,
@@ -356,7 +357,7 @@
       "collision": false,
       "background": false,
       "fluid": true,
-      "texture": "lava_still",
+      "texture": "lava_flow",
       "meta": "lava",
       "animated": true,
       "frames": 16,
@@ -431,7 +432,7 @@
       "name": "Wood",
       "type": "block"
     },
-    "leaves": {
+    "leaves_oak": {
       "name": "Leaves",
       "type": "block"
     },
diff --git a/android/assets/mobs/char/0_0.png b/android/assets/mobs/char/0_0.png
index 6ff1ff5..bae953d 100644
Binary files a/android/assets/mobs/char/0_0.png and b/android/assets/mobs/char/0_0.png differ
diff --git a/android/assets/mobs/char/0_1.png b/android/assets/mobs/char/0_1.png
index 5a31625..eff8cc6 100644
Binary files a/android/assets/mobs/char/0_1.png and b/android/assets/mobs/char/0_1.png differ
diff --git a/android/assets/mobs/char/0_2.png b/android/assets/mobs/char/0_2.png
index 0eb4f93..3ee74ab 100644
Binary files a/android/assets/mobs/char/0_2.png and b/android/assets/mobs/char/0_2.png differ
diff --git a/android/assets/mobs/char/0_3.png b/android/assets/mobs/char/0_3.png
index 660f3cb..4da236a 100644
Binary files a/android/assets/mobs/char/0_3.png and b/android/assets/mobs/char/0_3.png differ
diff --git a/android/assets/mobs/char/1_0.png b/android/assets/mobs/char/1_0.png
index 2995fa7..2c1a2b2 100644
Binary files a/android/assets/mobs/char/1_0.png and b/android/assets/mobs/char/1_0.png differ
diff --git a/android/assets/mobs/char/1_1.png b/android/assets/mobs/char/1_1.png
index 6805730..eff8cc6 100644
Binary files a/android/assets/mobs/char/1_1.png and b/android/assets/mobs/char/1_1.png differ
diff --git a/android/assets/mobs/char/1_2.png b/android/assets/mobs/char/1_2.png
index d0701b5..c173562 100644
Binary files a/android/assets/mobs/char/1_2.png and b/android/assets/mobs/char/1_2.png differ
diff --git a/android/assets/mobs/char/1_3.png b/android/assets/mobs/char/1_3.png
index c0ef26c..3ee37e4 100644
Binary files a/android/assets/mobs/char/1_3.png and b/android/assets/mobs/char/1_3.png differ
diff --git a/android/assets/mobs/pig/0_0.png b/android/assets/mobs/pig/0_0.png
index 75c3b89..5c80806 100644
Binary files a/android/assets/mobs/pig/0_0.png and b/android/assets/mobs/pig/0_0.png differ
diff --git a/android/assets/mobs/pig/0_1.png b/android/assets/mobs/pig/0_1.png
index a36c37e..4e64f88 100644
Binary files a/android/assets/mobs/pig/0_1.png and b/android/assets/mobs/pig/0_1.png differ
diff --git a/android/assets/mobs/pig/1_0.png b/android/assets/mobs/pig/1_0.png
index 8ef2387..ed31acc 100644
Binary files a/android/assets/mobs/pig/1_0.png and b/android/assets/mobs/pig/1_0.png differ
diff --git a/android/assets/mobs/pig/1_1.png b/android/assets/mobs/pig/1_1.png
index c549d26..5a7acc5 100644
Binary files a/android/assets/mobs/pig/1_1.png and b/android/assets/mobs/pig/1_1.png differ
diff --git a/android/assets/terrain.png b/android/assets/terrain.png
deleted file mode 100644
index f17c02a..0000000
Binary files a/android/assets/terrain.png and /dev/null differ
diff --git a/android/assets/textures/blocks/lava.png b/android/assets/textures/blocks/lava.png
deleted file mode 100644
index 6585048..0000000
Binary files a/android/assets/textures/blocks/lava.png and /dev/null differ
diff --git a/android/assets/textures/blocks/lava_12.png b/android/assets/textures/blocks/lava_12.png
deleted file mode 100644
index ca2bd32..0000000
Binary files a/android/assets/textures/blocks/lava_12.png and /dev/null differ
diff --git a/android/assets/textures/blocks/lava_16.png b/android/assets/textures/blocks/lava_16.png
deleted file mode 100644
index 6585048..0000000
Binary files a/android/assets/textures/blocks/lava_16.png and /dev/null differ
diff --git a/android/assets/textures/blocks/lava_4.png b/android/assets/textures/blocks/lava_4.png
deleted file mode 100644
index 1e46885..0000000
Binary files a/android/assets/textures/blocks/lava_4.png and /dev/null differ
diff --git a/android/assets/textures/blocks/lava_8.png b/android/assets/textures/blocks/lava_8.png
deleted file mode 100644
index 0b638e9..0000000
Binary files a/android/assets/textures/blocks/lava_8.png and /dev/null differ
diff --git a/android/assets/textures/blocks/leaves.png b/android/assets/textures/blocks/leaves.png
deleted file mode 100644
index 58c2104..0000000
Binary files a/android/assets/textures/blocks/leaves.png and /dev/null differ
diff --git a/android/assets/textures/blocks/water.png b/android/assets/textures/blocks/water.png
deleted file mode 100644
index 9fff324..0000000
Binary files a/android/assets/textures/blocks/water.png and /dev/null differ
diff --git a/android/assets/textures/blocks/water_12.png b/android/assets/textures/blocks/water_12.png
deleted file mode 100644
index 24f9187..0000000
Binary files a/android/assets/textures/blocks/water_12.png and /dev/null differ
diff --git a/android/assets/textures/blocks/water_16.png b/android/assets/textures/blocks/water_16.png
deleted file mode 100644
index 9fff324..0000000
Binary files a/android/assets/textures/blocks/water_16.png and /dev/null differ
diff --git a/android/assets/textures/blocks/water_4.png b/android/assets/textures/blocks/water_4.png
deleted file mode 100644
index e6a9432..0000000
Binary files a/android/assets/textures/blocks/water_4.png and /dev/null differ
diff --git a/android/assets/textures/blocks/water_8.png b/android/assets/textures/blocks/water_8.png
deleted file mode 100644
index 4dc9f38..0000000
Binary files a/android/assets/textures/blocks/water_8.png and /dev/null differ