From 7939f94f82e3c6a21de9eb0314662cb5c00f5d7c Mon Sep 17 00:00:00 2001
From: Yona-TYT <yonatan.el.amigo@gmail.com>
Date: Sat, 23 Nov 2024 01:36:42 -0400
Subject: [PATCH] Fix scenarios with new parameters

---
 .../scenario/new_york/scenario.nut            |  4 +--
 .../scenario/sell_clothing/scenario.nut       |  2 +-
 .../scenario/swiss_mountains/scenario.nut     |  4 +--
 .../scenario/tramadness/scenario.nut          | 32 +++++++++----------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pak128.prototype/scenario/new_york/scenario.nut b/pak128.prototype/scenario/new_york/scenario.nut
index 33718151..0f871edd 100644
--- a/pak128.prototype/scenario/new_york/scenario.nut
+++ b/pak128.prototype/scenario/new_york/scenario.nut
@@ -168,12 +168,12 @@ function forbid_tools_on_hudson()
 {
 	for(local j=0; j<tools_not_allowed_on_hudson.len(); j++) {
 			for(local i=0; i<hudson_river.len()-1; i++) {
-				rules.forbid_way_tool_rect(player_all, tools_not_allowed_on_hudson[j], wt_all, hudson_river[i], hudson_river[i+1], ttext(error_hudson[j]))
+				rules.forbid_way_tool_rect(player_all, tools_not_allowed_on_hudson[j], wt_all, "", hudson_river[i], hudson_river[i+1], ttext(error_hudson[j]))
 			}
 	}
 }
 
-function is_work_allowed_here(pl, tool_id, pos, tool)
+function is_work_allowed_here(pl, tool_id, name, pos, tool)
 {
 	// headquarter only on governors island
 	if (tool_id == tool_headquarter) {
diff --git a/pak128.prototype/scenario/sell_clothing/scenario.nut b/pak128.prototype/scenario/sell_clothing/scenario.nut
index fc7229d8..87bfa9d3 100644
--- a/pak128.prototype/scenario/sell_clothing/scenario.nut
+++ b/pak128.prototype/scenario/sell_clothing/scenario.nut
@@ -282,7 +282,7 @@ function set_rule_bridge_coventry_sound(forbid)
 
 	for(local i=0; i<coventry_sound.len()-1; i++) {
 		foreach(tool in coventry_sound_tools) {
-			func(player_all, tool, wt_all, coventry_sound[i], coventry_sound[i+1], err_no_bridge)
+			func(player_all, tool, wt_all, "", coventry_sound[i], coventry_sound[i+1], err_no_bridge)
 		}
 	}
 }
diff --git a/pak128.prototype/scenario/swiss_mountains/scenario.nut b/pak128.prototype/scenario/swiss_mountains/scenario.nut
index 437d667a..9f1a75f7 100644
--- a/pak128.prototype/scenario/swiss_mountains/scenario.nut
+++ b/pak128.prototype/scenario/swiss_mountains/scenario.nut
@@ -240,7 +240,7 @@ function resume_game()
 	local pl = 0
 	foreach (tool in forbid_tools)
 		foreach (cube in forbid_list)
-			rules.forbid_way_tool_cube(pl, tool, cube.waytyp, cube.a, cube.b, ttext(cube.text) )
+			rules.forbid_way_tool_cube(pl, tool, cube.waytyp, "", cube.a, cube.b, ttext(cube.text) )
 	rules.forbid_tool(pl, tool_restoreslope )
 	rules.forbid_tool(pl, tool_lower_land )
 	rules.forbid_tool(pl, tool_raise_land )
@@ -429,7 +429,7 @@ function get_percentage(pl)
 }
 
 
-function is_work_allowed_here(pl, tool_id, pos, tool)
+function is_work_allowed_here(pl, tool_id, name, pos, tool)
 {
 	local result = null               // null is equivalent to 'allowed'
 	if (tool_id == tool_setslope)     result = terra_forming_allowed(pos)
diff --git a/pak128.prototype/scenario/tramadness/scenario.nut b/pak128.prototype/scenario/tramadness/scenario.nut
index fa38b27d..797dac7c 100644
--- a/pak128.prototype/scenario/tramadness/scenario.nut
+++ b/pak128.prototype/scenario/tramadness/scenario.nut
@@ -44,7 +44,7 @@ function get_result_text(pl)
 		return ttext("There is still no passenger at Cambridge TOP station.")
 }
 
