Skip to content

260311 fix ca24 cafe effect #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Babel-TTT wants to merge 2 commits into
base: main
Choose a base branch
from
Open

260311 fix ca24 cafe effect #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c96d221
fix ca24 cafe effect
Babel-TTT Mar 11, 2026
9496944
fix cr200j ky capacity
Babel-TTT Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/str.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ STR_NAME_YZ25A,YZ25A (Passenger Coach),YZ25A (客车)
STR_NAME_YW25A,YW25A (Passenger Coach),YW25A (客车)
STR_NAME_RW25A,RW25A (Passenger Coach),RW25A (客车)
STR_NAME_CA25A,CA25A (Passenger Coach),CA25A (餐车)
STR_NAME_KD25A,KD25A (Passenger Coach),KD25A (客车)
STR_NAME_YZ25B,YZ25B (Passenger Coach),YZ25B (客车)
STR_NAME_RZ25B,RZ25B (Passenger Coach),RZ25B (客车)
STR_NAME_YW25B,YW25B (Passenger Coach),YW25B (客车)
Expand Down Expand Up @@ -165,6 +164,7 @@ STR_NAME_TZ,TZ (Air Conditioner Generator Car),TZ (空调发电车)
STR_NAME_TZ2,TZ2 (KD25G) (Air Conditioner Generator Car),TZ2 (KD25G) (空调发电车)
STR_NAME_TZ24,TZ24 (Air Conditioner Generator Car),TZ24 (空调发电车)
STR_NAME_KD25SM,KD25 (Sanshui-Maoming Railway) (Air Conditioner Generator Car),KD25 (三茂铁路) (空调发电车)
STR_NAME_KD25A,KD25A (Air Conditioner Generator Car),KD25A (空调发电车)
STR_NAME_KD25C,KD25C (Air Conditioner Generator Car),KD25C (空调发电车)
STR_NAME_KD25G,KD25G (Air Conditioner Generator Car),KD25G (空调发电车)
STR_NAME_KD25K,KD25K (Air Conditioner Generator Car),KD25K (空调发电车)
Expand Down
8 changes: 4 additions & 4 deletions src/25-emu/cr200jcl.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ switch (FEAT_TRAINS, SELF, switch_cr200jcl_middle_capacity, vehicle_type_id) {
1036: switch_cr200jc_middle_capacity_we;
1037: switch_cr200jc_middle_capacity_wy;
1039: switch_cr200jc_middle_capacity_wg;
1051: switch_cr200jc_middle_capacity_wex;
1536: switch_cr200jc_middle_capacity_wex;
return 0;
}

Expand All @@ -114,7 +114,7 @@ switch (FEAT_TRAINS, SELF, switch_cr200jcl_cab_capacity, vehicle_type_id) {
1036: switch_cr200jc_cab_capacity_we;
1037: switch_cr200jc_cab_capacity_wy;
1039: switch_cr200jc_cab_capacity_wg;
1051: return 0;
1536: return 0;

@wensimehrp wensimehrp Mar 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

说实话感觉这里有点儿奇怪……type id明明可以用宏全部定义的，或者用nml内置常量功能

return 0;
}

Expand All @@ -132,7 +132,7 @@ switch (FEAT_TRAINS, SELF, switch_cr200jcl_wagon_cost, vehicle_type_id) {
1036: return 30;
1037: return 32;
1039: return 34;
1051: return 40;
1536: return 40;
return 0;
}

Expand All @@ -145,7 +145,7 @@ switch (FEAT_TRAINS, SELF, switch_cr200jcl_wagon_running, vehicle_type_id) {
1036: return 15;
1037: return 18;
1039: return 20;
1051: return 22;
1536: return 22;
return 0;
}

Expand Down
3 changes: 2 additions & 1 deletion src/coaches/24/ca24ddr.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,11 @@ item (FEAT_TRAINS, ca24ddr) {
cost_factor: 8;
running_cost_base: RUNNING_COST_ELECTRIC;
running_cost_factor: 6;
bitmask_vehicle_info: bitmask(1);
}
graphics {
// Menu
additional_text: string(STR_DESC_5, string(STR_FULL_NAME_CA24DDR), string(STR_DDR_IMPORT), string(STR_SELF_AIR_CONDITIONER), string(STR_CAFE_EFFECT), string(STR_LV_AVAILABLE_S ,string(STR_LIVERY_AVAILABLE), string(STR_IMPORT_1ST), string(STR_IMPORT_1ST_INT)), string(STR_COMFORT_MEDIUM, 240));
additional_text: string(STR_DESC_5, string(STR_FULL_NAME_CA24DDR), string(STR_DDR_IMPORT), string(STR_CAFE_EFFECT), string(STR_SELF_AIR_CONDITIONER), string(STR_CAFE_EFFECT), string(STR_LV_AVAILABLE_S ,string(STR_LIVERY_AVAILABLE), string(STR_IMPORT_1ST), string(STR_IMPORT_1ST_INT)), string(STR_COMFORT_MEDIUM, 240));

@jfkuayue jfkuayue Mar 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there a double STR_CAFE_EFFECT?

@jfkuayue jfkuayue Mar 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And also should be STR_DESC_6 to contain that

can_attach_wagon: locowagon;

// Graphics
Expand Down
3 changes: 2 additions & 1 deletion src/coaches/24/rz24ca.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ item (FEAT_TRAINS, rz24ca) {
cost_factor: 8;
running_cost_base: RUNNING_COST_ELECTRIC;
running_cost_factor: 6;
bitmask_vehicle_info: bitmask(1);
}
graphics {
// Menu
additional_text: string(STR_DESC_5, string(STR_FULL_NAME_RZ24CA), string(STR_SELF_AIR_CONDITIONER), string(STR_COMFORT_MEDIUM, 192));
additional_text: string(STR_DESC_5, string(STR_FULL_NAME_RZ24CA), string(STR_CAFE_EFFECT), string(STR_SELF_AIR_CONDITIONER), string(STR_COMFORT_MEDIUM, 192));
can_attach_wagon: locowagon;

// Graphics
Expand Down
2 changes: 1 addition & 1 deletion src/coaches/smr/teni8.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ item (FEAT_TRAINS, teni8) {
}
graphics {
// Menu
additional_text: string(STR_DESC_4, string(STR_SMR_VEHICLE), string(STR_COMFORT_HIGH, 256), string(STR_NO_AIR_CONDITIONER));
additional_text: string(STR_DESC_4, string(STR_SMR_VEHICLE), string(STR_COMFORT_MEDIUM, 256), string(STR_NO_AIR_CONDITIONER));
can_attach_wagon: locowagon;

// Graphics
Expand Down
2 changes: 1 addition & 1 deletion src/functions.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ switch (FEAT_TRAINS, SELF, crhwagon, vehicle_type_id) {

switch (FEAT_TRAINS, SELF, crhwagonxl, vehicle_type_id) {
1024..1035: onlyallowcst;
1051: onlyallowcst;
1051: onlyallowcst;//Not used
return CB_RESULT_ATTACH_DISALLOW;
}

Expand Down
Loading