Skip to content

Commit

Permalink
Added JIA, PAA/PAV CovHop, GWR Mink G
Browse files Browse the repository at this point in the history
  • Loading branch information
Su1phur committed Nov 15, 2024
1 parent 481705d commit 93b2173
Show file tree
Hide file tree
Showing 8 changed files with 211 additions and 5 deletions.
10 changes: 7 additions & 3 deletions docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
- GWR Great Bear and Hall class rework
- Class 56
- Class 69
- Made eyecandy, debug, and departmental vehicles unattractive to AI
- Made eyecandy, debug, and departmental vehicles unattractive to AI
- GWR Dean 25ft 4 Compartment Second Class (SY), Diagram S1/LA9N, Built 1871, seats 32
- BRT Whisky CovHop (PAV) - Only variant code needed

# v2.13
- Added LNER J70
Expand All @@ -22,12 +23,15 @@
- Added Class 68 + Mk3 rake
- Added Class 93
- Added Class 99
- Added LNER Gresley 61 Ft 6 TK teak coach
- Added LNER Gresley 61 Ft 6 BCK teak coach
- Added LNER Gresley 61ft6 TK teak coach
- Added LNER Gresley 61ft6 BCK teak coach
- Added LNER Gresley 61ft6 TPO travelling post office
- Added LNER Gresley 61ft6 BG mail coach
- Added GCR Robinson 50 ft mahogany coach (2 variants)
- Added GWR Mink G goods van
- Added BR VGA and VKA goods vans
- Added BR JIA "Polybulk" Covered Hopper
- Added BRT PAA Covered Hopper
- Adjusted EyeCandy engine to hopefully discourage AI use
- Reworked Southern Region CC Class (OG BR Class 70)
- Added a pile of liveries for Class 66
Expand Down
Binary file added gfx/Freight/BRT_CovHop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/Freight/BR_JIA_Polybulk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/Freight/GWR_Mink_G.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ str_col_Orange :Orange
str_col_Grey :Grey
str_col_Mahogany :Mahogany
str_col_Bauxite :Bauxite
str_col_Brown :Brown

str_var_Named :Named
str_var_Olympics :Olympics
Expand All @@ -102,6 +103,7 @@ str_var_Speedlink :Speedlink
str_var_Exhibition :Exhibition
str_var_Polybulk :Polybulk
str_var_Grainflow :Grainflow
str_var_Advertisement :with Advertisement

# Variant group headers
STR_LU_Subsurface_Header :London Underground sub-surface units
Expand Down Expand Up @@ -1386,8 +1388,8 @@ str_BRContainer_usage :Misc. Cargo
str_BRContainer_eos :---
str_BRContainer_liveries :Maersk, Tesco, Random

STR_NAME_BRT_CovHop :BRT Covered Hopper
STR_NAME_BRT_Whisky_CovHop :BRT Covered Hopper "Whisky CovHop"
STR_NAME_BRT_CovHop :BRT PAA Covered Hopper
STR_NAME_BRT_Whisky_CovHop :BRT PAV Covered Hopper "Whisky CovHop"
str_BRT_CovHop_usage :Bulk Cargos
str_BRT_CovHop_eos :---
str_BRT_CovHop_liveries :Grainflow, BR Grey, BR Brown, Private Owner Blue, Private Owner Blue with Advertising, Private Owner Yellow
Expand Down
78 changes: 78 additions & 0 deletions src/trains/freight_wagons/BR/BRT_CovHop.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
spriteset(spriteset_BRT_CovHop_purchase, "gfx/Freight/BRT_CovHop.png") {
template_purchase(0, 0)
}

spriteset(spriteset_BRT_CovHop_Grainflow, "gfx/Freight/BRT_CovHop.png") {
template_train20px(0, 13)
}

spriteset(spriteset_BRT_CovHop_Grey, "gfx/Freight/BRT_CovHop.png") {
template_train32px(0, 39)
}

spriteset(spriteset_BRT_CovHop_Brown, "gfx/Freight/BRT_CovHop.png") {
template_train32px(0, 65)
}

