updated cottages mod

5 files changed, 475 insertions, 0 deletions

diff --git a/cottages/models/feldweg_end.obj b/cottages/models/feldweg_end.obj
new file mode 100644
index 0000000..46315f5
--- /dev/null
+++ b/cottages/models/feldweg_end.obj
@@ -0,0 +1,206 @@
+# Blender v2.72 (sub 0) OBJ File: 'feldweg_end.blend'
+# www.blender.org
+o Cube
+v -0.500000 0.500000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 0.500000 -0.500000
+v -0.500000 0.500000 -0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.250000 0.500000 0.500000
+v 0.250000 0.413592 -0.500000
+v 0.250000 0.500000 0.500000
+v -0.250000 0.413592 -0.500000
+v -0.375000 0.500000 0.500000
+v 0.375000 0.500000 -0.500000
+v 0.125000 0.500000 0.500000
+v -0.125000 0.375000 -0.500000
+v -0.125000 0.500000 0.500000
+v 0.125000 0.375000 -0.500000
+v 0.375000 0.500000 0.500000
+v -0.375000 0.500000 -0.500000
+v -0.000000 -0.005322 -0.500000
+v 0.250000 0.413592 -0.000000
+v -0.250000 0.413592 0.000000
+v 0.375000 0.500000 -0.000000
+v -0.125000 0.375000 0.000000
+v 0.125000 0.375000 -0.016321
+v -0.375000 0.500000 0.000000
+v 0.210101 0.443819 0.205395
+v -0.210101 0.443819 0.205395
+v 0.359784 0.500000 0.250000
+v -0.130863 0.426864 0.289840
+v 0.075837 0.429295 0.285669
+v -0.363898 0.500000 0.250000
+v 0.250000 0.499467 0.375000
+v -0.250000 0.499467 0.375000
+v 0.338593 0.500000 0.299881
+v -0.060925 0.480171 0.395010
+v 0.125000 0.480171 0.399350
+v -0.338593 0.500000 0.299881
+v 0.250000 0.413592 0.125000
+v -0.250000 0.413592 0.125000
+v 0.375000 0.500000 0.125000
+v -0.078088 0.375000 0.108679
+v 0.125000 0.375000 0.145321
+v -0.375000 0.500000 0.125000
+vt 1.000000 1.000000
+vt 0.875000 1.000000
+vt 0.500000 0.494678
+vt 0.750000 0.913592
+vt 0.625000 0.875000
+vt 0.375000 0.875000
+vt 0.250000 0.913592
+vt 0.125000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 0.750000 1.000000
+vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.250000 1.000000
+vt 0.500000 0.875000
+vt 0.625000 0.125000
+vt 0.750000 0.136102
+vt 1.000000 0.625000
+vt 1.000000 0.750000
+vt 0.875000 0.750000
+vt 1.000000 0.125000
+vt 1.000000 0.250000
+vt 0.875000 0.250000
+vt 1.000000 0.875000
+vt 0.799881 0.838593
+vt 1.000000 0.375000
+vt 0.895010 0.439075
+vt 0.899350 0.625000
+vt 0.799881 0.161407
+vt 0.000000 0.125000
+vt 0.500000 0.125000
+vt 0.750000 0.859784
+vt 0.000000 0.875000
+vt 0.541968 0.500000
+vt 0.541968 0.625000
+vt 0.125000 0.625000
+vt 0.125000 0.500000
+vt 0.541968 0.750000
+vt 0.541968 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.750000
+vt 0.646210 0.500000
+vt 0.646210 0.625000
+vt 0.646210 0.750000
+vt 0.646210 0.875000
+vt 0.635605 0.135605
+vt 0.760605 0.155911
+vt 0.720706 0.297351
+vt 0.172012 0.218555
+vt 0.260605 0.155911
+vt 0.300504 0.297350
+vt 0.751051 0.512257
+vt 0.876118 0.512257
+vt 0.876118 0.600535
+vt 0.449680 0.139224
+vt 0.379742 0.226929
+vt 0.586442 0.230407
+vt 0.146707 0.260153
+vt 0.260605 0.364395
+vt 0.870389 0.260153
+vt 0.885605 0.364395
+vt 0.135605 0.364395
+vt 0.760605 0.364395
+vt 0.459281 0.625000
+vt 0.474779 0.750000
+vt 0.000000 0.750000
+vt 0.000000 0.625000
+vt 0.474779 0.250000
+vt 0.474779 0.375000
+vt 0.000000 0.375000
+vt 0.000000 0.250000
+vt 0.612771 0.625000
+vt 0.593474 0.750000
+vt 0.593474 0.250000
+vt 0.577976 0.421912
+vt 0.746039 0.575837
+vt 0.669814 0.710101
+vt 0.669814 0.289899
+vt 0.750000 0.369137
+g Cube_Cube_ends
+s off
+f 4/1 20/2 21/3
+f 20/2 12/4 21/3
+f 12/4 16/5 21/3
+f 16/5 18/6 21/3
+f 18/6 10/7 21/3
+f 10/7 14/8 21/3
+f 14/8 3/9 21/3
+f 3/9 7/10 21/3
+f 7/10 8/11 21/3
+f 8/11 4/1 21/3
+g Cube_Cube_sides
+f 1/1 4/9 8/10 5/11
+f 3/1 2/9 6/10 7/11
+f 1/9 5/10 6/11 2/1 19/2 11/12 15/13 17/14 9/15 13/8
+g Cube_Cube_bottom
+f 8/9 7/10 6/11 5/1
+g Cube_Cube_top_grass
+f 24/16 42/5 2/1
+f 45/17 1/11 33/18
+f 15/19 11/20 34/21
+f 13/22 9/23 35/24
+f 11/20 19/25 36/26
+f 9/23 17/27 37/28
+f 15/19 38/29 37/28
+f 38/29 15/19 34/21
+f 39/30 13/22 35/24
+f 34/21 11/20 36/26
+f 35/24 9/23 37/28
+f 17/27 15/19 37/28
+f 19/25 2/1 36/26
+f 20/31 4/10 27/32
+f 45/17 27/32 1/11
+f 3/9 24/16 2/1
+f 2/1 30/33 36/26
+f 2/1 42/5 30/33
+f 3/9 14/34 24/16
+f 33/18 1/11 39/30
+f 27/32 4/10 1/11
+f 1/11 13/22 39/30
+g Cube_Cube_top_grass_blend
+f 27/35 23/36 12/37 20/38
+f 22/39 24/40 14/41 10/42
+f 45/43 41/44 23/36
+f 40/45 42/46 24/40
+f 38/47 34/48 28/49
+f 39/50 35/51 29/52
+f 34/53 36/54 30/55
+f 35/51 37/56 31/57
+f 38/47 32/58 31/57
+f 33/59 29/52 41/60
+f 28/49 30/61 42/62
+f 27/35 45/43 23/36
+f 22/39 40/45 24/40
+f 32/58 38/47 28/49
+f 33/59 39/50 29/52
+f 28/49 34/48 30/61
+f 29/52 35/51 31/57
+f 37/56 38/47 31/57
+f 45/63 33/59 41/60
+f 40/64 28/49 42/62
+g Cube_Cube_road
+f 26/65 22/66 10/67 18/68
+f 23/69 25/70 16/71 12/72
+f 26/65 18/68 16/71 25/70
+f 44/73 40/74 22/66
+f 41/75 43/76 25/70
+f 44/73 26/65 25/70
+f 32/77 28/78 40/74
+f 29/79 31/80 43/76
+f 32/77 44/73 43/76
+f 26/65 44/73 22/66
+f 23/69 41/75 25/70
+f 43/76 44/73 25/70
+f 44/73 32/77 40/74
+f 41/75 29/79 43/76
+f 31/80 32/77 43/76
diff --git a/cottages/models/feldweg_slope.obj b/cottages/models/feldweg_slope.obj
new file mode 100644
index 0000000..dd083f6
--- /dev/null
+++ b/cottages/models/feldweg_slope.obj
@@ -0,0 +1,84 @@
+# Blender v2.72 (sub 0) OBJ File: 'feldweg_slope.blend'
+# www.blender.org
+o Cube
+v 0.500000 -0.500000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.500000 0.500000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.625000 -0.500000
+v -0.500000 -0.625000 -0.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.250000 -0.586408 -0.500000
+v -0.250000 0.413592 0.500000
+v -0.250000 -0.586408 -0.500000
+v 0.250000 0.413592 0.500000
+v 0.375000 -0.500000 -0.500000
+v -0.375000 0.500000 0.500000
+v -0.125000 -0.625000 -0.500000
+v 0.125000 0.375000 0.500000
+v 0.125000 -0.625000 -0.500000
+v -0.125000 0.375000 0.500000
+v -0.375000 -0.500000 -0.500000
+v 0.375000 0.500000 0.500000
+v -0.000000 -0.005322 0.500000
+vt 1.000000 1.000000
+vt 0.875000 1.000000
+vt 0.500000 0.494678
+vt 1.000000 0.875000
+vt 0.750000 0.913592
+vt 0.625000 0.875000
+vt 0.375000 0.875000
+vt 0.250000 0.913592
+vt 0.125000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 0.875000
+vt 0.000000 0.187500
+vt 1.000000 0.312500
+vt 0.000000 0.312500
+vt 1.000000 0.187500
+vt 1.000000 0.125000
+vt 0.000000 0.125000
+vt 1.000000 0.625000
+vt 1.000000 0.750000
+vt 0.000000 0.750000
+vt 0.000000 0.625000
+vt 1.000000 0.250000
+vt 1.000000 0.375000
+vt 0.000000 0.375000
+vt 0.000000 0.250000
+vt 1.000000 0.500000
+vt 0.000000 0.500000
+g Cube_Cube_road_ends
+s off
+f 4/1 20/2 21/3
+f 6/4 2/1 19/2 11/5 15/6
+f 20/2 12/5 21/3
+f 12/5 16/6 21/3
+f 16/6 18/7 21/3
+f 18/7 10/8 21/3
+f 10/8 14/9 21/3
+f 14/9 3/10 21/3
+f 3/10 7/11 21/3
+f 7/11 8/12 21/3
+f 8/12 4/1 21/3
+f 1/10 5/13 17/7 9/8 13/9
+g Cube_Cube_road_ends_default_grass_side.png
+f 6/14 7/15 2/16
+f 2/11 7/12 3/1
+f 4/10 8/11 1/12
+f 5/17 1/15 8/16
+g Cube_Cube_bottom
+f 8/10 7/11 6/12 5/1
+g Cube_Cube_top_grass
+f 19/4 2/1 3/10 14/13
+f 1/12 13/18 20/19 4/11
+g Cube_Cube_road
+f 15/20 11/21 10/22 18/23
+f 9/24 17/25 16/26 12/27
+f 15/20 18/23 16/26 17/25
+g Cube_Cube_road-grass_blend
+f 13/28 9/20 12/23 20/29
+f 11/21 19/4 14/13 10/22
diff --git a/cottages/models/feldweg_slope_long.obj b/cottages/models/feldweg_slope_long.obj
new file mode 100644
index 0000000..976f927
--- /dev/null
+++ b/cottages/models/feldweg_slope_long.obj
@@ -0,0 +1,108 @@
+# Blender v2.72 (sub 0) OBJ File: 'feldweg_slope_long.blend'
+# www.blender.org
+o Cube
+v 0.500000 -0.500000 -1.500000
+v -0.500000 -0.500000 -1.500000
+v -0.500000 0.500000 0.500000
+v 0.500000 0.500000 0.500000
+v 0.500000 -0.625000 -1.500000
+v -0.500000 -0.625000 -1.500000
+v -0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 0.500000
+v 0.250000 -0.586408 -1.500000
+v -0.250000 0.413592 0.500000
+v -0.250000 -0.586408 -1.500000
+v 0.250000 0.413592 0.500000
+v 0.375000 -0.500000 -1.500000
+v -0.375000 0.500000 0.500000
+v -0.125000 -0.625000 -1.500000
+v 0.125000 0.375000 0.500000
+v 0.125000 -0.625000 -1.500000
+v -0.125000 0.375000 0.500000
+v -0.375000 -0.500000 -1.500000
+v 0.375000 0.500000 0.500000
+v -0.000000 -0.005322 0.500000
+v -0.250000 -0.086408 -0.500000
+v 0.500000 -0.562500 -0.500000
+v 0.375000 0.000000 -0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.250000 -0.086408 -0.500000
+v -0.500000 -0.562500 -0.500000
+v 0.500000 0.000000 -0.500000
+v -0.500000 0.000000 -0.500000
+v -0.375000 0.000000 -0.500000
+v 0.125000 -0.125000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v -0.125000 -0.125000 -0.500000
+vt 1.000000 1.000000
+vt 0.875000 1.000000
+vt 0.500000 0.494678
+vt 1.000000 0.875000
+vt 0.750000 0.913592
+vt 0.625000 0.875000
+vt 0.375000 0.875000
+vt 0.250000 0.913592
+vt 0.125000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 0.875000
+vt 0.000000 0.250000
+vt 1.000000 0.312500
+vt 0.000000 0.312500
+vt 0.000000 0.500000
+vt 1.000000 0.187500
+vt 1.000000 0.500000
+vt 1.000000 0.250000
+vt 0.000000 0.187500
+vt 1.000000 0.125000
+vt 0.000000 0.125000
+vt 1.000000 0.625000
+vt 1.000000 0.750000
+vt 0.000000 0.750000
+vt 0.000000 0.625000
+vt 1.000000 0.375000
+vt 0.000000 0.375000
+g Cube_Cube_road_ends
+s off
+f 4/1 20/2 21/3
+f 6/4 2/1 19/2 11/5 15/6
+f 20/2 12/5 21/3
+f 12/5 16/6 21/3
+f 16/6 18/7 21/3
+f 18/7 10/8 21/3
+f 10/8 14/9 21/3
+f 14/9 3/10 21/3
+f 3/10 7/11 21/3
+f 7/11 8/12 21/3
+f 8/12 4/1 21/3
+f 1/10 5/13 17/7 9/8 13/9
+g Cube_Cube_road_ends_default_grass_side.png
+f 27/14 7/15 32/16
+f 32/11 7/12 3/1 29/17
+f 28/17 25/11 1/12
+f 5/18 1/15 25/16 23/14
+f 2/11 32/12 29/19
+f 23/20 25/15 8/16
+f 6/21 27/20 32/15 2/16
+f 4/10 8/11 25/12 28/19
+g Cube_Cube_bottom
+f 8/11 7/12 27/1 23/10
+f 23/11 27/12 6/1 5/10
+g Cube_Cube_top_grass
+f 30/4 29/1 3/10 14/13
+f 28/12 24/22 20/23 4/11
+f 1/12 13/22 24/23 28/11
+f 19/4 2/1 29/10 30/13
+g Cube_Cube_road
+f 15/24 11/25 22/26 33/27
+f 26/20 31/28 16/29 12/14
+f 33/24 18/27 16/29 31/28
+f 33/24 22/25 10/26 18/27
+f 9/20 17/28 31/29 26/14
+f 15/24 33/27 31/29 17/28
+g Cube_Cube_road-grass_blend
+f 24/19 26/24 12/27 20/17
+f 11/25 19/4 30/13 22/26
+f 22/25 30/4 14/13 10/26
+f 13/19 9/24 26/27 24/17
diff --git a/cottages/nodes_feldweg.lua b/cottages/nodes_feldweg.lua
index 64c0c02..39798f9 100644
--- a/cottages/nodes_feldweg.lua
+++ b/cottages/nodes_feldweg.lua
@@ -315,6 +315,23 @@ elseif( cottages_feldweg_mode == "mesh" ) then
 		drawtype = "mesh",
 		mesh = "feldweg-curve.obj",
 	})
