Skip to content

Commit

Permalink
Added Class 93 and 99
Browse files Browse the repository at this point in the history
  • Loading branch information
audigex committed Aug 17, 2024
1 parent c122e1f commit 2009588
Show file tree
Hide file tree
Showing 7 changed files with 185 additions and 11 deletions.
Binary file modified docs/SpriteIDs.xlsx
Binary file not shown.
3 changes: 3 additions & 0 deletions docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
- Added LNER J70
- Added Class 58
- Added Class 68 + Mk3 rake
- Added Class 93
- Added Class 99
- Adjusted EyeCandy engine to hopefully discourage AI use
- Improved Class 89 sprites
- Fixed some animated pixels on HST rear power car
- Fixed some tram capacities
- Fixed Tram parameter switch
- Fixed Debug Mode and Simple Mode not removing some vehicles
- Fixed Class 88 stats and introduction date

# v2.12 (2024-08-08)
- Added LMS Black 5
Expand Down
Binary file added gfx/Electric/93.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 23 additions & 11 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,6 @@ str_BR68_usage :Mixed Traffic
str_BR68_eos :---
str_BR68_liveries :DRS, ScotRail, Chiltern Railways

STR_NAME_BR88 :BR Class 88 (Bi-Mode)
str_BR88_usage :Mixed Traffic
str_BR88_eos :---
str_BR88_liveries :DRS

STR_NAME_BR67Royal :BR Class 67 "British Royal Train"
str_BR67Royal_usage :Mixed Traffic
str_BR67Royal_eos :---
Expand All @@ -577,12 +572,6 @@ str_BR71_usage :Mixed Traffic
str_BR71_eos :---
str_BR71_liveries :BR Green

STR_NAME_BR89 :BR Class 89 "Badger"
str_BR89_usage :Express Passenger
str_BR89_eos :---
str_BR89_liveries :InterCity Swallow, GNER, InterCity


STR_NAME_18100 :18100 (Gas Turbine Prototype)
str_18100_usage :Mixed Traffic
str_18100_eos :---
Expand Down Expand Up @@ -628,6 +617,16 @@ str_BR87_usage :Mixed Traffic
str_BR87_eos :---
str_BR87_liveries :BR Blue, InterCity Swallow, Virgin

STR_NAME_BR88 :BR Class 88 (Bi-Mode)
str_BR88_usage :Mixed Traffic
str_BR88_eos :---
str_BR88_liveries :DRS

STR_NAME_BR89 :BR Class 89 "Badger"
str_BR89_usage :Express Passenger
str_BR89_eos :---
str_BR89_liveries :InterCity Swallow, GNER, InterCity

STR_NAME_BR90 :BR Class 90
str_BR90_usage :Mixed Traffic
str_BR90_eos :---
Expand All @@ -639,6 +638,16 @@ str_BR91_usage :Express Passenger
str_BR91_eos :---
str_BR91_liveries :InterCity Swallow, National Express, GNER, East Coast, Virgin East Coast

STR_NAME_BR93 :BR Class 93 (Tri-Mode)
str_BR93_usage :Mixed Traffic
str_BR93_eos :---
str_BR93_liveries :DRS

STR_NAME_BR99 :BR Class 99 (Bi-Mode)
str_BR99_usage :Mixed Traffic
str_BR99_eos :---
str_BR99_liveries :GBRf Blue, GBRf Black