-function is_work_allowed_here(pl, tool_id, pos, tool)
+function is_work_allowed_here(pl, tool_id, name, pos, tool)
 {
 	// no extension of existing stations
 	if (tool_id == tool_build_station) {
@@ -76,32 +76,32 @@ function start()
 	foreach(wt in all_waytypes) {
 		if (wt != wt_tram) {
 			if (wt != wt_road) {
-				rules.forbid_way_tool(0, tool_build_way, wt)
-				rules.forbid_way_tool(0, tool_build_bridge, wt)
-				rules.forbid_way_tool(0, tool_build_tunnel, wt)
-				rules.forbid_way_tool(0, tool_build_station, wt)
+				rules.forbid_way_tool(0, tool_build_way, wt, "")
+				rules.forbid_way_tool(0, tool_build_bridge, wt, "")
+				rules.forbid_way_tool(0, tool_build_tunnel, wt, "")
+				rules.forbid_way_tool(0, tool_build_station, wt, "")
 				if (wt != wt_rail) {
-					rules.forbid_way_tool(0, tool_remove_way, wt)
+					rules.forbid_way_tool(0, tool_remove_way, wt, "")
 				}
 			}
-			rules.forbid_way_tool(0, tool_remove_wayobj, wt)
-			rules.forbid_way_tool(0, tool_build_wayobj, wt)
-			rules.forbid_way_tool(0, tool_build_depot, wt)
+			rules.forbid_way_tool(0, tool_remove_wayobj, wt, "")
+			rules.forbid_way_tool(0, tool_build_wayobj, wt, "")
+			rules.forbid_way_tool(0, tool_build_depot, wt, "")
 
 			if (wt != wt_rail) {
-				rules.forbid_way_tool(0, tool_build_roadsign, wt)
+				rules.forbid_way_tool(0, tool_build_roadsign, wt, "")
 			}
 		}
 	}
 
 	// protect main stations
-	rules.forbid_way_tool_rect(0, tool_remover, wt_all, { x=25, y=45, z=5 }, { x=25, y=45, z=5 }, ttext(err_station_protected))
-	rules.forbid_way_tool_rect(0, tool_remover, wt_all, { x=34, y=39, z=0 }, { x=34, y=39, z=0 }, ttext(err_station_protected))
-	rules.forbid_way_tool_rect(0, tool_remover, wt_all, { x=18, y=55, z=0 }, { x=18, y=55, z=0 }, ttext(err_station_protected))
+	rules.forbid_way_tool_rect(0, tool_remover, wt_all, "", { x=25, y=45, z=5 }, { x=25, y=45, z=5 }, ttext(err_station_protected))
+	rules.forbid_way_tool_rect(0, tool_remover, wt_all, "", { x=34, y=39, z=0 }, { x=34, y=39, z=0 }, ttext(err_station_protected))
+	rules.forbid_way_tool_rect(0, tool_remover, wt_all, "", { x=18, y=55, z=0 }, { x=18, y=55, z=0 }, ttext(err_station_protected))
 
-	rules.forbid_way_tool_rect(0, tool_remove_way, wt_all, { x=25, y=45, z=5 }, { x=25, y=45, z=5 }, ttext(err_station_protected))
-	rules.forbid_way_tool_rect(0, tool_remove_way, wt_all, { x=34, y=39, z=0 }, { x=34, y=39, z=0 }, ttext(err_station_protected))
-	rules.forbid_way_tool_rect(0, tool_remove_way, wt_all, { x=18, y=55, z=0 }, { x=18, y=55, z=0 }, ttext(err_station_protected))
+	rules.forbid_way_tool_rect(0, tool_remove_way, wt_all, "", { x=25, y=45, z=5 }, { x=25, y=45, z=5 }, ttext(err_station_protected))
+	rules.forbid_way_tool_rect(0, tool_remove_way, wt_all, "", { x=34, y=39, z=0 }, { x=34, y=39, z=0 }, ttext(err_station_protected))
+	rules.forbid_way_tool_rect(0, tool_remove_way, wt_all, "", { x=18, y=55, z=0 }, { x=18, y=55, z=0 }, ttext(err_station_protected))
 
 	// set startmoney of player=0
 	player_x(0).book_cash( 125000 * 100 - player_x(0).get_cash()[0] )