summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asphaltstairs/init.lua26
-rw-r--r--labels/init.lua47
m---------streetsmod/libs/smartfs0
3 files changed, 67 insertions, 6 deletions
diff --git a/asphaltstairs/init.lua b/asphaltstairs/init.lua
index f2cfb14..309a51f 100644
--- a/asphaltstairs/init.lua
+++ b/asphaltstairs/init.lua
@@ -3,11 +3,7 @@
]]
if not rawget(_G, "register_stair_slab_panel_micro")
or type(register_stair_slab_panel_micro) ~= "function" then return end
- -- Asphalt
- register_stair_slab_panel_micro("streets", "asphalt", "streets:asphalt", {cracky=3}, {"streets_asphalt.png"}, "Asphalt", "asphalt", nil)
- minetest.register_alias("streets:asphalt_stair","stairs:stair_asphalt")
- minetest.register_alias("streets:asphalt_slab","stairs:slab_asphalt")
- table.insert(circular_saw.known_stairs,"streets:asphalt")
+
-- Asphalt solid line
-- Stair
minetest.register_node(":streets:asphalt_solid_line_stair",{
@@ -226,3 +222,23 @@ or type(register_stair_slab_panel_micro) ~= "function" then return end
output = "streets:asphalt_side_l",
recipe = {"streets:asphalt_side_r"}
})
+
+ -- Asphalt
+ minetest.register_alias("streets:asphalt_stair","stairs:stair_asphalt")
+ minetest.register_alias("streets:asphalt_slab","stairs:slab_asphalt")
+
+ register_stair_slab_panel_micro("streets", "asphalt", "streets:asphalt", {cracky=3}, {"streets_asphalt.png"}, "Asphalt", "asphalt", nil)
+ register_stair_slab_panel_micro("streets", "asphalt_solid_line", "streets:asphalt_solid_line", {cracky=3}, {"streets_asphalt.png^streets_asphalt_solid_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_solid_line.png"}, "Asphalt with solid centerline", "asphalt", nil)
+ register_stair_slab_panel_micro("streets", "asphalt_dashed_line", "streets:asphalt_dashed_line", {cracky=3}, {"streets_asphalt.png^streets_asphalt_dashed_line.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_dashed_line.png"}, "Asphalt with dashed centerline", "asphalt", nil)
+ register_stair_slab_panel_micro("streets", "asphalt_side", "streets:asphalt_sideline", {cracky=3}, {"streets_asphalt.png^streets_asphalt_side.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side.png"}, "Asphalt with solid outer line (left)", "asphalt", nil)
+ register_stair_slab_panel_micro("streets", "asphalt_side_r", "streets:asphalt_side_r", {cracky=3}, {"streets_asphalt.png^streets_asphalt_side_r.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png","streets_asphalt.png^streets_asphalt_side_r.png"}, "Asphalt with solid outer line (right)", "asphalt", nil)
+ register_stair_slab_panel_micro("streets", "asphalt_outer_edge", "streets:asphalt_outer_edge", {cracky=3}, {"streets_asphalt.png^streets_asphalt_outer_edge.png","streets_asphalt.png"}, "Asphalt with solid outer line (corner/edge)", "asphalt", nil)
+ register_stair_slab_panel_micro("streets", "asphalt_outer_edge_r", "streets:asphalt_outer_edge_r", {cracky=3}, {"streets_asphalt.png^(streets_asphalt_outer_edge.png^[transformR270)","streets_asphalt.png"}, "Asphalt with solid outer line (corner/edge, rotated)", "asphalt", nil)
+
+ table.insert(circular_saw.known_stairs,"streets:asphalt")
+ table.insert(circular_saw.known_stairs,"streets:asphalt_solid_line")
+ table.insert(circular_saw.known_stairs,"streets:asphalt_dashed_line")
+ table.insert(circular_saw.known_stairs,"streets:asphalt_side")
+ table.insert(circular_saw.known_stairs,"streets:asphalt_side_r")
+ table.insert(circular_saw.known_stairs,"streets:asphalt_outer_edge")
+ table.insert(circular_saw.known_stairs,"streets:asphalt_outer_edge_r")
diff --git a/labels/init.lua b/labels/init.lua
index c46a990..ba2593f 100644
--- a/labels/init.lua
+++ b/labels/init.lua
@@ -7,7 +7,9 @@ minetest.register_node(":streets:asphalt_sideline",{
tiles = {"streets_asphalt.png^streets_asphalt_side.png","streets_asphalt.png"},
paramtype2 = "facedir"
})
+
minetest.register_alias("streets:asphalt_side","streets:asphalt_sideline")
+
minetest.register_craft({
output = "streets:asphalt_side 6",
recipe = {
@@ -17,6 +19,27 @@ minetest.register_craft({
}
})
+minetest.register_node(":streets:asphalt_side_r",{
+ description = streets.S("Asphalt with sideline (right)"),
+ groups = {cracky=3},
+ tiles = {"streets_asphalt.png^streets_asphalt_side_r.png","streets_asphalt.png"},
+ paramtype2 = "facedir"
+})
+
+minetest.register_craft({
+ output = "streets:asphalt_side",
+ recipe = {
+ {"streets:asphalt_side_r"},
+ }
+})
+
+minetest.register_craft({
+ output = "streets:asphalt_side_r",
+ recipe = {
+ {"streets:asphalt_side"},
+ }
+})
+
minetest.register_node(":streets:asphalt_solid_line",{
description = streets.S("Asphalt with solid line"),
groups = {cracky=3},
@@ -55,6 +78,28 @@ minetest.register_node(":streets:asphalt_outer_edge",{
tiles = {"streets_asphalt.png^streets_asphalt_outer_edge.png","streets_asphalt.png"},
paramtype2 = "facedir"
})
+
+minetest.register_node(":streets:asphalt_outer_edge_r",{
+ description = streets.S("Asphalt with sideline (edge, rotated)"),
+ groups = {cracky=3},
+ tiles = {"streets_asphalt.png^(streets_asphalt_outer_edge.png^[transformR270)","streets_asphalt.png"},
+ paramtype2 = "facedir"
+})
+
+minetest.register_craft({
+ output = "streets:asphalt_outer_edge",
+ recipe = {
+ {"streets:asphalt_outer_edge_r"},
+ }
+})
+
+minetest.register_craft({
+ output = "streets:asphalt_outer_edge_r",
+ recipe = {
+ {"streets:asphalt_outer_edge"},
+ }
+})
+
-- no minetest.register_alias() needed
minetest.register_craft({
output = "streets:asphalt_outer_edge 4",
@@ -175,4 +220,4 @@ minetest.register_craft({
{"dye:white","dye:white","dye:white"},
{"streets:asphalt","dye:white","streets:asphalt"}
}
-}) \ No newline at end of file
+})
diff --git a/streetsmod/libs/smartfs b/streetsmod/libs/smartfs
-Subproject 701a615a7cdf2847947d942c7cf25f983b0581f
+Subproject ca54c9b6ab994503ae596738836922a6e151e6e