From: paramat <mat.gregory@virginmedia.com>
Date: Sat, 30 May 2015 06:20:25 +0000 (+0100)
Subject: Default: New obsidian brick texture. Add river water textures
X-Git-Tag: 0.4.13~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=40e2b945e33fff87c50cd304d2c253e1e85d13c7;p=oweals%2Fminetest_game.git

Default: New obsidian brick texture. Add river water textures
---

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 56083c06..5e726eeb 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -109,6 +109,10 @@ paramat (CC BY-SA 3.0):
   default_pinetree_top.png
   default_pinewood.png
   default_sandstone_brick.png
+  default_obsidian_brick.png
+  default_river_water.png
+  default_river_water_source_animated.png
+  default_river_water_flowing_animated.png
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index f24cd9af..ae141957 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -968,11 +968,11 @@ minetest.register_node("default:water_flowing", {
 
 minetest.register_node("default:river_water_source", {
 	description = "River Water Source",
-	inventory_image = minetest.inventorycube("default_water.png"),
+	inventory_image = minetest.inventorycube("default_river_water.png"),
 	drawtype = "liquid",
 	tiles = {
 		{
-			name = "default_water_source_animated.png",
+			name = "default_river_water_source_animated.png",
 			animation = {
 				type = "vertical_frames",
 				aspect_w = 16,
@@ -983,7 +983,7 @@ minetest.register_node("default:river_water_source", {
 	},
 	special_tiles = {
 		{
-			name = "default_water_source_animated.png",
+			name = "default_river_water_source_animated.png",
 			animation = {
 				type = "vertical_frames",
 				aspect_w = 16,
@@ -1008,18 +1008,18 @@ minetest.register_node("default:river_water_source", {
 	liquid_viscosity = 1,
 	liquid_renewable = false,
 	liquid_range = 2,
-	post_effect_color = {a=64, r=100, g=100, b=200},
+	post_effect_color = {a=64, r=100, g=178, b=200},
 	groups = {water=3, liquid=3, puts_out_fire=1},
 })
 
 minetest.register_node("default:river_water_flowing", {
 	description = "Flowing River Water",
-	inventory_image = minetest.inventorycube("default_water.png"),
+	inventory_image = minetest.inventorycube("default_river_water.png"),
 	drawtype = "flowingliquid",
-	tiles = {"default_water.png"},
+	tiles = {"default_river_water.png"},
 	special_tiles = {
 		{
-			name = "default_water_flowing_animated.png",
+			name = "default_river_water_flowing_animated.png",
 			backface_culling = false,
 			animation = {
 				type = "vertical_frames",
@@ -1029,7 +1029,7 @@ minetest.register_node("default:river_water_flowing", {
 			},
 		},
 		{
-			name = "default_water_flowing_animated.png",
+			name = "default_river_water_flowing_animated.png",
 			backface_culling = true,
 			animation = {
 				type = "vertical_frames",
@@ -1055,7 +1055,7 @@ minetest.register_node("default:river_water_flowing", {
 	liquid_viscosity = 1,
 	liquid_renewable = false,
 	liquid_range = 2,
-	post_effect_color = {a=64, r=100, g=100, b=200},
+	post_effect_color = {a=64, r=100, g=178, b=200},
 	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
 })
 
diff --git a/mods/default/textures/default_obsidian_brick.png b/mods/default/textures/default_obsidian_brick.png
index 79a38150..30c67caa 100644
Binary files a/mods/default/textures/default_obsidian_brick.png and b/mods/default/textures/default_obsidian_brick.png differ
diff --git a/mods/default/textures/default_river_water.png b/mods/default/textures/default_river_water.png
new file mode 100644
index 00000000..3b55c5f6
Binary files /dev/null and b/mods/default/textures/default_river_water.png differ
diff --git a/mods/default/textures/default_river_water_flowing_animated.png b/mods/default/textures/default_river_water_flowing_animated.png
new file mode 100644
index 00000000..536acc53
Binary files /dev/null and b/mods/default/textures/default_river_water_flowing_animated.png differ
diff --git a/mods/default/textures/default_river_water_source_animated.png b/mods/default/textures/default_river_water_source_animated.png
new file mode 100644
index 00000000..daa5653f
Binary files /dev/null and b/mods/default/textures/default_river_water_source_animated.png differ