dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'house_placing' into jgrpp

Browse Source 
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-05-12 22:57:42 +01:00
parent d8a083b666 95b65163e3
commit f6d374ade4
30 changed files with 718 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/lang/english.txt
View File

@@ -362,6 +362,7 @@ STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION :{BLACK}Road con
STR_SCENEDIT_TOOLBAR_PLANT_TREES :{BLACK}Plant trees. Shift toggles building/showing cost estimate
STR_SCENEDIT_TOOLBAR_PLACE_SIGN :{BLACK}Place sign
STR_SCENEDIT_TOOLBAR_PLACE_OBJECT :{BLACK}Place object. Shift toggles building/showing cost estimate
STR_SCENEDIT_TOOLBAR_PLACE_HOUSE :{BLACK}Place house
############ range for SE file menu starts
STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO :Save scenario
@@ -409,7 +410,6 @@ STR_MAP_MENU_PLAN_LIST :Plan list
############ range for town menu starts
STR_TOWN_MENU_TOWN_DIRECTORY :Town directory
STR_TOWN_MENU_FOUND_TOWN :Found town
STR_TOWN_MENU_FUND_HOUSE :Fund new house
############ range ends here
############ range for subsidies menu starts
@@ -1243,8 +1243,6 @@ STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS :Allow funding b
STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT :Allow companies to give money to towns for funding new houses
STR_CONFIG_SETTING_ALLOW_FUND_ROAD :Allow funding local road reconstruction: {STRING2}
STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT :Allow companies to give money to towns for road re-construction to sabotage road-based services in the town
STR_CONFIG_SETTING_ALLOW_PLACING_HOUSES :Allow placing houses in-game: {STRING2}
STR_CONFIG_SETTING_ALLOW_PLACING_HOUSES_HELPTEXT :Allow placing houses manually also during gameplay, not just in scenario editor
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY :Allow sending money to other companies: {STRING2}
STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT :Allow transfer of money between companies in multiplayer mode
STR_CONFIG_SETTING_FREIGHT_TRAINS :Weight multiplier for freight to simulate heavy trains: {STRING2}
@@ -2802,33 +2800,24 @@ STR_OBJECT_BUILD_SIZE :{BLACK}Size: {G
STR_OBJECT_CLASS_LTHS :Lighthouses
STR_OBJECT_CLASS_TRNS :Transmitters
#Town select window
STR_SELECT_TOWN_CAPTION :{WHITE}Select town
STR_SELECT_TOWN_LIST_TOWN_ZONE :{WHITE}{TOWN}{BLACK} (zone {NUM})
STR_SELECT_TOWN_LIST_TOWN_OUTSIDE :{WHITE}{TOWN}{BLACK} (outside)
# House construction window
STR_HOUSE_BUILD_CAPTION :{WHITE}{STRING1}
STR_HOUSE_BUILD_CAPTION_DEFAULT_TEXT :House Selection
#House construction window (for SE only)
STR_HOUSE_BUILD_CAPTION :{WHITE}House Selection
STR_HOUSE_BUILD_CUSTOM_CAPTION :{WHITE}{RAW_STRING}
STR_HOUSE_BUILD_HOUSESET_LIST_TOOLTIP :{BLACK}Select set of houses
STR_HOUSE_BUILD_SELECT_HOUSE_TOOLTIP :{BLACK}Select house to build
STR_HOUSE_BUILD_HOUSE_NAME :{GOLD}{STRING1}
STR_HOUSE_BUILD_HISTORICAL_BUILDING :{GOLD}(historical building)
STR_HOUSE_BUILD_HOUSE_POPULATION :{BLACK}Population: {GOLD}{NUM}
STR_HOUSE_BUILD_HOUSE_ZONES :{BLACK}House zones: {STRING1} {STRING1} {STRING1} {STRING1} {STRING1}
STR_HOUSE_BUILD_HOUSE_ZONE_GOOD :{GOLD}{NUM}
STR_HOUSE_BUILD_HOUSE_ZONE_BAD :{GRAY}{NUM}
STR_HOUSE_BUILD_HOUSE_ZONE_GOOD_HIGHLIGHTED :{WHITE}{NUM}
STR_HOUSE_BUILD_HOUSE_ZONE_BAD_HIGHLIGHTED :{RED}{NUM}
STR_HOUSE_BUILD_HOUSE_ZONE_DISABLED :{GRAY}{NUM}
STR_HOUSE_BUILD_HOUSE_ZONE_ENABLED :{GOLD}{NUM}
STR_HOUSE_BUILD_LANDSCAPE :{BLACK}Landscape: {STRING}
STR_HOUSE_BUILD_LANDSCAPE_ABOVE_OR_BELOW_SNOWLINE :{GOLD}above or below snowline
STR_HOUSE_BUILD_LANDSCAPE_ONLY_ABOVE_SNOWLINE_GOOD :{GOLD}only above snowline
STR_HOUSE_BUILD_LANDSCAPE_ONLY_ABOVE_SNOWLINE_BAD :{RED}only above snowline
STR_HOUSE_BUILD_LANDSCAPE_ONLY_BELOW_SNOWLINE_GOOD :{GOLD}only below snowline
STR_HOUSE_BUILD_LANDSCAPE_ONLY_BELOW_SNOWLINE_BAD :{RED}only below snowline
STR_HOUSE_BUILD_LANDSCAPE_ONLY_ABOVE_SNOWLINE :{GOLD}only above snowline
STR_HOUSE_BUILD_LANDSCAPE_ONLY_BELOW_SNOWLINE :{GOLD}only below snowline
STR_HOUSE_BUILD_YEARS :{BLACK}Years: {STRING1}{GOLD} - {STRING1}
STR_HOUSE_BUILD_YEAR_GOOD :{GOLD}{NUM}
STR_HOUSE_BUILD_YEAR_BAD :{RED}{NUM}
STR_HOUSE_BUILD_YEARS_BAD_YEAR :{RED}{NUM}
STR_HOUSE_BUILD_YEARS_GOOD_YEAR :{GOLD}{NUM}
STR_HOUSE_BUILD_SUPPLIED_CARGO :{BLACK}Supplies: {GOLD}{CARGO_LIST}
STR_HOUSE_BUILD_ACCEPTED_CARGO :{BLACK}Accepts: {GOLD}{RAW_STRING}
STR_HOUSE_BUILD_CARGO_FIRST :{STRING2}
@@ -2837,6 +2826,10 @@ STR_HOUSE_BUILD_CARGO_VALUE_JUST_NAME :{1:STRING}
STR_HOUSE_BUILD_CARGO_VALUE_EIGHTS :({COMMA}/8 {STRING})
STR_BASIC_HOUSE_SET_NAME :Basic houses
#Town select window (for SE only)
STR_SELECT_TOWN_CAPTION :{WHITE}Select town
STR_SELECT_TOWN_LIST_ITEM :{BLACK}{TOWN}
# Tree planting window (last two for SE only)
STR_PLANT_TREE_CAPTION :{WHITE}Trees
STR_PLANT_TREE_TOOLTIP :{BLACK}Select tree type to plant. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
@@ -4754,9 +4747,14 @@ STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Road wor
STR_ERROR_TOWN_CAN_T_DELETE :{WHITE}Can't delete this town...{}A station or depot is referring to the town or a town owned tile can't be removed
STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... there is no suitable place for a statue in the centre of this town
STR_ERROR_BUILDING_NOT_ALLOWED_IN_THIS_TOWN_ZONE :{WHITE}... not allowed in this town zone.
STR_ERROR_ONLY_ONE_CHURCH_PER_TOWN :{WHITE}... only one church per town is allowed.
STR_ERROR_ONLY_ONE_STADIUM_PER_TOWN :{WHITE}... only one stadium per town is allowed.
STR_ERROR_TOO_FAR_FROM_TOWN :{WHITE}... too far from town.
STR_ERROR_BUILDING_NOT_ALLOWED_ABOVE_SNOW_LINE :{WHITE}... not allowed above the snow line.
STR_ERROR_BUILDING_NOT_ALLOWED_BELOW_SNOW_LINE :{WHITE}... not allowed below the snow line.
STR_ERROR_TOO_MANY_HOUSE_SETS :{WHITE}... too many house sets in the town
STR_ERROR_TOO_MANY_HOUSE_TYPES :{WHITE}... too many house types in the town
STR_ERROR_BUILDING_IS_TOO_OLD :{WHITE}... building is too old.
STR_ERROR_BUILDING_IS_TOO_MODERN :{WHITE}... building is too modern.
STR_ERROR_ONLY_ONE_BUILDING_ALLOWED_PER_TOWN :{WHITE}... only one building of this type is allowed in a town.
STR_ERROR_BUILDING_NOT_ALLOWED :{WHITE}... the building is not allowed.
# Industry related errors
STR_ERROR_TOO_MANY_INDUSTRIES :{WHITE}... too many industries