From da56491a27e77c31c1a214db8edee2f04813c5a2 Mon Sep 17 00:00:00 2001 From: "James E. Petts" Date: Thu, 30 May 2024 16:11:40 +0100 Subject: [PATCH] FIX: Correct specification in fuel.tab --- config/fuel.tab | 9 +++++---- config/prices.tab | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/fuel.tab b/config/fuel.tab index 68249e9180..6a6d7fb828 100644 --- a/config/fuel.tab +++ b/config/fuel.tab @@ -28,12 +28,13 @@ fuel[electric]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,1 # Units: kw/h # Identical to electricity: the round-trip losses should be built into the consumption figures in the vehicle .dat files, as these will be vehicle specific. -fuel[electric]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,141,1925,133,1926,142,1927,125,1928,117,1929,111,1930,111,1931,110,1932,107,1933,101,1934,97,1935,91,1936,88,1937,84,1938,84,1939,81,1940,83,1941,83,1942,81,1943,81,1944,86,1945,91,1946,90,1947,90,1948,93,1949,97,1950,96,1955,111,1960,120,1962,126,1963,130,1964,132,1965,138,1966,142,1967,142,1968,154,1969,151,1970,151,1971,164,1972,173,1973,174,1974,219,1975,302,1976,367,1977,422,1978,466,1979,508,1980,641,1981,759,1982,857,1983,864,1984,889,1985,901,1986,887,1987,887,1988,930,1989,993,1990,1037,1991,1024,1992,1021,1993,1044,1994,1095,1995,1112,1996,1148,1997,1180,1998,1215,1999,1244,2000,1282,2001,1314,2002,1342,2003,1382,2004,1420,2005,1459,2006,1499,2007,1545,2008,1574,2009,1624,2010,1658,2011,1688,2012,1717,2013,1746,2017,3187,2018,3438,2019,3747,2020,3785,2021,4056,2022,5407,2023,6566,2050,8500 +fuel[battery]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,141,1925,133,1926,142,1927,125,1928,117,1929,111,1930,111,1931,110,1932,107,1933,101,1934,97,1935,91,1936,88,1937,84,1938,84,1939,81,1940,83,1941,83,1942,81,1943,81,1944,86,1945,91,1946,90,1947,90,1948,93,1949,97,1950,96,1955,111,1960,120,1962,126,1963,130,1964,132,1965,138,1966,142,1967,142,1968,154,1969,151,1970,151,1971,164,1972,173,1973,174,1974,219,1975,302,1976,367,1977,422,1978,466,1979,508,1980,641,1981,759,1982,857,1983,864,1984,889,1985,901,1986,887,1987,887,1988,930,1989,993,1990,1037,1991,1024,1992,1021,1993,1044,1994,1095,1995,1112,1996,1148,1997,1180,1998,1215,1999,1244,2000,1282,2001,1314,2002,1342,2003,1382,2004,1420,2005,1459,2006,1499,2007,1545,2008,1574,2009,1624,2010,1658,2011,1688,2012,1717,2013,1746,2017,3187,2018,3438,2019,3747,2020,3785,2021,4056,2022,5407,2023,6566,2050,8500 # Units: kw/h # Identical to electricity: the round-trip losses should be built into the consumption figures in the vehicle .dat files, as these will be vehicle specific. -fuel[electric]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,141,1925,133,1926,142,1927,125,1928,117,1929,111,1930,111,1931,110,1932,107,1933,101,1934,97,1935,91,1936,88,1937,84,1938,84,1939,81,1940,83,1941,83,1942,81,1943,81,1944,86,1945,91,1946,90,1947,90,1948,93,1949,97,1950,96,1955,111,1960,120,1962,126,1963,130,1964,132,1965,138,1966,142,1967,142,1968,154,1969,151,1970,151,1971,164,1972,173,1973,174,1974,219,1975,302,1976,367,1977,422,1978,466,1979,508,1980,641,1981,759,1982,857,1983,864,1984,889,1985,901,1986,887,1987,887,1988,930,1989,993,1990,1037,1991,1024,1992,1021,1993,1044,1994,1095,1995,1112,1996,1148,1997,1180,1998,1215,1999,1244,2000,1282,2001,1314,2002,1342,2003,1382,2004,1420,2005,1459,2006,1499,2007,1545,2008,1574,2009,1624,2010,1658,2011,1688,2012,1717,2013,1746,2017,3187,2018,3438,2019,3747,2020,3785,2021,4056,2022,5407,2023,6566,2050,8500 +fuel[fuel_cell]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,141,1925,133,1926,142,1927,125,1928,117,1929,111,1930,111,1931,110,1932,107,1933,101,1934,97,1935,91,1936,88,1937,84,1938,84,1939,81,1940,83,1941,83,1942,81,1943,81,1944,86,1945,91,1946,90,1947,90,1948,93,1949,97,1950,96,1955,111,1960,120,1962,126,1963,130,1964,132,1965,138,1966,142,1967,142,1968,154,1969,151,1970,151,1971,164,1972,173,1973,174,1974,219,1975,302,1976,367,1977,422,1978,466,1979,508,1980,641,1981,759,1982,857,1983,864,1984,889,1985,901,1986,887,1987,887,1988,930,1989,993,1990,1037,1991,1024,1992,1021,1993,1044,1994,1095,1995,1112,1996,1148,1997,1180,1998,1215,1999,1244,2000,1282,2001,1314,2002,1342,2003,1382,2004,1420,2005,1459,2006,1499,2007,1545,2008,1574,2009,1624,2010,1658,2011,1688,2012,1717,2013,1746,2017,3187,2018,3438,2019,3747,2020,3785,2021,4056,2022,5407,2023,6566,2050,8500 # Units: kw/h -# Identical to electricity: the round-trip losses should be built into the consumption figures in the vehicle .dat files, as these will be vehicle specific. -fuel[electric]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,141,1925,133,1926,142,1927,125,1928,117,1929,111,1930,111,1931,110,1932,107,1933,101,1934,97,1935,91,1936,88,1937,84,1938,84,1939,81,1940,83,1941,83,1942,81,1943,81,1944,86,1945,91,1946,90,1947,90,1948,93,1949,97,1950,96,1955,111,1960,120,1962,126,1963,130,1964,132,1965,138,1966,142,1967,142,1968,154,1969,151,1970,151,1971,164,1972,173,1973,174,1974,219,1975,302,1976,367,1977,422,1978,466,1979,508,1980,641,1981,759,1982,857,1983,864,1984,889,1985,901,1986,887,1987,887,1988,930,1989,993,1990,1037,1991,1024,1992,1021,1993,1044,1994,1095,1995,1112,1996,1148,1997,1180,1998,1215,1999,1244,2000,1282,2001,1314,2002,1342,2003,1382,2004,1420,2005,1459,2006,1499,2007,1545,2008,1574,2009,1624,2010,1658,2011,1688,2012,1717,2013,1746,2017,3187,2018,3438,2019,3747,2020,3785,2021,4056,2022,5407,2023,6566,2050,8500 +# Identical to electricity - assume that this envisages a hydrogen fuel cell, so that this is equivalent to the fuel_cell above. +fuel[hydrogene]=1750,160,1880,160,1890,1913,128,1921,121,1922,167,1923,150,1924,141,1925,133,1926,142,1927,125,1928,117,1929,111,1930,111,1931,110,1932,107,1933,101,1934,97,1935,91,1936,88,1937,84,1938,84,1939,81,1940,83,1941,83,1942,81,1943,81,1944,86,1945,91,1946,90,1947,90,1948,93,1949,97,1950,96,1955,111,1960,120,1962,126,1963,130,1964,132,1965,138,1966,142,1967,142,1968,154,1969,151,1970,151,1971,164,1972,173,1973,174,1974,219,1975,302,1976,367,1977,422,1978,466,1979,508,1980,641,1981,759,1982,857,1983,864,1984,889,1985,901,1986,887,1987,887,1988,930,1989,993,1990,1037,1991,1024,1992,1021,1993,1044,1994,1095,1995,1112,1996,1148,1997,1180,1998,1215,1999,1244,2000,1282,2001,1314,2002,1342,2003,1382,2004,1420,2005,1459,2006,1499,2007,1545,2008,1574,2009,1624,2010,1658,2011,1688,2012,1717,2013,1746,2017,3187,2018,3438,2019,3747,2020,3785,2021,4056,2022,5407,2023,6566,2050,8500 + diff --git a/config/prices.tab b/config/prices.tab index 326ce93576..3c5131e129 100644 --- a/config/prices.tab +++ b/config/prices.tab @@ -36,4 +36,4 @@ corporation tax=1750,1,1797,1,1798,10,1801,10,1803,5,1804,5,1805,10,1815,10,1816 # https://thebla.co.uk/uk-interest-rate-history-base-rate-graph/ # This graph is noisy and difficult to read in detail. # More detail here after 1975: https://www.propertyinvestmentproject.co.uk/property-statistics/uk-interest-rate-history-graph/ -base rate=1750,5,1823,5,1824,4,1830,5,1840,5,1845,3,1850,2,1855,5,1860,7,1870,6,1875,4,1900,3,1910,4,1920,5,1929,5,1930,2,1950,2,1952,4,1955,7,1957,6,1960,7,1970,7,1975,11,1976,10,1977,14,1978,7,1979,14,1980,16,1981,15,1982,14,1983,11,1984,10,1985,12,1986,10,1987,9,1988,8,1989,13,1990,13,1991,11,1992,7,1993,6,1994,5,1996,6,1997,7,1998,6,1999,5,2000,6,2001,4,2006,5,2007,5,2008,3,2009,1,2021,1,2023,4 \ No newline at end of file +base rate=1750,5,1823,5,1824,4,1830,5,1840,5,1845,3,1850,2,1855,5,1860,7,1870,6,1875,4,1900,3,1910,4,1920,5,1929,5,1930,2,1950,2,1952,4,1955,7,1957,6,1960,7,1970,7,1975,11,1976,10,1977,14,1978,7,1979,14,1980,16,1981,15,1982,14,1983,11,1984,10,1985,12,1986,10,1987,9,1988,8,1989,13,1990,13,1991,11,1992,7,1993,6,1994,5,1996,6,1997,7,1998,6,1999,5,2000,6,2001,4,2006,5,2007,5,2008,3,2009,1,2021,1,2023,4