+
+	minetest.register_node("cottages:feldweg_end", {
+		description = S("dirt road end"),
+		paramtype2 = "facedir",
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+		legacy_facedir_simple = true,
+		groups = {crumbly=3},
+		sounds = default.node_sound_dirt_defaults,
+		is_ground_content = false,
+		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
+			"default_dirt.png", "default_grass.png",
+			"cottages_feldweg_surface.png^cottages_feldweg_edges.png",
+			"cottages_feldweg_surface.png"},
+		paramtype = "light",
+		drawtype = "mesh",
+		mesh = "feldweg_end.obj",
+	})
 end
 
 
@@ -327,3 +344,63 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab
 		S("Dirt Road, half height"),
 		default.node_sound_dirt_defaults())
 end
+
+if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
+        local box_slope = {
+			type = "fixed",
+			fixed = {
+				{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
+				{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
+				{-0.5,     0,     0, 0.5,  0.25, 0.5},
+				{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
+			}};
+
+	local box_slope_long = {
+			type = "fixed",
+			fixed = {
+				{-0.5,  -0.5,  -1.5, 0.5, -0.10, 0.5},
+				{-0.5, -0.25,  -1.3, 0.5, -0.25, 0.5},
+				{-0.5, -0.25,  -1.0, 0.5,     0, 0.5},
+				{-0.5,     0,  -0.5, 0.5,  0.25, 0.5},
+				{-0.5,  0.25,     0, 0.5,   0.5, 0.5}
+			}};
+
+	minetest.register_node("cottages:feldweg_slope", {
+		description = S("dirt road slope"),
+		paramtype2 = "facedir",
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+		legacy_facedir_simple = true,
+		groups = {crumbly=3},
+		sounds = default.node_sound_dirt_defaults,
+		is_ground_content = false,
+		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
+			"default_dirt.png", "default_grass.png",
+			"cottages_feldweg_surface.png",
+			"cottages_feldweg_surface.png^cottages_feldweg_edges.png"},
+		paramtype = "light",
+		drawtype = "mesh",
+		mesh = "feldweg_slope.obj",
+
+                collision_box = box_slope,
+		selection_box = box_slope,
+	})
+
+	minetest.register_node("cottages:feldweg_slope_long", {
+		description = S("dirt road slope long"),
+		paramtype2 = "facedir",
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+		legacy_facedir_simple = true,
+		groups = {crumbly=3},
+		sounds = default.node_sound_dirt_defaults,
+		is_ground_content = false,
+		tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
+			"default_dirt.png", "default_grass.png",
+			"cottages_feldweg_surface.png",
+			"cottages_feldweg_surface.png^cottages_feldweg_edges.png"},
+		paramtype = "light",
+		drawtype = "mesh",
+		mesh = "feldweg_slope_long.obj",
+                collision_box = box_slope_long,
+		selection_box = box_slope_long,
+	})
+end
diff --git a/cottages/textures/cottages_feldweg_edges.png b/cottages/textures/cottages_feldweg_edges.png
index 1680341..a81653d 100644
--- a/cottages/textures/cottages_feldweg_edges.png
+++ b/cottages/textures/cottages_feldweg_edges.png