From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Wed, 25 Nov 2015 15:54:33 +0000 (+0100)
Subject: some more block types and utilize prototyping
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=38f6d1d15a6d1469a080d77e9fcdafe5c545abf0;p=blank-assets.git

some more block types and utilize prototyping
---

diff --git a/data/default.types b/data/default.types
index b0b264b..3c114ca 100644
--- a/data/default.types
+++ b/data/default.types
@@ -1,3 +1,6 @@
+// default min solidity is 0.5 which marks the border of the solid world
+// anything with less than that will be incredibly common on the surface
+
 white_coarse = {
 	texture = "rock-1";
 	label = "Coarse White";
@@ -10,212 +13,190 @@ white_coarse = {
 	max_temperature = 0.0;
 	mid_temperature = -0.5;
 };
-white_smooth = {
+white_smooth = white_coarse {
 	texture = "rock-2";
 	label = "Smooth White";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	mid_solidity = 0.6;
-	max_temperature = 0.0;
-	mid_temperature = -0.5;
+	max_solidity = 1.0;
 };
-white_hard = {
+white_hard = white_coarse {
 	texture = "rock-3";
 	label = "Hard White";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	min_solidity = 0.7;
 	mid_solidity = 1.0;
-	max_temperature = 0.0;
-	mid_temperature = -0.5;
+	max_solidity = 1.0;
 };
-white_slab = {
-	texture = "rock-1";
+white_slab = white_coarse {
 	label = "White Slab";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_low_slab;
+	generate = false;
 };
-white_stair = {
-	texture = "rock-1";
+white_stair = white_coarse {
 	label = "White Stair";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_stair;
+	generate = false;
 };
 
-red_coarse = {
-	texture = "rock-1";
-	rgb_mod = [ 1, 0, 0 ];
+red_coarse = white_coarse {
+	rgb_mod = [ 0.8, 0.2, 0.2 ];
 	label = "Coarse Red";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
-	mid_solidity = 0.5;
-	max_solidity = 0.75;
 	min_temperature = 0.0;
 	mid_temperature = 0.5;
+	max_temperature = 1.0;
 	max_humidity = 0.0;
 	mid_humidity = -0.5;
 };
-red_smooth = {
+red_smooth = red_coarse {
 	texture = "rock-2";
-	rgb_mod = [ 1, 0, 0 ];
 	label = "Smooth Red";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	mid_solidity = 0.6;
-	min_temperature = 0.0;
-	mid_temperature = 0.5;
-	max_humidity = 0.0;
-	mid_humidity = -0.5;
+	max_solidity = 1.0;
 };
-red_hard = {
+red_hard = red_coarse {
 	texture = "rock-3";
-	rgb_mod = [ 1, 0, 0 ];
 	label = "Hard Red";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	min_solidity = 0.7;
 	mid_solidity = 1.0;
-	min_temperature = 0.0;
-	mid_temperature = 0.5;
-	max_humidity = 0.0;
-	mid_humidity = -0.5;
+	max_solidity = 1.0;
 };
-red_slab = {
-	texture = "rock-3";
-	rgb_mod = [ 1, 0, 0 ];
+red_slab = red_hard {
 	label = "Red Slab";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_low_slab;
+	generate = false;
 };
-red_stair = {
-	texture = "rock-3";
-	rgb_mod = [ 1, 0, 0 ];
+red_stair = red_hard {
 	label = "Red Stair";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_stair;
+	generate = false;
 };
 
-green_coarse = {
-	texture = "rock-1";
-	rgb_mod = [ 0, 1, 0 ];
+green_coarse = white_coarse {
+	rgb_mod = [ 0.2, 0.8, 0.2 ];
 	label = "Coarse Green";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
-	mid_solidity = 0.5;
-	max_solidity = 0.75;
+	min_temperature = -0.5;
+	mid_temperature = 0.25;
+	max_temperature = 0.75;
 };
-green_smooth = {
+green_smooth = green_coarse {
 	texture = "rock-2";
-	rgb_mod = [ 0, 1, 0 ];
 	label = "Smooth Green";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	mid_solidity = 0.6;
+	max_solidity = 1.0;
 };
 green_hard = {
 	texture = "rock-3";
-	rgb_mod = [ 0, 1, 0 ];
 	label = "Hard Green";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	min_solidity = 0.7;
 	mid_solidity = 1.0;
+	max_solidity = 1.0;
 };
-green_slab = {
-	texture = "rock-1";
-	rgb_mod = [ 0, 1, 0 ];
+green_slab = green_coarse {
 	label = "Green Slab";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_low_slab;
+	generate = false;
 };
-green_stair = {
-	texture = "rock-1";
-	rgb_mod = [ 0, 1, 0 ];
+green_stair = green_coarse {
 	label = "Green Stair";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_stair;
+	generate = false;
 };
 
 blue_coarse = {
 	texture = "rock-1";
-	rgb_mod = [ 0, 0, 1 ];
+	rgb_mod = [ 0.2, 0.2, 0.8 ];
 	outline = [ 0.75, 0.75, 0.75 ];
 	label = "Coarse Blue";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	mid_solidity = 0.5;
 	max_solidity = 0.75;
 	min_humidity = 0.0;
 	mid_humidity = 1.0;
+	min_temperature = -1.0;
+	mid_temperature = 0.0;
+	max_temperature = 1.0;
 };
-blue_smooth = {
+blue_smooth = blue_coarse {
 	texture = "rock-2";
-	rgb_mod = [ 0, 0, 1 ];
-	outline = [ 0.75, 0.75, 0.75 ];
 	label = "Smooth Blue";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	mid_solidity = 0.6;
-	min_humidity = 0.0;
-	mid_humidity = 1.0;
+	max_solidity = 1.0;
 };
-blue_hard = {
+blue_hard = blue_coarse {
 	texture = "rock-3";
-	rgb_mod = [ 0, 0, 1 ];
-	outline = [ 0.75, 0.75, 0.75 ];
 	label = "Hard Blue";
-	place_sound = "thump";
-	remove_sound = "plop";
-	shape = uniform_block;
-	generate = true;
 	min_solidity = 0.7;
 	mid_solidity = 1.0;
-	min_humidity = 0.0;
-	mid_humidity = 1.0;
+	max_solidity = 1.0;
 };
-blue_slab = {
-	texture = "rock-3";
-	rgb_mod = [ 0, 0, 1 ];
-	outline = [ 0.75, 0.75, 0.75 ];
+blue_slab = blue_hard {
 	label = "Blue Slab";
-	place_sound = "thump";
-	remove_sound = "plop";
 	shape = uniform_low_slab;
+	generate = false;
 };
-blue_stair = {
-	texture = "rock-3";
-	rgb_mod = [ 0, 0, 1 ];
-	outline = [ 0.75, 0.75, 0.75 ];
+blue_stair = blue_hard {
 	label = "Blue Stair";
+	shape = uniform_stair;
+	generate = false;
+};
+
+// trying out some more "realistic" variants
+dirt = {
+	texture = "grain";
+	rgb_mod = [ 0.4, 0.2, 0 ];
+	label = "Dirt";
 	place_sound = "thump";
 	remove_sound = "plop";
-	shape = uniform_stair;
+	shape = uniform_block;
+	generate = true;
+	mid_solidity = 0.6;
+	max_solidity = 0.8;
+};
+grass = dirt {
+	rgb_mod = [ 0.0, 0.2, 0 ];
+	label = "Dirt";
+	mid_solidity = 0.55;
+	max_solidity = 0.65;
+	min_humidity = 0.1;
+	mid_humidity = 0.8;
+};
+fiber = grass {
+	texture = "lines";
+	label = "Fiber";
+};
+stone = dirt {
+	rgb_mod = [ 0.6, 0.6, 0.6 ];
+	label = "Stone";
+	mid_solidity = 0.75;
+	max_solidity = 1.0;
+};
+stone_panel = stone {
+	texture = "panel";
+	label = "Stone Panel";
+	commonness = 0.75;
+};
+snow = dirt {
+	rgb_mod = [ 0.9, 0.9, 1 ];
+	label = "Snow";
+	mid_solidity = 0.5;
+	max_solidity = 0.7;
+	min_temperature = -0.5;
+	mid_temperature = -0.25;
+	max_temperature = 0.0;
+};
+ice = snow {
+	texture = "panel";
+	label = "Ice";
+	min_solidity = 0.6;
+	mid_solidity = 0.65;
+	max_solidity = 0.75;
+};
+sand = dirt {
+	rgb_mod = [ 0.93, 0.9, 0.66 ];
+	label = "Sand";
+	mid_humidity = -0.9;
+	max_humidity = 0.0;
+	min_solidity = 0.5;
+	mid_solidity = 0.5;
+	max_solidity = 0.65;
 };
 
 grav_spherical = {
@@ -238,7 +219,7 @@ grav_directed = {
 
 light = {
 	texture = "rock-2";
-	rgb_mod = [ 1, 1, 0 ];
+	rgb_mod = [ 0.8, 0.8, 0.2 ];
 	label = "Light";
 	place_sound = "thump";
 	remove_sound = "plop";
diff --git a/textures/grain.png b/textures/grain.png
new file mode 100644
index 0000000..6831a01
Binary files /dev/null and b/textures/grain.png differ
diff --git a/textures/lines.png b/textures/lines.png
new file mode 100644
index 0000000..b47d879
Binary files /dev/null and b/textures/lines.png differ
diff --git a/textures/panel.png b/textures/panel.png
new file mode 100644
index 0000000..5cc0a73
Binary files /dev/null and b/textures/panel.png differ