spriteset(spriteset_BRT_CovHop_Priv_Blue, "gfx/Freight/BRT_CovHop.png") {
template_train32px(0, 91)
}

spriteset(spriteset_BRT_CovHop_Priv_Blue_Ad, "gfx/Freight/BRT_CovHop.png") {
template_train32px(0, 117)
}

spriteset(spriteset_BRT_CovHop_Priv_Yellow, "gfx/Freight/BRT_CovHop.png") {
template_train32px(0, 144)
}

switch(FEAT_TRAINS, SELF, sw_BRT_CovHop, cargo_subtype) {
0: spriteset_BRT_CovHop_Grainflow;
1: spriteset_BRT_CovHop_Grey;
2: spriteset_BRT_CovHop_Brown;
3: spriteset_BRT_CovHop_Priv_Blue;
4: spriteset_BRT_CovHop_Priv_Blue_Ad;
5: spriteset_BRT_CovHop_Priv_Yellow;
}

switch(FEAT_TRAINS, SELF, sw_BRT_CovHop_cargo_subtype_text, cargo_subtype) {
0: return string(STR_LIVERY, string(str_var_Polybulk));
1: return string(STR_LIVERY_EXTENDED, string(str_comp_BR), string(str_col_Grey));
2: return string(STR_LIVERY_EXTENDED, string(str_comp_BR), string(str_col_Brown));
3: return string(STR_LIVERY_EXTENDED, string(str_comp_gen_priv_owner), string(str_col_Blue));
4: return string(STR_LIVERY_SPECIAL, string(str_comp_gen_priv_owner), string(str_col_Blue), string(str_var_Advertisement));
5: return string(STR_LIVERY_EXTENDED, string(str_comp_gen_priv_owner), string(str_col_Yellow));
}

item(FEAT_TRAINS, item_BRTCovHop, 708) {
property {
name: string(STR_NAME_BRT_CovHop);
climates_available: ALL_CLIMATES;
introduction_date: date(1965,1,1);
model_life: VEHICLE_NEVER_EXPIRES;
refittable_cargo_classes: bitmask(CC_BULK, CC_COVERED, CC_POWDERIZED, CC_NON_POURABLE, CC_NEO_BULK);
loading_speed: 25;
cost_factor: 1;
running_cost_factor: 1;
speed: 60 mph;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
cargo_capacity: 35;
weight: 13 ton;
air_drag_coefficient: 0.07;
length: 8;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_coach, string(str_BRJIA_Polybulk_liveries)));
can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
default: sw_BR_JIA_cargo;
purchase: spriteset_BRT_CovHop_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_subtype_text: sw_BRJIA_cargo_subtype_text;
cost_factor: return(GetAdjustedCost(29));
running_cost_factor: return(GetAdjustedCost(17));
}
}
67 changes: 67 additions & 0 deletions src/trains/freight_wagons/BR/BR_JIA.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
spriteset(spriteset_BR_JIA_Polybulk_purchase, "gfx/Freight/BR_JIA_Polybulk.png") {
template_purchase(0, 0)
}

spriteset(spriteset_BR_JIA_TSLPolybulk, "gfx/Freight/BR_JIA_Polybulk.png") {
template_train32px(0, 13)
}

spriteset(spriteset_BR_JIA_Polybulk, "gfx/Freight/BR_JIA_Polybulk.png") {
template_train32px(0, 39)
}

spriteset(spriteset_BR_JIA_Grainflow, "gfx/Freight/BR_JIA_Polybulk.png") {
template_train32px(0, 65)
}

spriteset(spriteset_BR_JIA_Tiger_Nacco_Grey, "gfx/Freight/BR_JIA_Polybulk.png") {
template_train32px(0, 91)
}

switch(FEAT_TRAINS, SELF, sw_BR_JIA_cargo, cargo_subtype) {
0: spriteset_BR_JIA_TSLPolybulk;
1: spriteset_BR_JIA_Polybulk;
2: spriteset_BR_JIA_Grainflow;
3: spriteset_BR_JIA_Tiger_Nacco_Grey;
}

