add street images

mod/res/config/street/modutram_town_xs_new_era_a.lua

@@ -4,15 +4,15 @@ return {
 	streetWidth = 6.0,
 	sidewalkWidth = 1.0,
 	sidewalkHeight = .00,
-	yearFrom = 1925,
+	yearFrom = 0,
 	yearTo = 0,
 	upgrade = false,
 	country = false,
 	speed = 30.0,
 	type = "new small",
 	name = _("Small street"),
-	desc = _("Two-lane street with modern catenary poles (speed limit %2%)."),
-	icon = "ui/streets/standard/country_small_new.tga",
+	desc = _("oneway_era_a_desc"),
+	icon = "ui/streets/modular_tram_station/tiny_era_a.tga",
 	categories = { "urban" },
 	borderGroundTex = "street_border.lua",
 	materials = {

mod/res/config/street/modutram_town_xs_new_era_b.lua

@@ -4,15 +4,15 @@ return {
 	streetWidth = 6.0,
 	sidewalkWidth = 1.0,
 	sidewalkHeight = .00,
-	yearFrom = 1925,
+	yearFrom = 1920,
 	yearTo = 0,
 	upgrade = false,
 	country = false,
 	speed = 30.0,
 	type = "new small",
 	name = _("Small street"),
-	desc = _("Two-lane street with new catenary poles (speed limit %2%)."),
-	icon = "ui/streets/standard/country_small_new.tga",
+	desc = _("oneway_era_b_desc"),
+	icon = "ui/streets/modular_tram_station/tiny_era_b.tga",
 	categories = { "urban" },
 	borderGroundTex = "street_border.lua",
 	materials = {

mod/res/config/street/modutram_town_xs_new_era_c.lua

@@ -4,15 +4,15 @@ return {
 	streetWidth = 6.0,
 	sidewalkWidth = 1.0,
 	sidewalkHeight = .00,
-	yearFrom = 1925,
+	yearFrom = 1980,
 	yearTo = 0,
 	upgrade = false,
 	country = false,
 	speed = 30.0,
 	type = "new small",
 	name = _("Small street"),
-	desc = _("Two-lane street with modern catenary poles (speed limit %2%)."),
-	icon = "ui/streets/standard/country_small_new.tga",
+	desc = _("oneway_era_c_desc"),
+	icon = "ui/streets/modular_tram_station/tiny_era_c.tga",
 	categories = { "urban" },
 	borderGroundTex = "street_border.lua",
 	materials = {

mod/res/config/street/modutram_town_xs_one_way_new_era_a.lua

@@ -8,15 +8,15 @@ return {
 	streetWidth = 3.0,
 	sidewalkWidth = 1.0,
 	sidewalkHeight = .00,
-	yearFrom = 1925,
+	yearFrom = 0,
 	yearTo = 0,
 	upgrade = false,
 	country = false,
 	speed = 30.0,
 	type = "one way new small",
 	name = _("Small one-way street"),
-	desc = _("One-lane one-way street with modern catenary poles (speed limit %2%)."),
-	icon = "ui/streets/standard/country_small_one_way_new.tga",
+	desc = _("street_era_a_desc"),
+	icon = "ui/streets/modular_tram_station/oneway_era_a.tga",
 	categories = { "one-way" },
 	borderGroundTex = "street_border.lua",
 	materials = {

mod/res/config/street/modutram_town_xs_one_way_new_era_b.lua

@@ -8,15 +8,15 @@ return {
 	streetWidth = 3.0,
 	sidewalkWidth = 1.0,
 	sidewalkHeight = .00,
-	yearFrom = 1925,
+	yearFrom = 1920,
 	yearTo = 0,
 	upgrade = false,
 	country = false,
 	speed = 30.0,
 	type = "one way new small",
 	name = _("Small one-way street"),
-	desc = _("One-lane one-way street with new catenary poles (speed limit %2%)."),
-	icon = "ui/streets/standard/country_small_one_way_new.tga",
+	desc = _("street_era_b_desc"),
+	icon = "ui/streets/modular_tram_station/oneway_era_b.tga",
 	categories = { "one-way" },
 	borderGroundTex = "street_border.lua",
 	materials = {

mod/res/config/street/modutram_town_xs_one_way_new_era_c.lua

@@ -8,15 +8,15 @@ return {
 	streetWidth = 3.0,
 	sidewalkWidth = 1.0,
 	sidewalkHeight = .00,
-	yearFrom = 1925,
+	yearFrom = 1980,
 	yearTo = 0,
 	upgrade = false,
 	country = false,
 	speed = 30.0,
 	type = "one way new small",
 	name = _("Small one-way street"),
-	desc = _("One-lane one-way street with modern catenary poles (speed limit %2%)."),
-	icon = "ui/streets/standard/country_small_one_way_new.tga",
+	desc = _("street_era_c_desc"),
+	icon = "ui/streets/modular_tram_station/oneway_era_c.tga",
 	categories = { "one-way" },
 	borderGroundTex = "street_border.lua",
 	materials = {

mod/res/construction/modules/tram/bus_down.module

@@ -36,6 +36,24 @@ function data()
 
             gridModule:addAssetSlot(result, 1, "modutram_asset_catenary", transf.mul(transform, transf.transl({x = 0, y = 0, z = 1})))
 
+            if not gridModule:hasNeighborTop() then
+                gridModule:addAssetSlot(
+                    result,
+                    3, 
+                    "modutram_asset_tram_street_connection",
+                    transf.mul(transform, transf.transl({x = 0, y = result.modutram.config.gridModuleLength / 2, z = 0})),
+                    {gridModule:getOption("widthInCm", 1) / 200, gridModule:getOption("widthInCm", 1) / 200, 0, 10})
+            end
+
+            if not gridModule:hasNeighborBottom() then
+                gridModule:addAssetSlot(
+                    result,
+                    4, 
+                    "modutram_asset_tram_street_connection",
+                    transf.mul(transform, transf.rotZTransl(math.pi, {x = 0, y = -result.modutram.config.gridModuleLength / 2, z = 0})),
+                    {gridModule:getOption("widthInCm", 1) / 200, gridModule:getOption("widthInCm", 1) / 200, 0, 10})
+            end
+
             local groundFace = makeGroundFaceFromGridModule(gridModule, transform)
             makeLot(result, groundFace)
             makeCollider(result, gridModule)

mod/res/construction/modules/tram/bus_up.module

@@ -34,6 +34,26 @@ function data()
         updateFn = function(result, transform, tag, slotId, addModelFn, params)
             local gridModule = result.modutram:getModule(slotId)
 
+            gridModule:addAssetSlot(result, 1, "modutram_asset_catenary", transf.mul(transform, transf.transl({x = 0, y = 0, z = 1})))
+
+            if not gridModule:hasNeighborTop() then
+                gridModule:addAssetSlot(
+                    result,
+                    3, 
+                    "modutram_asset_tram_street_connection",
+                    transf.mul(transform, transf.transl({x = 0, y = result.modutram.config.gridModuleLength / 2, z = 0})),
+                    {gridModule:getOption("widthInCm", 1) / 200, gridModule:getOption("widthInCm", 1) / 200, 0, 10})
+            end
+
+            if not gridModule:hasNeighborBottom() then
+                gridModule:addAssetSlot(
+                    result,
+                    4, 
+                    "modutram_asset_tram_street_connection",
+                    transf.mul(transform, transf.rotZTransl(math.pi, {x = 0, y = -result.modutram.config.gridModuleLength / 2, z = 0})),
+                    {gridModule:getOption("widthInCm", 1) / 200, gridModule:getOption("widthInCm", 1) / 200, 0, 10})
+            end
+
             local groundFace = makeGroundFaceFromGridModule(gridModule, transform)
             makeLot(result, groundFace)
             makeCollider(result, gridModule)

mod/strings.lua

@@ -61,7 +61,14 @@ function data()
         ["module_sign_name"] = "Sign",
         ["module_station_sign_name"] = "Station name sign",
         -- Bus Stops
-        ["bus_stop"] = "Bus Stop"
+        ["bus_stop"] = "Bus Stop",
+        -- Streets
+        ["street_era_a_desc"] = "Two-lane street with modern catenary poles (speed limit %2%).",
+        ["street_era_b_desc"] = "Two-lane street with usual catenary poles (speed limit %2%).",
+        ["street_era_c_desc"] = "Two-lane street with modern catenary poles (speed limit %2%).",
+        ["oneway_era_a_desc"] = "One-way street with modern historical poles (speed limit %2%).",
+        ["oneway_era_b_desc"] = "One-way street with usual catenary poles (speed limit %2%).",
+        ["oneway_era_c_desc"] = "One-way street with modern catenary poles (speed limit %2%)."
       },
       de = {
         ["Modular Tram Station"] = "Modulare Straßenbahnhaltestelle",
@@ -125,7 +132,14 @@ function data()
         ["module_sign_name"] = "Haltestellenschild",
         ["module_station_sign_name"] = "Schild mit Stationsnamen",
         -- Bus Stops
-        ["bus_stop"] = "Bushaltestelle"
+        ["bus_stop"] = "Bushaltestelle",
+        -- Streets
+        ["street_era_a_desc"] = "Zweispurige Straße mit historischen Masten (Geschwindigkeit %2%)..",
+        ["street_era_b_desc"] = "Zweispurige Straße mit normalen Masten (Geschwindigkeit %2%).",
+        ["street_era_c_desc"] = "Zweispurige Straße mit modernen Masten (Geschwindigkeit %2%).",
+        ["oneway_era_a_desc"] = "Einbahnstraße mit historischen Masten (Geschwindigkeit %2%).",
+        ["oneway_era_b_desc"] = "Einbahnstraße mit normalen Masten (Geschwindigkeit %2%).",
+        ["oneway_era_c_desc"] = "Einbahnstraße mit modernen Masten (Geschwindigkeit %2%)."
       },
     }
 end