Skip to content

Commit

Permalink
Merge pull request #24 from Angles24/main
Browse files Browse the repository at this point in the history 
Update for DoH Dawntrail Collectables
  • Loading branch information
@nt153133
nt153133 authored Jul 7, 2024
2 parents e6abbb9 + cda3a54 commit e93a923
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Helpers/InclusionShopConstants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static class InclusionShopConstants
5707, 5712, 2544, 2928, 3237, 3714, 3489, 3935, 2570, 2929, 3238, 3715, 3490, 3936, 2930, 3239,
3716, 3491, 3937, 33935, 33936, 33937, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192,
25193, 18022, 18023, 18024, 5688, 5693, 5698, 26732, 26733, 26734, 25191, 25192, 25193, 18022,
18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697
18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697, 41767
}
},

Expand Down Expand Up @@ -149,7 +149,7 @@ public static class InclusionShopConstants
15945, 12238, 12239, 12240, 12698, 12699, 12700, 12701, 12702, 12703, 17838, 17839, 17840, 17841,
17842, 17843, 33935, 33936, 33937, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192, 25193,
18022, 18023, 18024, 5688, 5693, 5698, 26732, 26733, 26734, 25191, 25192, 25193, 18022, 18023,
18024, 5688, 5693, 5698, 5687, 5692, 5697
18024, 5688, 5693, 5698, 5687, 5692, 5697, 41767
}
},

Expand Down Expand Up @@ -235,7 +235,7 @@ public static class InclusionShopConstants
12238, 12239, 12240, 12698, 12699, 12700, 12701, 12702, 12703, 17838, 17839, 17840, 17841, 17842,
17843, 33935, 33936, 33937, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192, 25193, 18022,
18023, 18024, 5688, 5693, 5698, 26732, 26733, 26734, 25191, 25192, 25193, 18022, 18023, 18024, 5688,
5693, 5698, 5687, 5692, 5697
5693, 5698, 5687, 5692, 5697, 41767
}
},

Expand Down Expand Up @@ -329,7 +329,7 @@ public static class InclusionShopConstants
27815, 27811, 27812, 12238, 12239, 12240, 12698, 12699, 12700, 12701, 12702, 12703, 17838, 17839,
17840, 17841, 17842, 17843, 26808, 26809, 26810, 33935, 33936, 33937, 33922, 33923, 33924, 26732,
26733, 26734, 25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 26732, 26733, 26734,
25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697
25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697, 41767
}
},

Expand All @@ -348,7 +348,7 @@ public static class InclusionShopConstants
5707, 5712, 33938, 33939, 33940, 11986, 11991, 11996, 12004, 12009, 15662, 15881, 15705, 15706, 15707, 15708, 15709, 15663, 15882, 15710, 15711, 15712, 15713, 15714, 15664, 15715, 15716, 15717, 15718, 15719, 15889, 15890, 15891, 15892, 21216, 23197, 21259, 21260, 21261, 21262, 21263, 21217, 23198, 21264, 21265, 21266, 21267, 21268, 21218, 21269, 21270, 21271, 21272, 21273, 23084, 23085, 23086, 23092, 23093, 23094, 23095, 23096, 23205, 23206, 23207, 23208,
25330, 25373, 25374, 25375, 25376, 25377, 25331, 25378, 25379, 25380, 25381, 25382, 25332, 25383, 25384, 25385, 25386, 25387, 29599, 29956, 29600, 29957, 29601, 29607, 29608, 29609, 29610, 29611, 31780, 31791, 31781, 31792, 31782, 31798, 31799, 31800, 31801, 31802, 31809, 31810, 31811, 31812, 35476, 35519, 35520, 35521, 35522, 35523, 35477, 35524, 35525, 35526, 35527, 35528, 35478, 35529, 35530, 35531, 35532, 35533, 37711, 37722, 37712, 37723, 37713,
37729, 37730, 37731, 37732, 37733, 39833, 39844, 39834, 39845, 39835, 39851, 39852, 39853, 39854, 39855, 39860, 39861, 39862, 39863, 12669, 26553, 12668, 21925, 33849, 21282, 25063, 25064, 25065, 24516, 24517, 24519, 23898, 27316, 27317, 27298, 28931, 28932, 28933, 28934, 32220, 40648, 12710, 12709, 12708, 17594, 17570, 17571, 13734, 13739, 13750, 13753, 13733, 13736, 13737, 13738, 13740, 13752, 13744, 13745, 20616, 20618, 20619, 12711, 12712, 12841,
27588, 27586, 27587, 20676, 20675, 20015, 20016, 20017, 20014, 20013, 20260, 36596, 36590, 27590, 27589, 30590, 27813, 27814, 27815, 27811, 27812, 27985, 36595, 36610, 36593, 36591, 36597, 38936, 36223, 36224, 36225, 36226, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697, 33935, 33936, 33937
27588, 27586, 27587, 20676, 20675, 20015, 20016, 20017, 20014, 20013, 20260, 36596, 36590, 27590, 27589, 30590, 27813, 27814, 27815, 27811, 27812, 27985, 36595, 36610, 36593, 36591, 36597, 38936, 36223, 36224, 36225, 36226, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697, 33935, 33936, 33937, 41767
}
},