STR_NAME_BR121 :BR Class 121 "Bubble Car" (1-car)
str_BR121_usage :Passenger
str_BR121_eos :---
Expand Down Expand Up @@ -1580,6 +1589,7 @@ str_DBSCompany : (DBSchenker - Company Train)
str_DeptGrey : (Departmental Grey)
str_DLRRed : (Docklands Light Railway - Red)
str_DRS : (DRS)
str_DRSGreen : (DRS - Green)
str_DRSCentre : (DRS - Centre Headcode)
str_DRSCompass : (DRS - Compass)
str_DRSCompass2 : (DRS - Compass - 2nd Version Lights)
Expand Down Expand Up @@ -1632,6 +1642,8 @@ str_GBRf3 : (GBRf - 3rd Version Lights)
str_GBRfBar : (GBRf - Barbie)
str_GBRfTfL : (GBRf - London Underground 150 Years)
str_GBRfHB : (GBRf - "Harry Beck")
str_GBRfBlue : (GBRf - Blue)
str_GBRfBlack : (GBRf - Black)
str_GERBlue : (GER - Blue)
str_GERBlack : (GER - Black)
str_GMPTE : (GMPTE)
Expand Down
2 changes: 2 additions & 0 deletions src/sortpurchase.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ sort(FEAT_TRAINS, [
item_BR91Standalone,
item_BluePullman_6Car, // Don't really belong anywhere but after the IC225 and before the DMUs seems to fit
item_BluePullman_8Car, // Don't really belong anywhere but after the IC225 and before the DMUs seems to fit
item_BR93,
item_BR99,
item_BR121,
item_BR139,
header_Pacer,
Expand Down
75 changes: 75 additions & 0 deletions src/trains/bimode_loco/93.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
spriteset(spriteset_BR93_Purchase, "gfx/Electric/93.png") {
template_purchase(0, 0)
}

spriteset(spriteset_BR93_DRSGreen, "gfx/Electric/93.png") {
template_train32px(0, 13)
}

switch(FEAT_TRAINS,SELF, switch_BR93,cargo_subtype){
0: spriteset_BR93_DRSGreen;
}

switch(FEAT_TRAINS,SELF,switch_BR93_cargo_subtype_text,cargo_subtype){
0: return string(str_DRSGreen);
return CB_RESULT_NO_TEXT;
}

switch(FEAT_TRAINS, SELF, switch_BR93_power, current_railtype) {
ELRL: return 5940;
return 1740;
}

switch(FEAT_TRAINS, SELF, switch_BR93_sound, current_railtype) {
RAIL: sw_66_sound;
return CB_RESULT_NO_TEXT;
}

item (FEAT_TRAINS, item_BR93, 691) {
property {
name: string(STR_NAME_BR93);
climates_available: ALL_CLIMATES;
introduction_date: date(2024,8,1);
model_life: VEHICLE_NEVER_EXPIRES;
retire_early: 1;
vehicle_life: 50;
reliability_decay: 7;
refittable_cargo_classes: 0;
cargo_allow_refit: [GOOD, FOOD];
loading_speed: 3;
cost_factor: 1;
running_cost_factor: 1;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 110 mph;
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1 hp;
running_cost_base: RUNNING_COST_DIESEL;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 86 ton;
engine_class: ENGINE_CLASS_DIESEL;
tractive_effort_coefficient: 0.337;
air_drag_coefficient: 0.1;
length: 8;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_DIESEL;
extra_weight_per_wagon: 0;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_bimode),string(str_BR93_usage),string(str_BR93_eos),string(str_BR93_liveries)));
can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
cargo_capacity: return 0;
cargo_subtype_text: switch_BR93_cargo_subtype_text;
default: switch_BR93;
purchase: spriteset_BR93_Purchase;
power: switch_BR93_power;
colour_mapping: return PALETTE_CC_FIRST;
create_effect: diesel_create_visual_effect;
sound_effect: switch_BR93_sound;
cost_factor: return(GetAdjustedCost(50));
running_cost_factor: return(GetAdjustedCost(28));
}
}
82 changes: 82 additions & 0 deletions src/trains/bimode_loco/99.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
spriteset(spriteset_BR99_Purchase, "gfx/Electric/99.png") {
template_purchase(0, 0)
}

spriteset(spriteset_BR99_GBRfBlue, "gfx/Electric/99.png") {
template_train32px(0, 13)
}

spriteset(spriteset_BR99_GBRfBlack, "gfx/Electric/99.png") {
template_train32px(0, 39)
}

switch(FEAT_TRAINS,SELF, switch_BR99,cargo_subtype){
0: spriteset_BR99_GBRfBlue;
1: spriteset_BR99_GBRfBlack;
}

switch(FEAT_TRAINS,SELF,switch_BR99_cargo_subtype_text,cargo_subtype){
0: return string(str_GBRfBlue);
1: return string(str_GBRfBlack);
return CB_RESULT_NO_TEXT;
}

switch(FEAT_TRAINS, SELF, switch_BR99_power, current_railtype) {
ELRL: return 6000;
return 2100;
}


switch(FEAT_TRAINS, SELF, switch_BR99_sound, current_railtype) {
RAIL: sw_66_sound;
return CB_RESULT_NO_TEXT;
}

item (FEAT_TRAINS, item_BR99, 690) {
property {
name: string(STR_NAME_BR99);
climates_available: ALL_CLIMATES;
introduction_date: date(2025,8,1);
model_life: VEHICLE_NEVER_EXPIRES;
retire_early: 1;
vehicle_life: 50;
reliability_decay: 7;
refittable_cargo_classes: 0;
cargo_allow_refit: [GOOD, FOOD];
loading_speed: 3;
cost_factor: 1;
running_cost_factor: 1;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 75 mph;
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1 hp;
running_cost_base: RUNNING_COST_DIESEL;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 110 ton;
engine_class: ENGINE_CLASS_DIESEL;
tractive_effort_coefficient: 0.4545;
air_drag_coefficient: 0.1;
length: 8;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_DIESEL;
extra_weight_per_wagon: 0;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_bimode),string(str_BR99_usage),string(str_BR99_eos),string(str_BR99_liveries)));
can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
cargo_capacity: return 0;
cargo_subtype_text: switch_BR99_cargo_subtype_text;
default: switch_BR99;
purchase: spriteset_BR99_Purchase;
power: switch_BR99_power;
colour_mapping: return PALETTE_CC_FIRST;
create_effect: diesel_create_visual_effect;
sound_effect: switch_BR99_sound;
cost_factor: return(GetAdjustedCost(55));
running_cost_factor: return(GetAdjustedCost(34));
}
}

0 comments on commit 2009588

Please sign in to comment.