-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
ADDED GH70B AND G70A #103
Open
CR400-BF-5033
wants to merge
2
commits into
OpenTTD-China-Set:main
Choose a base branch
from
CR400-BF-5033:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
ADDED GH70B AND G70A #103
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -281,6 +281,8 @@ sort (FEAT_TRAINS, [ | |
| g50, | ||
| g60, | ||
| g70, | ||
| g70a, | ||
| gh70b, | ||
| gn70, | ||
| gn80, | ||
| n5, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| //Begin g70a | ||
| switch (FEAT_TRAINS, SELF, switch_g70a_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { | ||
| 0: return string(STR_TANKER); | ||
| return CB_RESULT_NO_TEXT; | ||
| } | ||
|
|
||
| spriteset (spriteset_g70a_purchase, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_purchase ("wagons/g70", "g70a-new-red") | ||
| } | ||
|
|
||
| spriteset (spriteset_g70a_old, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_standard ("wagons/g70", "g70a-old") | ||
| } | ||
| spriteset (spriteset_g70a_new_red, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_standard ("wagons/g70", "g70a-new-red") | ||
| } | ||
| spriteset (spriteset_g70a_old_red, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_standard ("wagons/g70", "g70a-old-red") | ||
| } | ||
|
|
||
| random_switch (FEAT_TRAINS, SELF, random_g70a_colour) { | ||
| 2: spriteset_g70a_old_red; | ||
| 1: spriteset_g70a_new_red; | ||
| 1: spriteset_g70a_old; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_g70a_cargo_subtype, cargo_subtype) { | ||
| 0: return string(STR_RANDOM_COLOR); | ||
| 1: return string(STR_RED); | ||
| 2: return string(STR_DETERIORATE); | ||
| 3: return string(STR_LV_COLOR_PREFIX, string(STR_LV_PRE_DETERIORATE), string(STR_RED)); | ||
| return CB_RESULT_NO_TEXT; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_g70a_graphics_subtype, cargo_subtype) { | ||
| 0: random_g70a_colour; | ||
| 1: spriteset_g70a_new_red; | ||
| 2: spriteset_g70a_old; | ||
| 3: spriteset_g70a_old_red; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_g70a_articulated_part, extra_callback_info1) { | ||
| 1..2: return g70a; | ||
| return CB_RESULT_NO_MORE_ARTICULATED_PARTS; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_g70a_graphics, position_in_articulated_veh % 3) { | ||
| 1: switch_g70a_graphics_subtype; | ||
| empty_sprites; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_g70a_capacity, position_in_articulated_veh % 3) { | ||
| 1: return 60; | ||
| return 0; | ||
| } | ||
|
|
||
| item (FEAT_TRAINS, g70a) { | ||
| property { | ||
| // Menu | ||
| name: string(STR_NAME_G70A); | ||
| sprite_id: SPRITE_ID_NEW_TRAIN; | ||
| misc_flags: bitmask(TRAIN_FLAG_AUTOREFIT); | ||
| variant_group: 3088; | ||
|
|
||
| // Availability | ||
| climates_available: ALL_CLIMATES; | ||
| introduction_date: date(2016,08,01); | ||
| model_life: VEHICLE_NEVER_EXPIRES; | ||
| vehicle_life: 30; | ||
| track_type: SACN; | ||
|
|
||
| // Cargo | ||
| refittable_cargo_classes: bitmask(CC_LIQUID, CC_HAZARDOUS); | ||
| non_refittable_cargo_classes: 0; | ||
| cargo_allow_refit: []; | ||
| cargo_disallow_refit: []; | ||
| refit_cost: 0; | ||
| default_cargo_type: DEFAULT_CARGO_FIRST_REFITTABLE; | ||
| ai_special_flag: AI_FLAG_CARGO; | ||
| cargo_capacity: 60; | ||
| loading_speed: 4 << param_loading_speed; | ||
| cargo_age_period: 185 << param_cargo_decay; | ||
|
|
||
| // Stats | ||
| speed: 100 km/h; | ||
| power: 0 hp; | ||
| weight: 21.3 ton; | ||
| cost_factor: 8; | ||
| running_cost_base: RUNNING_COST_ELECTRIC; | ||
| running_cost_factor: 6; | ||
| } | ||
| graphics { | ||
| // Menu | ||
| additional_text: string(STR_DESC_2, string(STR_G70A_LIVERY_AVAILABILITY), string(STR_FRESHNESS_MEDIUM, 185)); | ||
| can_attach_wagon: locowagon; | ||
| cargo_subtype_text: switch_g70a_cargo_subtype; | ||
|
|
||
| // Graphics | ||
| default: switch_g70a_graphics; | ||
| purchase: spriteset_g70a_purchase; | ||
| articulated_part: switch_g70a_articulated_part; | ||
|
|
||
| // Stats | ||
| length: switch_length_2_3_2; | ||
| cargo_capacity: switch_g70a_capacity; | ||
| cargo_age_period: 185 << (param_cargo_decay + param_wagoncargodecay); | ||
| cost_factor: 5; | ||
| running_cost_factor: 4 * runningcostfactor(); | ||
| purchase_running_cost_factor: 16; | ||
| purchase_cargo_capacity: 20; | ||
| name: switch_g70_name; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| //End g70a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| //Begin gh70b | ||
| switch (FEAT_TRAINS, SELF, switch_gh70b_name, getbits(extra_callback_info1, 0, 8) == 0x20? getbits(extra_callback_info1, 8, 8) : 0xFFFF) { | ||
| 0: return string(STR_TANKER); | ||
| return CB_RESULT_NO_TEXT; | ||
| } | ||
|
|
||
| spriteset (spriteset_gh70b_purchase, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_purchase ("wagons", "gh70b") | ||
| } | ||
|
|
||
| spriteset (spriteset_gh70b, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_standard ("wagons", "gh70b") | ||
| } | ||
| spriteset (spriteset_gh70b_old, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP) { | ||
| template_standard ("wagons", "gh70b-old") | ||
| } | ||
|
|
||
| random_switch (FEAT_TRAINS, SELF, random_gh70b_colour) { | ||
| 3: spriteset_gh70b_old; | ||
| 1: spriteset_gh70b; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_gh70b_cargo_subtype, cargo_subtype) { | ||
| 0: return string(STR_RANDOM_COLOR); | ||
| 1: return string(STR_FACTORY); | ||
| 2: return string(STR_DETERIORATE); | ||
| return CB_RESULT_NO_TEXT; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_gh70b_graphics_subtype, cargo_subtype) { | ||
| 0: random_gh70b_colour; | ||
| 1: spriteset_gh70b; | ||
| 2: spriteset_gh70b_old; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_gh70b_articulated_part, extra_callback_info1) { | ||
| 1..2: return gh70b; | ||
| return CB_RESULT_NO_MORE_ARTICULATED_PARTS; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_gh70b_graphics, position_in_articulated_veh % 3) { | ||
| 1: switch_gh70b_graphics_subtype; | ||
| empty_sprites; | ||
| } | ||
|
|
||
| switch (FEAT_TRAINS, SELF, switch_gh70b_capacity, position_in_articulated_veh % 3) { | ||
| 1: return 62; | ||
| return 0; | ||
| } | ||
|
|
||
| item (FEAT_TRAINS, gh70b) { | ||
| property { | ||
| // Menu | ||
| name: string(STR_NAME_GH70B); | ||
| sprite_id: SPRITE_ID_NEW_TRAIN; | ||
| misc_flags: bitmask(TRAIN_FLAG_AUTOREFIT); | ||
| variant_group: 3088; | ||
|
|
||
| // Availability | ||
| climates_available: ALL_CLIMATES; | ||
| introduction_date: date(2015,04,01); | ||
| model_life: VEHICLE_NEVER_EXPIRES; | ||
| vehicle_life: 30; | ||
| track_type: SACN; | ||
|
|
||
| // Cargo | ||
| refittable_cargo_classes: 0; | ||
| non_refittable_cargo_classes: 0; | ||
| cargo_allow_refit: [SULP, FERT, NITR, NHNO, CHLO, NH3_, ACID, C2H4, SOAP, N7__, RFPR]; | ||
| cargo_disallow_refit: []; | ||
| refit_cost: 0; | ||
| default_cargo_type: DEFAULT_CARGO_FIRST_REFITTABLE; | ||
| ai_special_flag: AI_FLAG_CARGO; | ||
| cargo_capacity: 68; | ||
| loading_speed: 4 << param_loading_speed; | ||
| cargo_age_period: 185 << param_cargo_decay; | ||
|
|
||
| // Stats | ||
| speed: 100 km/h; | ||
| power: 0 hp; | ||
| weight: 25.8 ton; | ||
| cost_factor: 8; | ||
| running_cost_base: RUNNING_COST_ELECTRIC; | ||
| running_cost_factor: 6; | ||
| } | ||
| graphics { | ||
| // Menu | ||
| additional_text: string(STR_DESC_2, string(STR_GH70B_LIVERY_AVAILABILITY), string(STR_FRESHNESS_MEDIUM, 185)); | ||
| can_attach_wagon: locowagon; | ||
| cargo_subtype_text: switch_gh70b_cargo_subtype; | ||
|
|
||
| // Graphics | ||
| default: switch_gh70b_graphics; | ||
| purchase: spriteset_gh70b_purchase; | ||
| articulated_part: switch_gh70b_articulated_part; | ||
|
|
||
| // Stats | ||
| length: switch_length_2_2_2; | ||
| cargo_capacity: switch_gh70b_capacity; | ||
| cargo_age_period: 185 << (param_cargo_decay + param_wagoncargodecay); | ||
| cost_factor: 5; | ||
| running_cost_factor: 4 * runningcostfactor(); | ||
| purchase_running_cost_factor: 16; | ||
| purchase_cargo_capacity: 68/3; | ||
| name: switch_gh70b_name; | ||
|
|
||
| } | ||
| } | ||
|
|
||
| // End gh70b |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
g70a能折叠到g70下面吗
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
没加这个ww
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
游戏里原本就有g70啊