@@ -44,109 +44,236 @@ static const std::vector<MainTableColumn> COLUMN_SETUP {
4444 // Raids
4545 // {0, [] {return to_string_short(Killproof::li);}, []{ return GET_TEXTURE(LI, ID_LI); }, "1", true},
4646 // {1, [] {return to_string_short(Killproof::ld);}, []{ return GET_TEXTURE(LD, ID_LD); }, "1", true},
47- {2 , [] {return to_string_short (Killproof::liLd);}, []{ return draw_texture (KillproofIcons::LI); }, " 1" , true },
47+ {Killproof::liLd , [] {return to_string_short (Killproof::liLd);}, []{ return draw_texture (KillproofIcons::LI); }, " 1" , true },
4848
4949 // fractals
50- {3 , [] {return to_string_short (Killproof::uce);}, []{ return draw_texture (KillproofIcons::UFE); }, " 2" , true },
51- {4 , [] {return to_string_short (Killproof::ufe);}, []{ return draw_texture (KillproofIcons::UFE); }, " 2" , true },
50+ {Killproof::uce , [] {return to_string_short (Killproof::uce);}, []{ return draw_texture (KillproofIcons::UFE); }, " 2" , true },
51+ {Killproof::ufe , [] {return to_string_short (Killproof::ufe);}, []{ return draw_texture (KillproofIcons::UFE); }, " 2" , true },
5252
5353 // W1
54- {5 , [] {return to_string_short (Killproof::vg);}, []{ return draw_texture (KillproofIcons::VG); }, " 1.1" , [] {return to_string_long (Killproof::vg);}, false },
55- {6 , [] {return to_string_short (Killproof::gorse);}, []{ return draw_texture (KillproofIcons::Gorse); }, " 1.1" , [] {return to_string_long (Killproof::gorse);}, false },
56- {7 , [] {return to_string_short (Killproof::sabetha);}, []{ return draw_texture (KillproofIcons::Sabetha); }, " 1.1" , [] {return to_string_long (Killproof::sabetha);}, false },
54+ {Killproof::vg , [] {return to_string_short (Killproof::vg);}, []{ return draw_texture (KillproofIcons::VG); }, " 1.1" , [] {return to_string_long (Killproof::vg);}, false },
55+ {Killproof::gorse , [] {return to_string_short (Killproof::gorse);}, []{ return draw_texture (KillproofIcons::Gorse); }, " 1.1" , [] {return to_string_long (Killproof::gorse);}, false },
56+ {Killproof::sabetha , [] {return to_string_short (Killproof::sabetha);}, []{ return draw_texture (KillproofIcons::Sabetha); }, " 1.1" , [] {return to_string_long (Killproof::sabetha);}, false },
5757
5858 // W2
59- {8 , [] {return to_string_short (Killproof::sloth);}, []{ return draw_texture (KillproofIcons::Sloth); }, " 1.2" , false },
60- {9 , [] {return to_string_short (Killproof::matthias);}, []{ return draw_texture (KillproofIcons::Matt); }, " 1.2" , [] {return to_string_long (Killproof::matthias);}, false },
59+ {Killproof::sloth , [] {return to_string_short (Killproof::sloth);}, []{ return draw_texture (KillproofIcons::Sloth); }, " 1.2" , false },
60+ {Killproof::matthias , [] {return to_string_short (Killproof::matthias);}, []{ return draw_texture (KillproofIcons::Matt); }, " 1.2" , [] {return to_string_long (Killproof::matthias);}, false },
6161
6262 // W3
63- {10 , [] {return to_string_short (Killproof::escort);}, []{ return draw_texture (KillproofIcons::Escort); }, " 1.3" , false },
64- {11 , [] {return to_string_short (Killproof::kc);}, []{ return draw_texture (KillproofIcons::KC); }, " 1.3" , [] {return to_string_long (Killproof::kc);}, false },
65- {12 , [] {return to_string_short (Killproof::xera);}, []{ return draw_texture (KillproofIcons::Xera); }, " 1.3" , false },
63+ {Killproof::escort , [] {return to_string_short (Killproof::escort);}, []{ return draw_texture (KillproofIcons::Escort); }, " 1.3" , false },
64+ {Killproof::kc , [] {return to_string_short (Killproof::kc);}, []{ return draw_texture (KillproofIcons::KC); }, " 1.3" , [] {return to_string_long (Killproof::kc);}, false },
65+ {Killproof::xera , [] {return to_string_short (Killproof::xera);}, []{ return draw_texture (KillproofIcons::Xera); }, " 1.3" , false },
6666
6767 // W4
68- {13 , [] {return to_string_short (Killproof::cairn);}, []{ return draw_texture (KillproofIcons::Cairn); }, " 1.4" , [] {return to_string_long (Killproof::cairn);}, false },
69- {14 , [] {return to_string_short (Killproof::mo);}, []{ return draw_texture (KillproofIcons::MO); }, " 1.4" , [] {return to_string_long (Killproof::mo);}, false },
70- {15 , [] {return to_string_short (Killproof::samarog);}, []{ return draw_texture (KillproofIcons::Samarog); }, " 1.4" , false },
71- {16 , [] {return to_string_short (Killproof::deimos);}, []{ return draw_texture (KillproofIcons::Deimos); }, " 1.4" , false },
68+ {Killproof::cairn , [] {return to_string_short (Killproof::cairn);}, []{ return draw_texture (KillproofIcons::Cairn); }, " 1.4" , [] {return to_string_long (Killproof::cairn);}, false },
69+ {Killproof::mo , [] {return to_string_short (Killproof::mo);}, []{ return draw_texture (KillproofIcons::MO); }, " 1.4" , [] {return to_string_long (Killproof::mo);}, false },
70+ {Killproof::samarog , [] {return to_string_short (Killproof::samarog);}, []{ return draw_texture (KillproofIcons::Samarog); }, " 1.4" , false },
71+ {Killproof::deimos , [] {return to_string_short (Killproof::deimos);}, []{ return draw_texture (KillproofIcons::Deimos); }, " 1.4" , false },
7272
7373 // W5
74- {17 , [] {return to_string_short (Killproof::desmina);}, []{ return draw_texture (KillproofIcons::Desmina); }, " 1.5" , [] {return to_string_long (Killproof::desmina);}, false },
75- {18 , [] {return to_string_short (Killproof::river);}, []{ return draw_texture (KillproofIcons::River); }, " 1.5" , [] {return to_string_long (Killproof::river);}, false },
76- {19 , [] {return to_string_short (Killproof::statues);}, []{ return draw_texture (KillproofIcons::Statues); }, " 1.5" , false },
77- {20 , [] {return to_string_short (Killproof::dhuum);}, []{ return draw_texture (KillproofIcons::Dhuum); }, " 1.5" , true },
74+ {Killproof::desmina , [] {return to_string_short (Killproof::desmina);}, []{ return draw_texture (KillproofIcons::Desmina); }, " 1.5" , [] {return to_string_long (Killproof::desmina);}, false },
75+ {Killproof::river , [] {return to_string_short (Killproof::river);}, []{ return draw_texture (KillproofIcons::River); }, " 1.5" , [] {return to_string_long (Killproof::river);}, false },
76+ {Killproof::statues , [] {return to_string_short (Killproof::statues);}, []{ return draw_texture (KillproofIcons::Statues); }, " 1.5" , false },
77+ {Killproof::dhuum , [] {return to_string_short (Killproof::dhuum);}, []{ return draw_texture (KillproofIcons::Dhuum); }, " 1.5" , true },
7878
7979 // W6
80- {21 , [] {return to_string_short (Killproof::ca);}, []{ return draw_texture (KillproofIcons::CA); }, " 1.6" , [] {return to_string_long (Killproof::ca);}, false },
81- {22 , [] {return to_string_short (Killproof::twins);}, []{ return draw_texture (KillproofIcons::Twins); }, " 1.6" , [] {return to_string_long (Killproof::twins);}, false },
82- {23 , [] {return to_string_short (Killproof::qadim);}, []{ return draw_texture (KillproofIcons::Qadim1); }, " 1.6" , true },
80+ {Killproof::ca , [] {return to_string_short (Killproof::ca);}, []{ return draw_texture (KillproofIcons::CA); }, " 1.6" , [] {return to_string_long (Killproof::ca);}, false },
81+ {Killproof::twins , [] {return to_string_short (Killproof::twins);}, []{ return draw_texture (KillproofIcons::Twins); }, " 1.6" , [] {return to_string_long (Killproof::twins);}, false },
82+ {Killproof::qadim , [] {return to_string_short (Killproof::qadim);}, []{ return draw_texture (KillproofIcons::Qadim1); }, " 1.6" , true },
8383
8484 // W7
85- {24 , [] {return to_string_short (Killproof::sabir);}, []{ return draw_texture (KillproofIcons::Sabir); }, " 1.7" , false },
86- {25 , [] {return to_string_short (Killproof::adina);}, []{ return draw_texture (KillproofIcons::Adina); }, " 1.7" , false },
87- {26 , [] {return to_string_short (Killproof::qadim2);}, []{ return draw_texture (KillproofIcons::Qadim2); }, " 1.7" , [] {return to_string_long (Killproof::qadim2);}, true },
85+ {Killproof::sabir , [] {return to_string_short (Killproof::sabir);}, []{ return draw_texture (KillproofIcons::Sabir); }, " 1.7" , false },
86+ {Killproof::adina , [] {return to_string_short (Killproof::adina);}, []{ return draw_texture (KillproofIcons::Adina); }, " 1.7" , false },
87+ {Killproof::qadim2 , [] {return to_string_short (Killproof::qadim2);}, []{ return draw_texture (KillproofIcons::Qadim2); }, " 1.7" , [] {return to_string_long (Killproof::qadim2);}, true },
8888
8989 // W8
90- {static_cast <ImU32>( Killproof::greer) , []{ return to_string_short (Killproof::greer); }, []{ return draw_texture (KillproofIcons::Greer); }, " 1.8" , [] {return to_string_long (Killproof::greer);}, false },
91- {static_cast <ImU32>( Killproof::decima) , []{ return to_string_short (Killproof::decima); }, []{ return draw_texture (KillproofIcons::Decima); }, " 1.8" , [] {return to_string_long (Killproof::decima);}, false },
92- {static_cast <ImU32>( Killproof::ura) , []{ return to_string_short (Killproof::ura); }, []{ return draw_texture (KillproofIcons::Ura); }, " 1.8" , true },
90+ {Killproof::greer, []{ return to_string_short (Killproof::greer); }, []{ return draw_texture (KillproofIcons::Greer); }, " 1.8" , [] {return to_string_long (Killproof::greer);}, false },
91+ {Killproof::decima, []{ return to_string_short (Killproof::decima); }, []{ return draw_texture (KillproofIcons::Decima); }, " 1.8" , [] {return to_string_long (Killproof::decima);}, false },
92+ {Killproof::ura, []{ return to_string_short (Killproof::ura); }, []{ return draw_texture (KillproofIcons::Ura); }, " 1.8" , true },
9393
94- {static_cast <ImU32>( Killproof::greerCM) , []{ return to_string_short (Killproof::greerCM); }, []{ return draw_texture (KillproofIcons::Greer); }, " 1.8" , [] {return to_string_long (Killproof::greerCM);}, false },
95- {static_cast <ImU32>( Killproof::decimaCM) , []{ return to_string_short (Killproof::decimaCM); }, []{ return draw_texture (KillproofIcons::Decima); }, " 1.8" , [] {return to_string_long (Killproof::decimaCM);}, false },
96- {static_cast <ImU32>( Killproof::uraCM) , []{ return to_string_short (Killproof::uraCM); }, []{ return draw_texture (KillproofIcons::Ura); }, " 1.8" , true },
94+ {Killproof::greerCM, []{ return to_string_short (Killproof::greerCM); }, []{ return draw_texture (KillproofIcons::Greer); }, " 1.8" , [] {return to_string_long (Killproof::greerCM);}, false },
95+ {Killproof::decimaCM, []{ return to_string_short (Killproof::decimaCM); }, []{ return draw_texture (KillproofIcons::Decima); }, " 1.8" , [] {return to_string_long (Killproof::decimaCM);}, false },
96+ {Killproof::uraCM, []{ return to_string_short (Killproof::uraCM); }, []{ return draw_texture (KillproofIcons::Ura); }, " 1.8" , true },
9797
9898 // Strikes
99- {27 , [] {return to_string_short (Killproof::boneskinnerVial);}, []{ return draw_texture (KillproofIcons::Boneskinner_Vial); }, " 3" , [] {return to_string_long (Killproof::boneskinnerVial);}, true },
99+ {Killproof::boneskinnerVial , [] {return to_string_short (Killproof::boneskinnerVial);}, []{ return draw_texture (KillproofIcons::Boneskinner_Vial); }, " 3" , [] {return to_string_long (Killproof::boneskinnerVial);}, true },
100100
101101 // EOD strikes
102- {35 , [] {return to_string_short (Killproof::maiTrin);}, []{ return draw_texture (KillproofIcons::Mai_Trin); }, " 3" , [] {return to_string_long (Killproof::maiTrin);}, false },
103- {33 , [] {return to_string_short (Killproof::ankka);}, []{ return draw_texture (KillproofIcons::Ankka); }, " 3" , [] {return to_string_long (Killproof::ankka);}, false },
104- {37 , [] {return to_string_short (Killproof::ministerLi);}, []{ return draw_texture (KillproofIcons::Minister_Li); }, " 3" , [] {return to_string_long (Killproof::ministerLi);}, false },
105- {34 , [] {return to_string_short (Killproof::harvest);}, []{ return draw_texture (KillproofIcons::Harvest); }, " 3" , [] {return to_string_long (Killproof::harvest);}, false },
106- {36 , [] {return to_string_short (Killproof::maiTrinCM);}, []{ return draw_texture (KillproofIcons::Mai_Trin); }, " 3" , [] {return to_string_long (Killproof::maiTrinCM);}, false },
107- {38 , [] {return to_string_short (Killproof::ankkaCM);}, []{ return draw_texture (KillproofIcons::Ankka); }, " 3" , [] {return to_string_long (Killproof::ankkaCM);}, false },
108- {39 , [] {return to_string_short (Killproof::ministerLiCM);}, []{ return draw_texture (KillproofIcons::Minister_Li); }, " 3" , [] {return to_string_long (Killproof::ministerLiCM);}, false },
109- {40 , [] {return to_string_short (Killproof::harvestCM);}, []{ return draw_texture (KillproofIcons::Harvest); }, " 3" , [] {return to_string_long (Killproof::harvestCM);}, false },
110- {42 , [] {return to_string_short (Killproof::olc);}, []{ return draw_texture (KillproofIcons::OLC); }, " 3" , [] {return to_string_long (Killproof::olc);}, false },
111- {43 , [] {return to_string_short (Killproof::olcCM);}, []{ return draw_texture (KillproofIcons::OLC); }, " 3" , [] {return to_string_long (Killproof::olcCM);}, false },
112- {44 , [] {return to_string_short (Killproof::co);}, []{ return draw_texture (KillproofIcons::Dagda); }, " 3" , [] {return to_string_long (Killproof::co);}, false },
113- {45 , [] {return to_string_short (Killproof::coCM);}, []{ return draw_texture (KillproofIcons::Dagda); }, " 3" , [] {return to_string_long (Killproof::coCM);}, false },
114- {46 , [] {return to_string_short (Killproof::febe);}, []{ return draw_texture (KillproofIcons::Cerus); }, " 3" , [] {return to_string_long (Killproof::febe);}, false },
115- {47 , [] {return to_string_short (Killproof::febeCM);}, []{ return draw_texture (KillproofIcons::Cerus); }, " 3" , [] {return to_string_long (Killproof::febeCM);}, false },
116-
117- {41 , [] {return to_string_short (Killproof::bananas);}, []{ return draw_texture (KillproofIcons::Bananas); }, " 4" , [] {return to_string_long (Killproof::bananas);}, false },
102+ {Killproof::maiTrin , [] {return to_string_short (Killproof::maiTrin);}, []{ return draw_texture (KillproofIcons::Mai_Trin); }, " 3" , [] {return to_string_long (Killproof::maiTrin);}, false },
103+ {Killproof::ankka , [] {return to_string_short (Killproof::ankka);}, []{ return draw_texture (KillproofIcons::Ankka); }, " 3" , [] {return to_string_long (Killproof::ankka);}, false },
104+ {Killproof::ministerLi , [] {return to_string_short (Killproof::ministerLi);}, []{ return draw_texture (KillproofIcons::Minister_Li); }, " 3" , [] {return to_string_long (Killproof::ministerLi);}, false },
105+ {Killproof::harvest , [] {return to_string_short (Killproof::harvest);}, []{ return draw_texture (KillproofIcons::Harvest); }, " 3" , [] {return to_string_long (Killproof::harvest);}, false },
106+ {Killproof::maiTrinCM , [] {return to_string_short (Killproof::maiTrinCM);}, []{ return draw_texture (KillproofIcons::Mai_Trin); }, " 3" , [] {return to_string_long (Killproof::maiTrinCM);}, false },
107+ {Killproof::ankkaCM , [] {return to_string_short (Killproof::ankkaCM);}, []{ return draw_texture (KillproofIcons::Ankka); }, " 3" , [] {return to_string_long (Killproof::ankkaCM);}, false },
108+ {Killproof::ministerLiCM , [] {return to_string_short (Killproof::ministerLiCM);}, []{ return draw_texture (KillproofIcons::Minister_Li); }, " 3" , [] {return to_string_long (Killproof::ministerLiCM);}, false },
109+ {Killproof::harvestCM , [] {return to_string_short (Killproof::harvestCM);}, []{ return draw_texture (KillproofIcons::Harvest); }, " 3" , [] {return to_string_long (Killproof::harvestCM);}, false },
110+ {Killproof::olc , [] {return to_string_short (Killproof::olc);}, []{ return draw_texture (KillproofIcons::OLC); }, " 3" , [] {return to_string_long (Killproof::olc);}, false },
111+ {Killproof::olcCM , [] {return to_string_short (Killproof::olcCM);}, []{ return draw_texture (KillproofIcons::OLC); }, " 3" , [] {return to_string_long (Killproof::olcCM);}, false },
112+ {Killproof::co , [] {return to_string_short (Killproof::co);}, []{ return draw_texture (KillproofIcons::Dagda); }, " 3" , [] {return to_string_long (Killproof::co);}, false },
113+ {Killproof::coCM , [] {return to_string_short (Killproof::coCM);}, []{ return draw_texture (KillproofIcons::Dagda); }, " 3" , [] {return to_string_long (Killproof::coCM);}, false },
114+ {Killproof::febe , [] {return to_string_short (Killproof::febe);}, []{ return draw_texture (KillproofIcons::Cerus); }, " 3" , [] {return to_string_long (Killproof::febe);}, false },
115+ {Killproof::febeCM , [] {return to_string_short (Killproof::febeCM);}, []{ return draw_texture (KillproofIcons::Cerus); }, " 3" , [] {return to_string_long (Killproof::febeCM);}, false },
116+
117+ {Killproof::bananas , [] {return to_string_short (Killproof::bananas);}, []{ return draw_texture (KillproofIcons::Bananas); }, " 4" , [] {return to_string_long (Killproof::bananas);}, false },
118118};
119119
120+ constexpr const std::vector<size_t > Convert (const std::vector<Killproof> pVector)
121+ {
122+ std::vector<size_t > res;
123+ for (auto killproof : pVector)
124+ {
125+ res.push_back (std::to_underlying (killproof));
126+ }
127+ return res;
128+ }
129+
120130// Key is the mapId found in the mumbleLink
121131// Value is a vector of columns that should be shown for that map. The Values are the UserIds from the ColumnSetup.
122132// TODO: update this when the above vector changes!
123133static const std::unordered_map<uint32_t , std::vector<size_t >> mapIdToColumnSetup = {
124- {1155 , {2 , 7 , 9 , 12 , 16 , 20 , 23 , 26 , 41 }}, // Aerodrome
125- {1062 , {2 , 5 , 6 , 7 }}, // W1
126- {1149 , {2 , 8 , 9 }}, // W2
127- {1156 , {2 , 10 , 11 , 12 }}, // W3
128- {1188 , {2 , 13 , 14 , 15 , 16 }}, // W4
129- {1264 , {2 , 17 , 18 , 19 , 20 }}, // W5
130- {1303 , {2 , 21 , 22 , 23 }}, // W6
131- {1323 , {2 , 24 , 25 , 26 }}, // W7
132- {1564 , {
133- std::to_underlying (Killproof::greer),
134- std::to_underlying (Killproof::decima),
135- std::to_underlying (Killproof::ura),
136- std::to_underlying (Killproof::greerCM),
137- std::to_underlying (Killproof::decimaCM),
138- std::to_underlying (Killproof::uraCM)
139- }}, // W8
140- {1370 , {2 , 27 }}, // Eye of the north
141- {1432 , {2 , 35 , 36 }}, // MaiTrin strike
142- {1450 , {2 , 33 , 38 }}, // Ankka strike
143- {1451 , {2 , 37 , 39 }}, // MinisterLi strike
144- {1437 , {2 , 34 , 40 }}, // HarvestTemple strike
145- {1485 , {2 , 42 , 43 }}, // OLC Strike
146- {1428 , {2 , 33 , 34 , 35 , 36 , 37 , 38 , 39 , 40 , 42 , 43 }}, // Arborstone
147- {1509 , {2 , 44 , 45 , 46 , 47 }}, // Wizard's Tower
148- {1515 , {2 , 44 , 45 }}, // Cosmic Observatory
149- {1520 , {2 , 46 , 47 }}, // Temple of Febe
134+ // Aerodrome
135+ {1155 , Convert ({
136+ Killproof::liLd,
137+ Killproof::sabetha,
138+ Killproof::matthias,
139+ Killproof::xera,
140+ Killproof::deimos,
141+ Killproof::dhuum,
142+ Killproof::qadim,
143+ Killproof::qadim2,
144+ Killproof::ura,
145+ Killproof::uraCM,
146+ Killproof::bananas
147+ })},
148+ // W1
149+ {1062 , Convert ({
150+ Killproof::liLd,
151+ Killproof::vg,
152+ Killproof::gorse,
153+ Killproof::sabetha
154+ })},
155+ // W2
156+ {1149 , Convert ({
157+ Killproof::liLd,
158+ Killproof::sloth,
159+ Killproof::matthias
160+ })},
161+ // W3
162+ {1156 , Convert ({
163+ Killproof::liLd,
164+ Killproof::escort,
165+ Killproof::kc,
166+ Killproof::xera
167+ })},
168+ // W4
169+ {1188 , Convert ({
170+ Killproof::liLd,
171+ Killproof::cairn,
172+ Killproof::mo,
173+ Killproof::samarog,
174+ Killproof::deimos
175+ })},
176+ // W5
177+ {1264 , Convert ({
178+ Killproof::liLd,
179+ Killproof::desmina,
180+ Killproof::river,
181+ Killproof::statues,
182+ Killproof::dhuum
183+ })},
184+ // W6
185+ {1303 , Convert ({
186+ Killproof::liLd,
187+ Killproof::ca,
188+ Killproof::twins,
189+ Killproof::qadim
190+ })},
191+ // W7
192+ {1323 , Convert ({
193+ Killproof::liLd,
194+ Killproof::sabir,
195+ Killproof::adina,
196+ Killproof::qadim2
197+ })},
198+ // W8
199+ {1564 , Convert ({
200+ Killproof::liLd,
201+ Killproof::greer,
202+ Killproof::decima,
203+ Killproof::ura,
204+ Killproof::greerCM,
205+ Killproof::decimaCM,
206+ Killproof::uraCM
207+ })},
208+ // Eye of the north
209+ {1370 , Convert ({
210+ Killproof::liLd,
211+ Killproof::boneskinnerVial
212+ })},
213+ // MaiTrin strike
214+ {1432 , Convert ({
215+ Killproof::liLd,
216+ Killproof::maiTrin,
217+ Killproof::maiTrinCM
218+ })},
219+ // Ankka strike
220+ {1450 , Convert ({
221+ Killproof::liLd,
222+ Killproof::ankka,
223+ Killproof::ankkaCM
224+ })},
225+ // MinisterLi strike
226+ {1451 , Convert ({
227+ Killproof::liLd,
228+ Killproof::ministerLi,
229+ Killproof::ministerLiCM
230+ })},
231+ // HarvestTemple strike
232+ {1437 , Convert ({
233+ Killproof::liLd,
234+ Killproof::harvest,
235+ Killproof::harvestCM
236+ })},
237+ // OLC Strike
238+ {1485 , Convert ({
239+ Killproof::liLd,
240+ Killproof::olc,
241+ Killproof::olcCM
242+ })},
243+ // Arborstone
244+ {1428 , Convert ({
245+ Killproof::liLd,
246+ Killproof::maiTrin,
247+ Killproof::ankka,
248+ Killproof::ministerLi,
249+ Killproof::harvest,
250+ Killproof::olc,
251+ Killproof::maiTrinCM,
252+ Killproof::ankkaCM,
253+ Killproof::ministerLiCM,
254+ Killproof::harvestCM,
255+ Killproof::olcCM
256+ })},
257+ // Wizard's Tower
258+ {1509 , Convert ({
259+ Killproof::liLd,
260+ Killproof::co,
261+ Killproof::febe,
262+ Killproof::coCM,
263+ Killproof::febeCM
264+ })},
265+ // Cosmic Observatory
266+ {1515 , Convert ({
267+ Killproof::liLd,
268+ Killproof::co,
269+ Killproof::coCM
270+ })},
271+ // Temple of Febe
272+ {1520 , Convert ({
273+ Killproof::liLd,
274+ Killproof::febe,
275+ Killproof::febeCM
276+ })},
150277};
151278
152279class KillproofUITable : public MainTable <> {
0 commit comments