Skip to content

Commit

Permalink
Fixed tram capacities being multiplied by the number of articulated p…
Browse files Browse the repository at this point in the history
…arts
  • Loading branch information
audigex committed Jul 13, 2024
1 parent f21f2f5 commit 7f0104c
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/trams/BR555_Tram.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ item (FEAT_ROADVEHS, item_TRAM_BR555, 642) {
default: switch_TRAM_BR555_spriteset;
purchase: spriteset_BR555_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(600 * param_pax);
cargo_capacity: return(600 * param_pax / 5);
cost_factor: return(GetAdjustedCostTRAM(40));
running_cost_factor: return(GetAdjustedCostTRAM(35));
weight: 98;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/BR777_Tram.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ item (FEAT_ROADVEHS, item_TRAM_BR777, 643) {
default: switch_TRAM_BR777_spriteset;
purchase: spriteset_br777_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(484 * param_pax);
cargo_capacity: return(484 * param_pax / 4);
cost_factor: return(GetAdjustedCostTRAM(50));
running_cost_factor: return(GetAdjustedCostTRAM(40));
weight: 99;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/Birmingham_Urbos.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ item (FEAT_ROADVEHS, item_TRAM_BirminghamUrbos, 647) {
default: switch_TRAM_BirminghamUrbos_spriteset;
purchase: spriteset_BirminghamUrbos_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(210 * param_pax);
cargo_capacity: return(210 * param_pax / 5);
cost_factor: return(GetAdjustedCostTRAM(40));
running_cost_factor: return(GetAdjustedCostTRAM(35));
weight: 50;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/Blackpool_Flexity.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ item (FEAT_ROADVEHS, item_TRAM_BlackpoolFlexity, 648) {
default: switch_TRAM_BlackpoolFlexity_spriteset;
purchase: spriteset_BlackpoolFlexity_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(222 * param_pax);
cargo_capacity: return(222 * param_pax / 5);
cost_factor: return(GetAdjustedCostTRAM(40));
running_cost_factor: return(GetAdjustedCostTRAM(35));
weight: 50;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/DLR_B07.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ item (FEAT_ROADVEHS, item_TRAM_B07_Single, 639) {
default: sw_TRAM_B07;
purchase: spriteset_B07_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(284 * param_pax);
cargo_capacity: return(284 * param_pax / 2);
cost_factor: return(GetAdjustedCostTRAM(20));
running_cost_factor: return(GetAdjustedCostTRAM(18));
weight: 72;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/DLR_B07_Double.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ item (FEAT_ROADVEHS, item_TRAM_B07_Double, 640) {
default: sw_TRAM_B07;
purchase: spriteset_B07_Double_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(568 * param_pax);
cargo_capacity: return(568 * param_pax / 4);
cost_factor: return(GetAdjustedCostTRAM(30));
running_cost_factor: return(GetAdjustedCostTRAM(27));
weight: 144;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/DLR_B07_Triple.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ item (FEAT_ROADVEHS, item_TRAM_B07_Triple, 641) {
default: sw_TRAM_B07;
purchase: spriteset_B07_Double_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(852 * param_pax);
cargo_capacity: return(852 * param_pax / 6);
cost_factor: return(GetAdjustedCostTRAM(40));
running_cost_factor: return(GetAdjustedCostTRAM(36));
weight: 144;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/LU2024_Tram.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ item (FEAT_ROADVEHS, item_TRAM_LU2024, 595) {
weight: 197;
colour_mapping: return PALETTE_CC_FIRST;
length: switch_TRAM_LU2024_length;
cargo_capacity: return(1076 * param_pax);
cargo_capacity: return(1076 * param_pax / 9);
cost_factor: return(GetAdjustedCostTRAM(61));
running_cost_factor: return(GetAdjustedCostTRAM(37));
}
Expand Down
2 changes: 1 addition & 1 deletion src/trams/London_CR4000.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ item (FEAT_ROADVEHS, item_TRAM_CR4000, 644) {
default: sw_TRAM_CR4000;
purchase: spriteset_CR4000_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(200 * param_pax);
cargo_capacity: return(200 * param_pax / 2);
cost_factor: return(GetAdjustedCostTRAM(20));
running_cost_factor: return(GetAdjustedCostTRAM(18));
weight: 80;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/London_Variobahn.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ item (FEAT_ROADVEHS, item_TRAM_LondonVariobahn, 646) {
default: switch_TRAM_LondonVariobahn_spriteset;
purchase: spriteset_LondonVariobahn_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(206 * param_pax);
cargo_capacity: return(206 * param_pax / 5);
cost_factor: return(GetAdjustedCostTRAM(40));
running_cost_factor: return(GetAdjustedCostTRAM(35));
weight: 50;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/Metrolink_M5000_Double.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ item (FEAT_ROADVEHS, item_TRAM_M5000_Double, 638) {
default: sw_TRAM_M5000;
purchase: spriteset_M5000_Double_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(400 * param_pax);
cargo_capacity: return(400 * param_pax / 4);
cost_factor: return(GetAdjustedCostTRAM(30));
running_cost_factor: return(GetAdjustedCostTRAM(27));
weight: 160;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/Metrolink_M5000_Single.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ item (FEAT_ROADVEHS, item_TRAM_M5000_Single, 637) {
default: sw_TRAM_M5000;
purchase: spriteset_M5000_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(200 * param_pax);
cargo_capacity: return(200 * param_pax / 2);
cost_factor: return(GetAdjustedCostTRAM(20));
running_cost_factor: return(GetAdjustedCostTRAM(18));
weight: 80;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/Sheffield_Citylink.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ item (FEAT_ROADVEHS, item_TRAM_SheffieldCitylink, 649) {
default: sw_TRAM_SheffieldCitylink;
purchase: spriteset_SheffieldCitylink_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(236 * param_pax);
cargo_capacity: return(236 * param_pax / 2);
cost_factor: return(GetAdjustedCostTRAM(35));
running_cost_factor: return(GetAdjustedCostTRAM(30));
weight: 66;
Expand Down
2 changes: 1 addition & 1 deletion src/trams/Sheffield_Supertram.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ item (FEAT_ROADVEHS, item_TRAM_SheffieldSupertram, 650) {
default: sw_TRAM_SheffieldSupertram;
purchase: spriteset_SheffieldSupertram_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_capacity: return(201 * param_pax);
cargo_capacity: return(201 * param_pax / 2);
cost_factor: return(GetAdjustedCostTRAM(23));
running_cost_factor: return(GetAdjustedCostTRAM(16));
weight: 52;
Expand Down

0 comments on commit 7f0104c

Please sign in to comment.