about summary refs log tree commit diff stats
path: root/ap_state.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ap_state.cpp')
-rw-r--r--ap_state.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/ap_state.cpp b/ap_state.cpp index c13b87c..70f183e 100644 --- a/ap_state.cpp +++ b/ap_state.cpp
@@ -52,6 +52,7 @@ std::map<int64_t, std::string> progressive_item_by_ap_id;
52DoorShuffleMode door_shuffle_mode = kNO_DOORS; 52DoorShuffleMode door_shuffle_mode = kNO_DOORS;
53bool color_shuffle = false; 53bool color_shuffle = false;
54bool painting_shuffle = false; 54bool painting_shuffle = false;
55int mastery_requirement = 21;
55 56
56std::map<std::string, std::string> painting_mapping; 57std::map<std::string, std::string> painting_mapping;
57 58
@@ -116,6 +117,7 @@ void AP_Connect(std::string server, std::string player, std::string password) {
116 color_shuffle = false; 117 color_shuffle = false;
117 painting_shuffle = false; 118 painting_shuffle = false;
118 painting_mapping.clear(); 119 painting_mapping.clear();
120 mastery_requirement = 21;
119 121
120 connected = false; 122 connected = false;
121 has_connection_result = false; 123 has_connection_result = false;
@@ -166,6 +168,7 @@ void AP_Connect(std::string server, std::string player, std::string password) {
166 door_shuffle_mode = slot_data["shuffle_doors"].get<DoorShuffleMode>(); 168 door_shuffle_mode = slot_data["shuffle_doors"].get<DoorShuffleMode>();
167 color_shuffle = slot_data["shuffle_colors"].get<bool>(); 169 color_shuffle = slot_data["shuffle_colors"].get<bool>();
168 painting_shuffle = slot_data["shuffle_paintings"].get<bool>(); 170 painting_shuffle = slot_data["shuffle_paintings"].get<bool>();
171 mastery_requirement = slot_data["mastery_achievements"].get<int>();
169 172
170 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) { 173 if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
171 painting_mapping.clear(); 174 painting_mapping.clear();
@@ -321,3 +324,5 @@ bool AP_IsPaintingShuffle() { return painting_shuffle; }
321const std::map<std::string, std::string> AP_GetPaintingMapping() { 324const std::map<std::string, std::string> AP_GetPaintingMapping() {
322 return painting_mapping; 325 return painting_mapping;
323} 326}
327
328int AP_GetMasteryRequirement() { return mastery_requirement; }