diff options
| -rw-r--r-- | data/maps/control_center/connections.txtpb | 1 | ||||
| -rw-r--r-- | proto/data.proto | 1 | ||||
| -rw-r--r-- | proto/human.proto | 4 | ||||
| -rw-r--r-- | tools/datapacker/main.cpp | 5 |
4 files changed, 11 insertions, 0 deletions
| diff --git a/data/maps/control_center/connections.txtpb b/data/maps/control_center/connections.txtpb index 432d39d..5dc2890 100644 --- a/data/maps/control_center/connections.txtpb +++ b/data/maps/control_center/connections.txtpb | |||
| @@ -17,6 +17,7 @@ connections { | |||
| 17 | from_room: "Main Area" | 17 | from_room: "Main Area" |
| 18 | to_room: "Mint Ending" | 18 | to_room: "Mint Ending" |
| 19 | door { name: "Mint Ending Door" } | 19 | door { name: "Mint Ending Door" } |
| 20 | mint_ending: true | ||
| 20 | } | 21 | } |
| 21 | connections { | 22 | connections { |
| 22 | from_room: "Main Area" | 23 | from_room: "Main Area" |
| diff --git a/proto/data.proto b/proto/data.proto index e053942..619b3d3 100644 --- a/proto/data.proto +++ b/proto/data.proto | |||
| @@ -136,6 +136,7 @@ message Connection { | |||
| 136 | optional bool roof_access = 7; | 136 | optional bool roof_access = 7; |
| 137 | optional bool purple_ending = 8; | 137 | optional bool purple_ending = 8; |
| 138 | optional bool cyan_ending = 9; | 138 | optional bool cyan_ending = 9; |
| 139 | optional bool mint_ending = 11; | ||
| 139 | optional bool vanilla_only = 10; | 140 | optional bool vanilla_only = 10; |
| 140 | } | 141 | } |
| 141 | 142 | ||
| diff --git a/proto/human.proto b/proto/human.proto index 6c98d3f..5cd8ce7 100644 --- a/proto/human.proto +++ b/proto/human.proto | |||
| @@ -79,6 +79,10 @@ message HumanConnection { | |||
| 79 | // when the Strict Cyan Ending option is on. | 79 | // when the Strict Cyan Ending option is on. |
| 80 | optional bool cyan_ending = 10; | 80 | optional bool cyan_ending = 10; |
| 81 | 81 | ||
| 82 | // This means that the connection should additionally require being able to | ||
| 83 | // type a specific text string when Custom Mint Ending is on. | ||
| 84 | optional bool mint_ending = 12; | ||
| 85 | |||
| 82 | // This means that the connection only exists when doors are not shuffled. | 86 | // This means that the connection only exists when doors are not shuffled. |
| 83 | optional bool vanilla_only = 11; | 87 | optional bool vanilla_only = 11; |
| 84 | } | 88 | } |
| diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp index 7313fee..4ecde74 100644 --- a/tools/datapacker/main.cpp +++ b/tools/datapacker/main.cpp | |||
| @@ -533,6 +533,11 @@ class DataPacker { | |||
| 533 | r_connection.set_cyan_ending(human_connection.cyan_ending()); | 533 | r_connection.set_cyan_ending(human_connection.cyan_ending()); |
| 534 | } | 534 | } |
| 535 | 535 | ||
| 536 | if (human_connection.has_mint_ending()) { | ||
| 537 | f_connection.set_mint_ending(human_connection.mint_ending()); | ||
| 538 | r_connection.set_mint_ending(human_connection.mint_ending()); | ||
| 539 | } | ||
| 540 | |||
| 536 | if (human_connection.has_vanilla_only()) { | 541 | if (human_connection.has_vanilla_only()) { |
| 537 | f_connection.set_vanilla_only(human_connection.vanilla_only()); | 542 | f_connection.set_vanilla_only(human_connection.vanilla_only()); |
| 538 | r_connection.set_vanilla_only(human_connection.vanilla_only()); | 543 | r_connection.set_vanilla_only(human_connection.vanilla_only()); |