Expand All @@ -367,7 +367,7 @@ public static class InclusionShopConstants
5707, 5712, 33938, 33939, 33940, 11986, 11991, 11996, 12004, 12009, 15662, 15881, 15705, 15706, 15707, 15708, 15709, 15663, 15882, 15710, 15711, 15712, 15713, 15714, 15664, 15715, 15716, 15717, 15718, 15719, 15889, 15890, 15891, 15892, 21216, 23197, 21259, 21260, 21261, 21262, 21263, 21217, 23198, 21264, 21265, 21266, 21267, 21268, 21218, 21269, 21270, 21271, 21272, 21273, 23084, 23085, 23086, 23092, 23093, 23094, 23095, 23096, 23205, 23206, 23207, 23208,
25330, 25373, 25374, 25375, 25376, 25377, 25331, 25378, 25379, 25380, 25381, 25382, 25332, 25383, 25384, 25385, 25386, 25387, 29599, 29956, 29600, 29957, 29601, 29607, 29608, 29609, 29610, 29611, 31780, 31791, 31781, 31792, 31782, 31798, 31799, 31800, 31801, 31802, 31809, 31810, 31811, 31812, 35476, 35519, 35520, 35521, 35522, 35523, 35477, 35524, 35525, 35526, 35527, 35528, 35478, 35529, 35530, 35531, 35532, 35533, 37711, 37722, 37712, 37723, 37713,
37729, 37730, 37731, 37732, 37733, 39833, 39844, 39834, 39845, 39835, 39851, 39852, 39853, 39854, 39855, 39860, 39861, 39862, 39863, 12669, 26553, 12668, 21925, 33849, 21282, 25063, 25064, 25065, 24516, 24517, 24519, 23898, 27316, 27317, 27298, 28931, 28932, 28933, 28934, 32220, 40648, 12710, 12709, 12708, 17594, 17570, 17571, 13734, 13739, 13750, 13753, 13733, 13736, 13737, 13738, 13740, 13752, 13744, 13745, 20616, 20618, 20619, 12711, 12712, 12841,
27588, 27586, 27587, 20676, 20675, 20015, 20016, 20017, 20014, 20013, 20260, 36596, 36590, 27590, 27589, 30590, 27813, 27814, 27815, 27811, 27812, 27985, 36595, 36610, 36593, 36591, 36597, 38936, 36223, 36224, 36225, 36226, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697, 33935, 33936, 33937
27588, 27586, 27587, 20676, 20675, 20015, 20016, 20017, 20014, 20013, 20260, 36596, 36590, 27590, 27589, 30590, 27813, 27814, 27815, 27811, 27812, 27985, 36595, 36610, 36593, 36591, 36597, 38936, 36223, 36224, 36225, 36226, 33922, 33923, 33924, 26732, 26733, 26734, 25191, 25192, 25193, 18022, 18023, 18024, 5688, 5693, 5698, 5687, 5692, 5697, 33935, 33936, 33937, 41767
}
},

Expand Down
2 changes: 1 addition & 1 deletion LastCommit.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-07-06T11:37:37-04:00
2024-07-07T23:12:54+10:00
8 changes: 6 additions & 2 deletions ScriptConditions/Helpers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@ public static class Helpers
32903, 32904, 32905, 32906, 32907
};

private static readonly uint[] IdList3 = { 35626, 35627, 35628, 35629, 35630, 35631, 35632, 35633, 35634, 35635, 35636, 35637, 35638, 35639, 35640, 35641, 35642, 35643, 35644, 35645, 35646, 35647, 35648, 35649, 35650, 35651, 35652, 35653, 35654, 35655, 35656, 35657, 35658, 35659, 35660, 35661, 35662, 35663, 35664, 35665 };

private static readonly uint[] IdList3 =
{
35626, 35627, 35628, 35629, 35630, 35631, 35632, 35633, 35634, 35635, 35636, 35637, 35638, 35639, 35640, 35641, 35642, 35643, 35644, 35645, 35646, 35647, 35648, 35649, 35650, 35651, 35652, 35653, 35654, 35655, 35656, 35657, 35658, 35659, 35660, 35661, 35662, 35663, 35664, 35665,
44185, 44186, 44187, 44188, 44189, 44190, 44191, 44192, 44193, 44194, 44195, 44196, 44197, 44198, 44199, 44200, 44201, 44202, 44203, 44204, 44205, 44206, 44207, 44208, 44209, 44210, 44211, 44212, 44213, 44214, 44215, 44216, 44217, 44218, 44219, 44220, 44221, 44222, 44223, 44224, 44225, 44226, 44227, 44228, 44229, 44230, 44231, 44232
};

private static bool hasLisbeth = false;
private static bool checkedLisbeth = false;

Expand Down

0 comments on commit e93a923

Please sign in to comment.