switch(FEAT_TRAINS, SELF, sw_BR_JIA_cargo_subtype_text, cargo_subtype) {
0: return string(STR_LIVERY, string(str_comp_TSL), string(str_var_Polybulk));
1: return string(STR_LIVERY, string(str_var_Polybulk));
2: return string(STR_LIVERY, string(str_var_Grainflow));
3: return string(STR_LIVERY_EXTENDED, string(str_comp_TigerNacco), string(str_col_Grey));
# return CB_RESULT_NO_TEXT;
}

item(FEAT_TRAINS, item_BRJIA, 709) {
property {
name: string(STR_NAME_BRJIA_Polybulk);
climates_available: ALL_CLIMATES;
introduction_date: date(1974,1,1);
model_life: VEHICLE_NEVER_EXPIRES;
refittable_cargo_classes: bitmask(CC_BULK, CC_COVERED, CC_POWDERIZED, CC_NON_POURABLE, CC_NEO_BULK);
loading_speed: 25;
cost_factor: 1;
running_cost_factor: 1;
speed: 75 mph;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
cargo_capacity: 58;
weight: 22 ton;
air_drag_coefficient: 0.07;
length: 8;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_coach, string(str_BRJIA_Polybulk_liveries)));
can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
default: sw_BR_JIA_cargo;
purchase: spriteset_BR_JIA_Polybulk_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_subtype_text: sw_BRJIA_cargo_subtype_text;
cost_factor: return(GetAdjustedCost(29));
running_cost_factor: return(GetAdjustedCost(17));
}
}
55 changes: 55 additions & 0 deletions src/trains/freight_wagons/GWR/GWR_Mink_G.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
spriteset(spriteset_GWR_Mink_G_purchase, "gfx/Freight/GWR_Mink_G.png") {
template_purchase(0, 0)
}

spriteset(spriteset_GWR_Mink_G_Grey, "gfx/Freight/GWR_Mink_G.png") {
template_train20px(0, 13)
}

spriteset(spriteset_GWR_Mink_G_Bauxite, "gfx/Freight/GWR_Mink_G.png") {
template_train20px(0, 39)
}

switch(FEAT_TRAINS, SELF, sw_GWR_Mink_G_cargo, cargo_subtype) {
0: spriteset_GWR_Mink_G_Grey;
1: spriteset_GWR_Mink_G_Bauxite;
}

switch(FEAT_TRAINS, SELF, sw_GWR_Mink_G_cargo_subtype_text, cargo_subtype) {
0: return string(STR_LIVERY_EXTENDED, string(str_comp_GWR), string(str_col_Grey));
1: return string(STR_LIVERY_EXTENDED, string(str_comp_BR), string(str_col_Bauxite));
# return CB_RESULT_NO_TEXT;
}

item(FEAT_TRAINS, item_GWRMinkG, 710) {
property {
name: string(STR_NAME_GWR_Mink_G);
climates_available: ALL_CLIMATES;
introduction_date: date(1930,1,1);
model_life: VEHICLE_NEVER_EXPIRES;
refittable_cargo_classes: bitmask(CC_PIECE_GOODS, CC_EXPRESS, CC_HAZARDOUS, CC_REFRIGERATED, CC_NON_POURABLE, CC_NEO_BULK, CC_OVERSIZED, CC_ARMOURED);
loading_speed: 25;
cost_factor: 1;
running_cost_factor: 1;
speed: 50 mph;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
cargo_capacity: 20;
weight: 20 ton;
air_drag_coefficient: 0.07;
length: 5;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_coach, string(str_GWR_Mink_G_liveries)));
can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
default: sw_GWR_Mink_G_cargo;
purchase: spriteset_GWR_Mink_G_purchase;
colour_mapping: return PALETTE_CC_FIRST;
cargo_subtype_text: sw_GWR_Mink_G_cargo_subtype_text;
cost_factor: return(GetAdjustedCost(29));
running_cost_factor: return(GetAdjustedCost(17));
}
}

0 comments on commit 93b2173

Please sign in to comment.