diff --git a/src/router/databases/csv-en/lottery.csv b/src/router/databases/csv-en/lottery.csv
index 06b450e..1ef7c6d 100644
--- a/src/router/databases/csv-en/lottery.csv
+++ b/src/router/databases/csv-en/lottery.csv
@@ -142,6 +142,7 @@
4110042,School Idol Festival 2 Super Thanks Scouting: Liella!,4110042,4110042,1,1,3403017,4110042,4110042,4110042,,0,0,0,0,15540034,1,1,0,224030109
4110043,Special Scouting,4110043,4110043,1,1,2403167,4110043,4110043,4110043,,0,0,0,0,15540035,1,1,0,224031602
4110044,School Idols Thanksgiving Festival Gather Everyone Scouting,4110044,4110044,1,1,2403207,4110044,4110044,4110044,,0,0,0,0,0,1,1,0,224032003
+5110001,All Members Step-Up Scout,5110001,5110001,1,2,2404010,511000101,511000101,5110001,,0,0,0,1,0,1,1,0,1
7110002,SIF Data Link Bonus Ticket Scout,7110002,7110002,1,1,15,7110002,7110002,7110002,,0,0,1,0,15540001,1,1,0,223043003
7110003,SIFAS Data Link Bonus Ticket Scout,7110003,7110003,1,1,15,7110003,7110003,7110003,,0,0,1,0,15540001,1,1,0,223071202
7110101,Global Launch SP Scouting ~Set 1~,7110101,7110101,1,1,15,7110101,7110101,7110101,,0,0,0,0,15570001,1,1,0,924020101
diff --git a/src/router/databases/csv-en/lottery_caution.csv b/src/router/databases/csv-en/lottery_caution.csv
index ccbbe23..53db184 100644
--- a/src/router/databases/csv-en/lottery_caution.csv
+++ b/src/router/databases/csv-en/lottery_caution.csv
@@ -192,6 +192,7 @@ For example, it is not a system in which members with a provision ratio of 1% wi
R member: 20 pieces
SR member: 50 pieces
UR member: 500 pieces
",224032003
+5110001,"- Please check the ""Appearance Rates"" tab for the members that can appear.
- Appearance rates and the Loveca cost differ for each STEP of the All Members Step-Up Scout.
- The STEP advances by one each time you Scout, and returns to STEP 1 after STEP 5.
- Appearance rates are rounded to the fifth decimal place.
- Even if the app is force-closed or the connection is lost so the Scout results screen does not display properly, the Scout is still processed correctly. Please check your member list and Penlight count.
- When a member you have already recruited would join again on the second time or later, you instead receive Penlights according to their rarity.
R Member: 20
SR Member: 50
UR Member: 500",1
7110002,"- Check Scout details for more information on member availability.
- There is a possibility of Scouting the same member multiple times in the SIF Data Link Bonus Ticket Scout.
- Scout rates are rounded to the fifth decimal place.
As such, the sum of each individual member's Scout rate may not equal the total Scout rate.
- Similarly, due to the way Scout rates are displayed, the total Scout rate may not add up to 100%.
- The Scout rate for members in the SIF Data Link Bonus Ticket Scout applies to every single Scouting instance.
Therefore, for example, Scouting 100 times will not necessarily guarantee Scouting a member with a 1% Scout rate.
- For more information on Scouting rates, please check the Scout rate tab.
- Once a SIF Data Link Bonus Ticket Scout has been performed, even if the Scouting results are not displayed due to the user's device being forcibly shut down or getting disconnected from the server, it will be processed correctly. Please check your member list and amount of Light Sticks.
- Members from this Scout may be available to Scout again in the future.
- This Scouting event may also be made available again in the future.
- The availability period and contents of this Scout may change without any advance notice.
- Press the ""Use Tickets"" button in the lower right of the screen to Scout using Scout Tickets.
Scout Tickets that do not show up in the tickets menu cannot be used for this Scout.
- When members that have already been recruited are Scouted again, you will receive Light Sticks in exchange for the duplicate members. The number of Light Sticks will depend on the member's rarity.
R member: 20
SR member: 50
UR member: 500
- Scout points you obtain will be automatically converted into 1 Skill Notebook (M) once the Scouting period ends.",223043003
7110003,"- Check Scout details for more information on member availability.
- There is a possibility of Scouting the same member multiple times in the SIFAS Data Link Bonus Ticket Scout.
- Scout rates are rounded to the fifth decimal place.
As such, the sum of each individual member's Scout rate may not equal the total Scout rate.
- Similarly, due to the way Scout rates are displayed, the total Scout rate may not add up to 100%.
- The Scout rate for members in the SIFAS Data Link Bonus Ticket Scout applies to every single Scouting instance.
Therefore, for example, Scouting 100 times will not necessarily guarantee Scouting a member with a 1% Scout rate.
- For more information on Scouting rates, please check the Scout rate tab.
- Once a SIFAS Data Link Bonus Ticket Scout has been performed, even if the Scouting results are not displayed due to the user's device being forcibly shut down or getting disconnected from the server, it will be processed correctly. Please check your member list and amount of Light Sticks.
- Members from this Scout may be available to Scout again in the future.
- This Scouting event may also be made available again in the future.
- The availability period and contents of this Scout may change without any advance notice.
- Press the ""Use Tickets"" button in the lower right of the screen to Scout using Scout Tickets.
Scout Tickets that do not show up in the tickets menu cannot be used for this Scout.
- When members that have already been recruited are Scouted again, you will receive Light Sticks in exchange for the duplicate members. The number of Light Sticks will depend on the member's rarity.
R member: 20
SR member: 50
UR member: 500
- Scout points you obtain will be automatically converted into 1 Skill Notebook (M) once the Scouting period ends.",223071202
7110101,"- Check Scout details for more information on member availability.
- There is a possibility of Scouting the same member multiple times in the Global Launch SP Scouting ~Set 1~
- Scout rates are rounded to the fifth decimal place.
As such, the sum of each individual member's Scout rate may not equal the total Scout rate.
- Similarly, due to the way Scout rates are displayed, the total Scout rate may not add up to 100%.
- The Scout rate for members in the Global Launch SP Scouting ~Set 1~ applies to every single Scouting instance.
Therefore, for example, Scouting 100 times will not necessarily guarantee Scouting a member with a 1% Scout rate.
- For more information on Scouting rates, please check the Scout rate tab.
- Once a Global Launch SP Scouting ~Set 1~has been performed, even if the Scouting results are not displayed due to the user's device being forcibly shut down or getting disconnected from the server, it will be processed correctly. Please check your member list and amount of Light Sticks.
- Members from this Scout may be available to Scout again in the future.
- This Scouting event may also be made available again in the future.
- The availability period and contents of this Scout may change without any advance notice.
- Press the se Tickets button in the lower right of the screen to Scout using Scout Tickets.
Scout Tickets that do not show up in the tickets menu cannot be used for this Scout.
- When members that have already been recruited are Scouted again, you will receive Light Sticks in exchange for the duplicate members. The number of Light Sticks will depend on the member's rarity.
R member: 20
SR member: 50
UR member: 500
- Scout points you obtain will be automatically converted into 1 Skill Notebook (M) once the Scouting period ends.",924020101
diff --git a/src/router/databases/csv-en/lottery_image.csv b/src/router/databases/csv-en/lottery_image.csv
index f9d3b8a..be07bdd 100644
--- a/src/router/databases/csv-en/lottery_image.csv
+++ b/src/router/databases/csv-en/lottery_image.csv
@@ -142,6 +142,7 @@
4110042,4110042,thumbnail_4110042,gacha_title_4110042,,"40010014,40020012,40030012,40060011,40080010",224030109
4110043,4110043,thumbnail_4110043,gacha_title_4110043,,"30030015,40060013,20050019,10060018",224031602
4110044,4110044,thumbnail_4110044,gacha_title_4110044,,"10040020,10030018,20070016,20060016,30010018,30040014,40030014,40050013",224032003
+5110001,5110001,thumbnail_common_1,gacha_title_common_1,,"40020009,40090009,10010013,20010011,30010007,40010007",1
7110002,7110002,thumbnail_1110001,gacha_title_1110001,,"10010013,20010011,30010007,40010007",223043003
7110003,7110003,thumbnail_1110001,gacha_title_1110001,,"10010013,20010011,30010007,40010007",223071202
8110001,8110001,thumbnail_10003,gacha_title_10003,,ItemGachaBg,1
diff --git a/src/router/databases/csv-en/lottery_info.csv b/src/router/databases/csv-en/lottery_info.csv
index 1e8ac82..db58f35 100644
--- a/src/router/databases/csv-en/lottery_info.csv
+++ b/src/router/databases/csv-en/lottery_info.csv
@@ -142,6 +142,7 @@
4110042,School Idol Festival 2 Super Thanks Scouting: Liella!,"All members in School Idol Festival 2 Super Thanks Scouting: Liella! are members in Liella! of rarities R and above.
10 scouts in School Idol Festival 2 Super Thanks Scouting: Liella! can be performed using a 10x Scout Ticket (School Idol Festival 2 Super Thanks).
If a member that has already been recruited is Scouted, they will automatically be converted to Light Sticks.
*Converted Light Sticks are directly added to your items instead of being sent to the present box.
*If you have already reached the item limit for Light Sticks, they will be sent to the present box.
*The number of Light Sticks obtained will depend on the rarity of the member.
- UR: 500
- SR: 50
- R: 20
Also, you will obtain Scout Points [Super Thanks] according to the number of members that appear.
Scout points obtained can be exchanged for members, items, and more at the exchange shop.
Scout points that are not exchanged during the Scout period will automatically be converted to Skill Notebooks (M) when the Scout ends.
*Converted Skill Notebooks (M) will be directly added to your items instead of being sent to the present box.
*If you have already reached the item limit for Skill Notebooks (M), they will be sent to the present box.",224030109
4110043,Special Scout,"Special Scout will always feature R or higher club members.
1 time Scouting can be carried out with 300 Love Gems.
10 times Scouting can be carried out with 3000 Love Gems, and at least one member of SR or above will definitely join.
1 time Paid Scouting can be carried out only once a day with 150 paid Love Gems.
10 times Paid Scoutings can be carried out only once during the period with 2000 paid Love Gems.
If a member who has already joined the club appears, it will be automatically converted to a Light Stick.
*Converted Light Sticks will be added directly without going through presents.
*If you have reached the possession limit for Light Sticks, you will receive them as a present.
*The amount of Light Sticks obtained varies depending on the rarity of the member.
・UR: 500 pieces
・SR: 50 pieces
・R: 20 pieces
In addition, you will receive Scout Points [Special Scouting] depending on the number of club members who appear.
The acquired Scout Points can be exchanged for members, items, etc. at the exchange office.
Scout Points that are not exchanged will be automatically converted to Skill Notebook (Medium) at the end of this Scouting.
*The converted Skill Notebook (medium) will be added directly without going through the present.
*If you have reached the Skill Notebook (medium) possession limit, you will receive it as a present.",224031602
4110044,School Idols Thanksgiving Gather Everyone Scout,"In the School Idols Thanksgiving Gather Everyone Scout, members of R or higher will always appear.10 times Scout can be carried out with 3000 Love Gems.
10 times Paid Scout can be carried out only once during the period with 3000 paid Love Gems
1 time Paid Scout can be carried out up to 3 times a day with 50 paid Love Gems.
If a member who has already joined the club appears, it will be automatically converted to a Light Stick.
*Converted Light Sticks will be added directly without going through presents.
*If you have reached the possession limit for Light Sticks, you will receive them as a present.
*The amount of Light Sticks obtained varies depending on the rarity of the member.
・UR: 500 pieces
・SR: 50 pieces
・R: 20 pieces",224032003
+5110001,All Members Step-Up Scout,"The All Members Step-Up Scout gets better with every STEP.
Every Scoutable member of each rarity (R, SR, and UR) can appear.
Each STEP is a 10x Scout; the Loveca cost and the guaranteed slot change per STEP.
- STEP 1: 500 Loveca (1 SR or higher guaranteed)
- STEP 2: 1,000 Loveca (1 SR or higher guaranteed, UR rate up)
- STEP 3: 1,500 Loveca (1 SR or higher guaranteed, UR rate up)
- STEP 4: 2,000 Loveca (1 SR or higher guaranteed, UR rate way up)
- STEP 5: 2,500 Loveca (1 UR Member guaranteed!)
After STEP 5, the ladder returns to STEP 1 and can be repeated.
If you Scout a Member you already have, they will automatically be converted into Penlights.
*The number of Penlights received depends on the Member's rarity:
- UR: 500
- SR: 50
- R: 20",1
7110002,SIF Data Link Bonus Ticket Scout,"All Members in the SIF Data Link Bonus Ticket Scout are of rarities R and above.
10 Scouts can be performed by using a 10x Scout Ticket [SIF Data Link Bonus] and guarantees at least one Member of rarity SR or above.
If a Member that has already been recruited is Scouted, they will automatically be converted to Light Sticks.
*Converted Light Sticks are directly added to your items instead of being sent to your Present Box.
*If you have already reached the item limit for Light Sticks, they will be sent to the Present Box.
*The number of Light Sticks obtained will depend on the rarity of the Member.
- UR: 500
- SR: 50
- R: 20
Also, you will obtain Scout Points [Release Celebration] according to the number of Members that appear.
Scout Points obtained can be exchanged for Members, items, and more at the exchange shop.",223043003
7110003,SIFAS Data Link Bonus Ticket Scout,"All Members in the SIFAS Data Link Bonus Ticket Scout are of rarities R and above.
10 Scouts can be performed by using a 10x Scout Ticket [SIFAS Data Link Bonus] and guarantees at least one Member of rarity SR or above.
If a Member that has already been recruited is Scouted, they will automatically be converted to Light Sticks.
*Converted Light Sticks are directly added to your items instead of being sent to your Present Box.
*If you have already reached the item limit for Light Sticks, they will be sent to the Present Box.
*The number of Light Sticks obtained will depend on the rarity of the Member.
- UR: 500
- SR: 50
- R: 20
Also, you will obtain Scout Points [Release Celebration] according to the number of Members that appear.
Scout Points obtained can be exchanged for Members, items, and more at the exchange shop.",223071202
8110001,Item Scout,"You can perform an Item Scout once each day.
Item Scouts are reset at midnight every day.
In Item Scout, you can obtain ten of the following items at random:
- Light Sticks x10
- LP Candy (S) x1
- Lesson Notebooks (S) x20
- Lesson Notebooks (M) x8
- Lesson Notebook (L) x1
- Skill Notebooks (S) x18
- Skill Notebooks (M) x3
- 35,000 Gold",1
diff --git a/src/router/databases/csv-en/lottery_item.csv b/src/router/databases/csv-en/lottery_item.csv
index 181b391..7539b33 100644
--- a/src/router/databases/csv-en/lottery_item.csv
+++ b/src/router/databases/csv-en/lottery_item.csv
@@ -8291,3 +8291,484 @@
711010801,10,2,30100013,1,0,0,1,0,1
711010801,11,2,30110014,1,0,0,1,0,1
711010801,12,2,30120013,1,0,0,1,0,1
+511000111,1,2,10010001,1,0,0,0,0,1
+511000111,2,2,10010002,1,0,0,0,0,1
+511000111,3,2,10010003,1,0,0,0,0,1
+511000111,4,2,10010004,1,0,0,0,0,1
+511000111,5,2,10010005,1,0,0,0,0,1
+511000111,6,2,10010006,1,0,0,0,0,1
+511000111,7,2,10010007,1,0,0,0,0,1
+511000111,8,2,10010008,1,0,0,0,0,1
+511000111,9,2,10010009,1,0,0,0,0,1
+511000111,10,2,10020001,1,0,0,0,0,1
+511000111,11,2,10020002,1,0,0,0,0,1
+511000111,12,2,10020003,1,0,0,0,0,1
+511000111,13,2,10020004,1,0,0,0,0,1
+511000111,14,2,10020005,1,0,0,0,0,1
+511000111,15,2,10020006,1,0,0,0,0,1
+511000111,16,2,10020007,1,0,0,0,0,1
+511000111,17,2,10020008,1,0,0,0,0,1
+511000111,18,2,10020009,1,0,0,0,0,1
+511000111,19,2,10030001,1,0,0,0,0,1
+511000111,20,2,10030002,1,0,0,0,0,1
+511000111,21,2,10030003,1,0,0,0,0,1
+511000111,22,2,10030004,1,0,0,0,0,1
+511000111,23,2,10030005,1,0,0,0,0,1
+511000111,24,2,10030006,1,0,0,0,0,1
+511000111,25,2,10030007,1,0,0,0,0,1
+511000111,26,2,10030008,1,0,0,0,0,1
+511000111,27,2,10030009,1,0,0,0,0,1
+511000111,28,2,10040001,1,0,0,0,0,1
+511000111,29,2,10040002,1,0,0,0,0,1
+511000111,30,2,10040003,1,0,0,0,0,1
+511000111,31,2,10040004,1,0,0,0,0,1
+511000111,32,2,10040005,1,0,0,0,0,1
+511000111,33,2,10040006,1,0,0,0,0,1
+511000111,34,2,10040007,1,0,0,0,0,1
+511000111,35,2,10040008,1,0,0,0,0,1
+511000111,36,2,10040009,1,0,0,0,0,1
+511000111,37,2,10050001,1,0,0,0,0,1
+511000111,38,2,10050002,1,0,0,0,0,1
+511000111,39,2,10050003,1,0,0,0,0,1
+511000111,40,2,10050004,1,0,0,0,0,1
+511000111,41,2,10050005,1,0,0,0,0,1
+511000111,42,2,10050006,1,0,0,0,0,1
+511000111,43,2,10050007,1,0,0,0,0,1
+511000111,44,2,10050008,1,0,0,0,0,1
+511000111,45,2,10050009,1,0,0,0,0,1
+511000111,46,2,10060001,1,0,0,0,0,1
+511000111,47,2,10060002,1,0,0,0,0,1
+511000111,48,2,10060003,1,0,0,0,0,1
+511000111,49,2,10060004,1,0,0,0,0,1
+511000111,50,2,10060005,1,0,0,0,0,1
+511000111,51,2,10060006,1,0,0,0,0,1
+511000111,52,2,10060007,1,0,0,0,0,1
+511000111,53,2,10060008,1,0,0,0,0,1
+511000111,54,2,10060009,1,0,0,0,0,1
+511000111,55,2,10070001,1,0,0,0,0,1
+511000111,56,2,10070002,1,0,0,0,0,1
+511000111,57,2,10070003,1,0,0,0,0,1
+511000111,58,2,10070004,1,0,0,0,0,1
+511000111,59,2,10070005,1,0,0,0,0,1
+511000111,60,2,10070006,1,0,0,0,0,1
+511000111,61,2,10070007,1,0,0,0,0,1
+511000111,62,2,10070008,1,0,0,0,0,1
+511000111,63,2,10070009,1,0,0,0,0,1
+511000111,64,2,10080001,1,0,0,0,0,1
+511000111,65,2,10080002,1,0,0,0,0,1
+511000111,66,2,10080003,1,0,0,0,0,1
+511000111,67,2,10080004,1,0,0,0,0,1
+511000111,68,2,10080005,1,0,0,0,0,1
+511000111,69,2,10080006,1,0,0,0,0,1
+511000111,70,2,10080007,1,0,0,0,0,1
+511000111,71,2,10080008,1,0,0,0,0,1
+511000111,72,2,10080009,1,0,0,0,0,1
+511000111,73,2,10090001,1,0,0,0,0,1
+511000111,74,2,10090002,1,0,0,0,0,1
+511000111,75,2,10090003,1,0,0,0,0,1
+511000111,76,2,10090004,1,0,0,0,0,1
+511000111,77,2,10090005,1,0,0,0,0,1
+511000111,78,2,10090006,1,0,0,0,0,1
+511000111,79,2,10090007,1,0,0,0,0,1
+511000111,80,2,10090008,1,0,0,0,0,1
+511000111,81,2,10090009,1,0,0,0,0,1
+511000111,82,2,20010001,1,0,0,0,0,1
+511000111,83,2,20010002,1,0,0,0,0,1
+511000111,84,2,20010003,1,0,0,0,0,1
+511000111,85,2,20010004,1,0,0,0,0,1
+511000111,86,2,20010005,1,0,0,0,0,1
+511000111,87,2,20010006,1,0,0,0,0,1
+511000111,88,2,20010007,1,0,0,0,0,1
+511000111,89,2,20020001,1,0,0,0,0,1
+511000111,90,2,20020002,1,0,0,0,0,1
+511000111,91,2,20020003,1,0,0,0,0,1
+511000111,92,2,20020004,1,0,0,0,0,1
+511000111,93,2,20020005,1,0,0,0,0,1
+511000111,94,2,20020006,1,0,0,0,0,1
+511000111,95,2,20020007,1,0,0,0,0,1
+511000111,96,2,20030001,1,0,0,0,0,1
+511000111,97,2,20030002,1,0,0,0,0,1
+511000111,98,2,20030003,1,0,0,0,0,1
+511000111,99,2,20030004,1,0,0,0,0,1
+511000111,100,2,20030005,1,0,0,0,0,1
+511000111,101,2,20030006,1,0,0,0,0,1
+511000111,102,2,20030007,1,0,0,0,0,1
+511000111,103,2,20040001,1,0,0,0,0,1
+511000111,104,2,20040002,1,0,0,0,0,1
+511000111,105,2,20040003,1,0,0,0,0,1
+511000111,106,2,20040004,1,0,0,0,0,1
+511000111,107,2,20040005,1,0,0,0,0,1
+511000111,108,2,20040006,1,0,0,0,0,1
+511000111,109,2,20040007,1,0,0,0,0,1
+511000111,110,2,20050001,1,0,0,0,0,1
+511000111,111,2,20050002,1,0,0,0,0,1
+511000111,112,2,20050003,1,0,0,0,0,1
+511000111,113,2,20050004,1,0,0,0,0,1
+511000111,114,2,20050005,1,0,0,0,0,1
+511000111,115,2,20050006,1,0,0,0,0,1
+511000111,116,2,20050007,1,0,0,0,0,1
+511000111,117,2,20060001,1,0,0,0,0,1
+511000111,118,2,20060002,1,0,0,0,0,1
+511000111,119,2,20060003,1,0,0,0,0,1
+511000111,120,2,20060004,1,0,0,0,0,1
+511000111,121,2,20060005,1,0,0,0,0,1
+511000111,122,2,20060006,1,0,0,0,0,1
+511000111,123,2,20060007,1,0,0,0,0,1
+511000111,124,2,20070001,1,0,0,0,0,1
+511000111,125,2,20070002,1,0,0,0,0,1
+511000111,126,2,20070003,1,0,0,0,0,1
+511000111,127,2,20070004,1,0,0,0,0,1
+511000111,128,2,20070005,1,0,0,0,0,1
+511000111,129,2,20070006,1,0,0,0,0,1
+511000111,130,2,20070007,1,0,0,0,0,1
+511000111,131,2,20080001,1,0,0,0,0,1
+511000111,132,2,20080002,1,0,0,0,0,1
+511000111,133,2,20080003,1,0,0,0,0,1
+511000111,134,2,20080004,1,0,0,0,0,1
+511000111,135,2,20080005,1,0,0,0,0,1
+511000111,136,2,20080006,1,0,0,0,0,1
+511000111,137,2,20080007,1,0,0,0,0,1
+511000111,138,2,20090001,1,0,0,0,0,1
+511000111,139,2,20090002,1,0,0,0,0,1
+511000111,140,2,20090003,1,0,0,0,0,1
+511000111,141,2,20090004,1,0,0,0,0,1
+511000111,142,2,20090005,1,0,0,0,0,1
+511000111,143,2,20090006,1,0,0,0,0,1
+511000111,144,2,20090007,1,0,0,0,0,1
+511000111,145,2,30010001,1,0,0,0,0,1
+511000111,146,2,30010002,1,0,0,0,0,1
+511000111,147,2,30010003,1,0,0,0,0,1
+511000111,148,2,30020001,1,0,0,0,0,1
+511000111,149,2,30020002,1,0,0,0,0,1
+511000111,150,2,30020003,1,0,0,0,0,1
+511000111,151,2,30030001,1,0,0,0,0,1
+511000111,152,2,30030002,1,0,0,0,0,1
+511000111,153,2,30030003,1,0,0,0,0,1
+511000111,154,2,30040001,1,0,0,0,0,1
+511000111,155,2,30040002,1,0,0,0,0,1
+511000111,156,2,30040003,1,0,0,0,0,1
+511000111,157,2,30050001,1,0,0,0,0,1
+511000111,158,2,30050002,1,0,0,0,0,1
+511000111,159,2,30050003,1,0,0,0,0,1
+511000111,160,2,30060001,1,0,0,0,0,1
+511000111,161,2,30060002,1,0,0,0,0,1
+511000111,162,2,30060003,1,0,0,0,0,1
+511000111,163,2,30070001,1,0,0,0,0,1
+511000111,164,2,30070002,1,0,0,0,0,1
+511000111,165,2,30070003,1,0,0,0,0,1
+511000111,166,2,30080001,1,0,0,0,0,1
+511000111,167,2,30080002,1,0,0,0,0,1
+511000111,168,2,30080003,1,0,0,0,0,1
+511000111,169,2,30090001,1,0,0,0,0,1
+511000111,170,2,30090002,1,0,0,0,0,1
+511000111,171,2,30090003,1,0,0,0,0,1
+511000111,172,2,30100001,1,0,0,0,0,1
+511000111,173,2,30100002,1,0,0,0,0,1
+511000111,174,2,30100003,1,0,0,0,0,1
+511000111,175,2,30110001,1,0,0,0,0,1
+511000111,176,2,30110002,1,0,0,0,0,1
+511000111,177,2,30110003,1,0,0,0,0,1
+511000111,178,2,30120001,1,0,0,0,0,1
+511000111,179,2,30120002,1,0,0,0,0,1
+511000111,180,2,30120003,1,0,0,0,0,1
+511000111,181,2,40010001,1,0,0,0,0,1
+511000111,182,2,40010002,1,0,0,0,0,1
+511000111,183,2,40010003,1,0,0,0,0,1
+511000111,184,2,40020001,1,0,0,0,0,1
+511000111,185,2,40020002,1,0,0,0,0,1
+511000111,186,2,40020003,1,0,0,0,0,1
+511000111,187,2,40030001,1,0,0,0,0,1
+511000111,188,2,40030002,1,0,0,0,0,1
+511000111,189,2,40030003,1,0,0,0,0,1
+511000111,190,2,40040001,1,0,0,0,0,1
+511000111,191,2,40040002,1,0,0,0,0,1
+511000111,192,2,40040003,1,0,0,0,0,1
+511000111,193,2,40050001,1,0,0,0,0,1
+511000111,194,2,40050002,1,0,0,0,0,1
+511000111,195,2,40050003,1,0,0,0,0,1
+511000111,196,2,40060001,1,0,0,0,0,1
+511000111,197,2,40060002,1,0,0,0,0,1
+511000111,198,2,40060003,1,0,0,0,0,1
+511000111,199,2,40070001,1,0,0,0,0,1
+511000111,200,2,40070002,1,0,0,0,0,1
+511000111,201,2,40070003,1,0,0,0,0,1
+511000111,202,2,40080001,1,0,0,0,0,1
+511000111,203,2,40080002,1,0,0,0,0,1
+511000111,204,2,40080003,1,0,0,0,0,1
+511000111,205,2,40090001,1,0,0,0,0,1
+511000111,206,2,40090002,1,0,0,0,0,1
+511000111,207,2,40090003,1,0,0,0,0,1
+511000112,1,2,10010010,1,0,0,0,0,1
+511000112,2,2,10010011,1,0,0,0,0,1
+511000112,3,2,10010012,1,0,0,0,0,1
+511000112,4,2,10010019,1,0,0,0,0,1
+511000112,5,2,10020010,1,0,0,0,0,1
+511000112,6,2,10020011,1,0,0,0,0,1
+511000112,7,2,10020012,1,0,0,0,0,1
+511000112,8,2,10030010,1,0,0,0,0,1
+511000112,9,2,10030011,1,0,0,0,0,1
+511000112,10,2,10030012,1,0,0,0,0,1
+511000112,11,2,10040010,1,0,0,0,0,1
+511000112,12,2,10040011,1,0,0,0,0,1
+511000112,13,2,10040012,1,0,0,0,0,1
+511000112,14,2,10040017,1,0,0,0,0,1
+511000112,15,2,10050010,1,0,0,0,0,1
+511000112,16,2,10050011,1,0,0,0,0,1
+511000112,17,2,10050012,1,0,0,0,0,1
+511000112,18,2,10060010,1,0,0,0,0,1
+511000112,19,2,10060011,1,0,0,0,0,1
+511000112,20,2,10060012,1,0,0,0,0,1
+511000112,21,2,10070010,1,0,0,0,0,1
+511000112,22,2,10070011,1,0,0,0,0,1
+511000112,23,2,10070012,1,0,0,0,0,1
+511000112,24,2,10080010,1,0,0,0,0,1
+511000112,25,2,10080011,1,0,0,0,0,1
+511000112,26,2,10080012,1,0,0,0,0,1
+511000112,27,2,10090010,1,0,0,0,0,1
+511000112,28,2,10090011,1,0,0,0,0,1
+511000112,29,2,10090012,1,0,0,0,0,1
+511000112,30,2,20010008,1,0,0,0,0,1
+511000112,31,2,20010009,1,0,0,0,0,1
+511000112,32,2,20010010,1,0,0,0,0,1
+511000112,33,2,20010017,1,0,0,0,0,1
+511000112,34,2,20020008,1,0,0,0,0,1
+511000112,35,2,20020009,1,0,0,0,0,1
+511000112,36,2,20020010,1,0,0,0,0,1
+511000112,37,2,20030008,1,0,0,0,0,1
+511000112,38,2,20030009,1,0,0,0,0,1
+511000112,39,2,20030010,1,0,0,0,0,1
+511000112,40,2,20040008,1,0,0,0,0,1
+511000112,41,2,20040009,1,0,0,0,0,1
+511000112,42,2,20040010,1,0,0,0,0,1
+511000112,43,2,20050008,1,0,0,0,0,1
+511000112,44,2,20050009,1,0,0,0,0,1
+511000112,45,2,20050010,1,0,0,0,0,1
+511000112,46,2,20050015,1,0,0,0,0,1
+511000112,47,2,20060008,1,0,0,0,0,1
+511000112,48,2,20060009,1,0,0,0,0,1
+511000112,49,2,20060010,1,0,0,0,0,1
+511000112,50,2,20070008,1,0,0,0,0,1
+511000112,51,2,20070009,1,0,0,0,0,1
+511000112,52,2,20070010,1,0,0,0,0,1
+511000112,53,2,20080008,1,0,0,0,0,1
+511000112,54,2,20080009,1,0,0,0,0,1
+511000112,55,2,20080010,1,0,0,0,0,1
+511000112,56,2,20090008,1,0,0,0,0,1
+511000112,57,2,20090009,1,0,0,0,0,1
+511000112,58,2,20090010,1,0,0,0,0,1
+511000112,59,2,30010004,1,0,0,0,0,1
+511000112,60,2,30010005,1,0,0,0,0,1
+511000112,61,2,30010006,1,0,0,0,0,1
+511000112,62,2,30010013,1,0,0,0,0,1
+511000112,63,2,30020004,1,0,0,0,0,1
+511000112,64,2,30020005,1,0,0,0,0,1
+511000112,65,2,30020006,1,0,0,0,0,1
+511000112,66,2,30030004,1,0,0,0,0,1
+511000112,67,2,30030005,1,0,0,0,0,1
+511000112,68,2,30030006,1,0,0,0,0,1
+511000112,69,2,30040004,1,0,0,0,0,1
+511000112,70,2,30040005,1,0,0,0,0,1
+511000112,71,2,30040006,1,0,0,0,0,1
+511000112,72,2,30050004,1,0,0,0,0,1
+511000112,73,2,30050005,1,0,0,0,0,1
+511000112,74,2,30050006,1,0,0,0,0,1
+511000112,75,2,30060004,1,0,0,0,0,1
+511000112,76,2,30060005,1,0,0,0,0,1
+511000112,77,2,30060006,1,0,0,0,0,1
+511000112,78,2,30070004,1,0,0,0,0,1
+511000112,79,2,30070005,1,0,0,0,0,1
+511000112,80,2,30070006,1,0,0,0,0,1
+511000112,81,2,30070011,1,0,0,0,0,1
+511000112,82,2,30080004,1,0,0,0,0,1
+511000112,83,2,30080005,1,0,0,0,0,1
+511000112,84,2,30080006,1,0,0,0,0,1
+511000112,85,2,30090004,1,0,0,0,0,1
+511000112,86,2,30090005,1,0,0,0,0,1
+511000112,87,2,30090006,1,0,0,0,0,1
+511000112,88,2,30100004,1,0,0,0,0,1
+511000112,89,2,30100005,1,0,0,0,0,1
+511000112,90,2,30100006,1,0,0,0,0,1
+511000112,91,2,30110004,1,0,0,0,0,1
+511000112,92,2,30110005,1,0,0,0,0,1
+511000112,93,2,30110006,1,0,0,0,0,1
+511000112,94,2,30120004,1,0,0,0,0,1
+511000112,95,2,30120005,1,0,0,0,0,1
+511000112,96,2,30120006,1,0,0,0,0,1
+511000112,97,2,40010004,1,0,0,0,0,1
+511000112,98,2,40010005,1,0,0,0,0,1
+511000112,99,2,40010006,1,0,0,0,0,1
+511000112,100,2,40010013,1,0,0,0,0,1
+511000112,101,2,40020004,1,0,0,0,0,1
+511000112,102,2,40020005,1,0,0,0,0,1
+511000112,103,2,40020006,1,0,0,0,0,1
+511000112,104,2,40030004,1,0,0,0,0,1
+511000112,105,2,40030005,1,0,0,0,0,1
+511000112,106,2,40030006,1,0,0,0,0,1
+511000112,107,2,40030011,1,0,0,0,0,1
+511000112,108,2,40040004,1,0,0,0,0,1
+511000112,109,2,40040005,1,0,0,0,0,1
+511000112,110,2,40040006,1,0,0,0,0,1
+511000112,111,2,40050004,1,0,0,0,0,1
+511000112,112,2,40050005,1,0,0,0,0,1
+511000112,113,2,40050006,1,0,0,0,0,1
+511000112,114,2,40060004,1,0,0,0,0,1
+511000112,115,2,40060005,1,0,0,0,0,1
+511000112,116,2,40060006,1,0,0,0,0,1
+511000112,117,2,40070004,1,0,0,0,0,1
+511000112,118,2,40070005,1,0,0,0,0,1
+511000112,119,2,40070006,1,0,0,0,0,1
+511000112,120,2,40080004,1,0,0,0,0,1
+511000112,121,2,40080005,1,0,0,0,0,1
+511000112,122,2,40080006,1,0,0,0,0,1
+511000112,123,2,40090004,1,0,0,0,0,1
+511000112,124,2,40090005,1,0,0,0,0,1
+511000112,125,2,40090006,1,0,0,0,0,1
+511000112,126,2,40100001,1,0,0,0,0,1
+511000112,127,2,40110001,1,0,0,0,0,1
+511000112,128,2,60010001,1,0,0,0,0,1
+511000112,129,2,60020001,1,0,0,0,0,1
+511000112,130,2,60030001,1,0,0,0,0,1
+511000112,131,2,60040001,1,0,0,0,0,1
+511000112,132,2,60050001,1,0,0,0,0,1
+511000112,133,2,60060001,1,0,0,0,0,1
+511000112,134,2,60070001,1,0,0,0,0,1
+511000112,135,2,60080001,1,0,0,0,0,1
+511000112,136,2,60090001,1,0,0,0,0,1
+511000113,1,2,10010013,1,0,0,0,0,1
+511000113,2,2,10010016,1,0,0,0,0,1
+511000113,3,2,10010017,1,0,0,0,0,1
+511000113,4,2,10020013,1,0,0,0,0,1
+511000113,5,2,10020015,1,0,0,0,0,1
+511000113,6,2,10020017,1,0,0,0,0,1
+511000113,7,2,10030013,1,0,0,0,0,1
+511000113,8,2,10030016,1,0,0,0,0,1
+511000113,9,2,10030017,1,0,0,0,0,1
+511000113,10,2,10030018,1,0,0,0,0,1
+511000113,11,2,10040013,1,0,0,0,0,1
+511000113,12,2,10040019,1,0,0,0,0,1
+511000113,13,2,10040020,1,0,0,0,0,1
+511000113,14,2,10050013,1,0,0,0,0,1
+511000113,15,2,10050015,1,0,0,0,0,1
+511000113,16,2,10050016,1,0,0,0,0,1
+511000113,17,2,10060013,1,0,0,0,0,1
+511000113,18,2,10060015,1,0,0,0,0,1
+511000113,19,2,10060017,1,0,0,0,0,1
+511000113,20,2,10060018,1,0,0,0,0,1
+511000113,21,2,10070013,1,0,0,0,0,1
+511000113,22,2,10070015,1,0,0,0,0,1
+511000113,23,2,10070017,1,0,0,0,0,1
+511000113,24,2,10080013,1,0,0,0,0,1
+511000113,25,2,10080017,1,0,0,0,0,1
+511000113,26,2,10090013,1,0,0,0,0,1
+511000113,27,2,10090016,1,0,0,0,0,1
+511000113,28,2,10090018,1,0,0,0,0,1
+511000113,29,2,20010011,1,0,0,0,0,1
+511000113,30,2,20010014,1,0,0,0,0,1
+511000113,31,2,20010015,1,0,0,0,0,1
+511000113,32,2,20020011,1,0,0,0,0,1
+511000113,33,2,20020013,1,0,0,0,0,1
+511000113,34,2,20020014,1,0,0,0,0,1
+511000113,35,2,20020016,1,0,0,0,0,1
+511000113,36,2,20030011,1,0,0,0,0,1
+511000113,37,2,20030013,1,0,0,0,0,1
+511000113,38,2,20030016,1,0,0,0,0,1
+511000113,39,2,20040011,1,0,0,0,0,1
+511000113,40,2,20040013,1,0,0,0,0,1
+511000113,41,2,20040015,1,0,0,0,0,1
+511000113,42,2,20040016,1,0,0,0,0,1
+511000113,43,2,20050011,1,0,0,0,0,1
+511000113,44,2,20050017,1,0,0,0,0,1
+511000113,45,2,20050019,1,0,0,0,0,1
+511000113,46,2,20060011,1,0,0,0,0,1
+511000113,47,2,20060014,1,0,0,0,0,1
+511000113,48,2,20060015,1,0,0,0,0,1
+511000113,49,2,20060016,1,0,0,0,0,1
+511000113,50,2,20070011,1,0,0,0,0,1
+511000113,51,2,20070015,1,0,0,0,0,1
+511000113,52,2,20070016,1,0,0,0,0,1
+511000113,53,2,20080011,1,0,0,0,0,1
+511000113,54,2,20080013,1,0,0,0,0,1
+511000113,55,2,20080014,1,0,0,0,0,1
+511000113,56,2,20090011,1,0,0,0,0,1
+511000113,57,2,20090013,1,0,0,0,0,1
+511000113,58,2,20090014,1,0,0,0,0,1
+511000113,59,2,20090016,1,0,0,0,0,1
+511000113,60,2,30010007,1,0,0,0,0,1
+511000113,61,2,30010010,1,0,0,0,0,1
+511000113,62,2,30010012,1,0,0,0,0,1
+511000113,63,2,30010018,1,0,0,0,0,1
+511000113,64,2,30020007,1,0,0,0,0,1
+511000113,65,2,30020011,1,0,0,0,0,1
+511000113,66,2,30020014,1,0,0,0,0,1
+511000113,67,2,30030007,1,0,0,0,0,1
+511000113,68,2,30030012,1,0,0,0,0,1
+511000113,69,2,30030014,1,0,0,0,0,1
+511000113,70,2,30030015,1,0,0,0,0,1
+511000113,71,2,30040007,1,0,0,0,0,1
+511000113,72,2,30040009,1,0,0,0,0,1
+511000113,73,2,30040011,1,0,0,0,0,1
+511000113,74,2,30040014,1,0,0,0,0,1
+511000113,75,2,30050007,1,0,0,0,0,1
+511000113,76,2,30050009,1,0,0,0,0,1
+511000113,77,2,30050012,1,0,0,0,0,1
+511000113,78,2,30050013,1,0,0,0,0,1
+511000113,79,2,30060007,1,0,0,0,0,1
+511000113,80,2,30060009,1,0,0,0,0,1
+511000113,81,2,30060011,1,0,0,0,0,1
+511000113,82,2,30060013,1,0,0,0,0,1
+511000113,83,2,30070007,1,0,0,0,0,1
+511000113,84,2,30070009,1,0,0,0,0,1
+511000113,85,2,30070013,1,0,0,0,0,1
+511000113,86,2,30070014,1,0,0,0,0,1
+511000113,87,2,30080007,1,0,0,0,0,1
+511000113,88,2,30080009,1,0,0,0,0,1
+511000113,89,2,30080011,1,0,0,0,0,1
+511000113,90,2,30080014,1,0,0,0,0,1
+511000113,91,2,30090007,1,0,0,0,0,1
+511000113,92,2,30090009,1,0,0,0,0,1
+511000113,93,2,30090012,1,0,0,0,0,1
+511000113,94,2,30090013,1,0,0,0,0,1
+511000113,95,2,30100007,1,0,0,0,0,1
+511000113,96,2,30100009,1,0,0,0,0,1
+511000113,97,2,30100010,1,0,0,0,0,1
+511000113,98,2,30100013,1,0,0,0,0,1
+511000113,99,2,30110007,1,0,0,0,0,1
+511000113,100,2,30110010,1,0,0,0,0,1
+511000113,101,2,30110013,1,0,0,0,0,1
+511000113,102,2,30110014,1,0,0,0,0,1
+511000113,103,2,30120007,1,0,0,0,0,1
+511000113,104,2,30120010,1,0,0,0,0,1
+511000113,105,2,30120013,1,0,0,0,0,1
+511000113,106,2,30120014,1,0,0,0,0,1
+511000113,107,2,40010007,1,0,0,0,0,1
+511000113,108,2,40010010,1,0,0,0,0,1
+511000113,109,2,40010014,1,0,0,0,0,1
+511000113,110,2,40020007,1,0,0,0,0,1
+511000113,111,2,40020009,1,0,0,0,0,1
+511000113,112,2,40020010,1,0,0,0,0,1
+511000113,113,2,40020012,1,0,0,0,0,1
+511000113,114,2,40030007,1,0,0,0,0,1
+511000113,115,2,40030012,1,0,0,0,0,1
+511000113,116,2,40030014,1,0,0,0,0,1
+511000113,117,2,40040007,1,0,0,0,0,1
+511000113,118,2,40040009,1,0,0,0,0,1
+511000113,119,2,40040010,1,0,0,0,0,1
+511000113,120,2,40050007,1,0,0,0,0,1
+511000113,121,2,40050009,1,0,0,0,0,1
+511000113,122,2,40050011,1,0,0,0,0,1
+511000113,123,2,40050013,1,0,0,0,0,1
+511000113,124,2,40060007,1,0,0,0,0,1
+511000113,125,2,40060011,1,0,0,0,0,1
+511000113,126,2,40060013,1,0,0,0,0,1
+511000113,127,2,40070007,1,0,0,0,0,1
+511000113,128,2,40070010,1,0,0,0,0,1
+511000113,129,2,40070011,1,0,0,0,0,1
+511000113,130,2,40070013,1,0,0,0,0,1
+511000113,131,2,40080007,1,0,0,0,0,1
+511000113,132,2,40080009,1,0,0,0,0,1
+511000113,133,2,40080010,1,0,0,0,0,1
+511000113,134,2,40090007,1,0,0,0,0,1
+511000113,135,2,40090009,1,0,0,0,0,1
+511000113,136,2,40090010,1,0,0,0,0,1
+511000113,137,2,40100002,1,0,0,0,0,1
+511000113,138,2,40110002,1,0,0,0,0,1
diff --git a/src/router/databases/csv-en/lottery_price.csv b/src/router/databases/csv-en/lottery_price.csv
index 7b09a4b..e1dae53 100644
--- a/src/router/databases/csv-en/lottery_price.csv
+++ b/src/router/databases/csv-en/lottery_price.csv
@@ -928,3 +928,8 @@
7110108,5,4,1,1,0,0,15010001,0,924052401
7110108,6,4,10,1,0,0,15010002,0,924052401
7110108,7,4,10,1,0,0,15010003,0,924052401
+511000101,1,1,10,500,0,0,0,0,1
+511000102,1,1,10,1000,0,0,0,0,1
+511000103,1,1,10,1500,0,0,0,0,1
+511000104,1,1,10,2000,0,0,0,0,1
+511000105,1,1,10,2500,0,0,0,0,1
diff --git a/src/router/databases/csv-en/lottery_rarity.csv b/src/router/databases/csv-en/lottery_rarity.csv
index 3bcaa39..eba9e95 100644
--- a/src/router/databases/csv-en/lottery_rarity.csv
+++ b/src/router/databases/csv-en/lottery_rarity.csv
@@ -1142,3 +1142,27 @@
7110108,3,711010801,3,300,0,0,924052401
7110108,4,203001,2,9700,0,1,924052401
7110108,5,711010801,3,300,0,1,924052401
+511000101,1,511000111,1,7000,0,0,1
+511000101,2,511000112,2,2700,0,0,1
+511000101,3,511000113,3,300,0,0,1
+511000101,4,511000112,2,9700,0,1,1
+511000101,5,511000113,3,300,0,1,1
+511000102,1,511000111,1,7000,0,0,1
+511000102,2,511000112,2,2700,0,0,1
+511000102,3,511000113,3,300,0,0,1
+511000102,4,511000112,2,9000,0,1,1
+511000102,5,511000113,3,1000,0,1,1
+511000103,1,511000111,1,6900,0,0,1
+511000103,2,511000112,2,2700,0,0,1
+511000103,3,511000113,3,400,0,0,1
+511000103,4,511000112,2,7000,0,1,1
+511000103,5,511000113,3,3000,0,1,1
+511000104,1,511000111,1,6800,0,0,1
+511000104,2,511000112,2,2700,0,0,1
+511000104,3,511000113,3,500,0,0,1
+511000104,4,511000112,2,5000,0,1,1
+511000104,5,511000113,3,5000,0,1,1
+511000105,1,511000111,1,6500,0,0,1
+511000105,2,511000112,2,2700,0,0,1
+511000105,3,511000113,3,800,0,0,1
+511000105,4,511000113,3,10000,0,1,1
diff --git a/src/router/databases/csv-en/lottery_stepup.csv b/src/router/databases/csv-en/lottery_stepup.csv
index 0012e9b..24ff890 100644
--- a/src/router/databases/csv-en/lottery_stepup.csv
+++ b/src/router/databases/csv-en/lottery_stepup.csv
@@ -1 +1,6 @@
_masterLotteryId,_count,_nextCount,_masterLotteryPriceId,_masterLotteryRarityId,_masterReleaseLabelId
+5110001,1,2,511000101,511000101,1
+5110001,2,3,511000102,511000102,1
+5110001,3,4,511000103,511000103,1
+5110001,4,5,511000104,511000104,1
+5110001,5,1,511000105,511000105,1
diff --git a/src/router/databases/csv/lottery.csv b/src/router/databases/csv/lottery.csv
index 0e81a1d..90c98ab 100644
--- a/src/router/databases/csv/lottery.csv
+++ b/src/router/databases/csv/lottery.csv
@@ -142,6 +142,7 @@
4110042,スクフェス2 大感謝勧誘～Liella!編～,4110042,4110042,1,1,3403017,4110042,4110042,4110042,,0,0,0,0,15540034,1,1,0,224030109
4110043,スペシャル勧誘,4110043,4110043,1,1,2403167,4110043,4110043,4110043,,0,0,0,0,15540035,1,1,0,224031602
4110044,スクールアイドル感謝祭 全員集合勧誘,4110044,4110044,1,1,2403207,4110044,4110044,4110044,,0,0,0,0,0,1,1,0,224032003
+5110001,全部員大集合！ステップアップ勧誘,5110001,5110001,1,2,2404010,511000101,511000101,5110001,,0,0,0,1,0,1,1,0,1
7110002,スクフェスデータ連携特典 チケット勧誘,7110002,7110002,1,1,15,7110002,7110002,7110002,,0,0,1,0,15540001,1,1,0,223043003
7110003,スクスタデータ連携特典 チケット勧誘,7110003,7110003,1,1,15,7110003,7110003,7110003,,0,0,1,0,15540001,1,1,0,223071202
8110001,アイテム勧誘,8110001,8110001,2,1,10,8110001,8110001,8110001,,0,0,0,0,0,1,1,0,1
diff --git a/src/router/databases/csv/lottery_caution.csv b/src/router/databases/csv/lottery_caution.csv
index 2a43305..633bfe0 100644
--- a/src/router/databases/csv/lottery_caution.csv
+++ b/src/router/databases/csv/lottery_caution.csv
@@ -142,6 +142,7 @@ _id,_cautionText,_masterReleaseLabelId
4110042,・登場する部員については「登場割合」をご確認ください。
・「スクフェス2 大感謝勧誘～Liella!編～」で登場する部員は重複する場合があります。
・登場割合は小数第五位を四捨五入して記載しています。
そのため、それぞれの登場割合を足した値と全体の登場割合の表示に差が生じる場合があります。
・登場割合は表示の関係上、合計が100％にならないことがあります。
・「スクフェス2 大感謝勧誘～Liella!編～」は登場割合に基づき1回ごとに抽選を行います。
例えば提供割合1％のメンバーが100回中1回かならず加入する仕組みではございません。
・登場割合につきましては登場割合タブにてご確認ください。
・「スクフェス2 大感謝勧誘～Liella!編～」実行後に強制終了、もしくは回線が切断され正常に勧誘リザルト画面が表示されなかった場合でも、勧誘は正しく実施されております。部員一覧やペンライトの個数をご確認下さい。
・本勧誘で登場する部員は、今後再登場する場合がございます。
・本勧誘は再販される場合がございます。
・開催期間及び内容は予告なく変更される場合がございます。
・すでに加入済の部員は2回目以降に加入する代わりに、レアリティに応じてペンライトが貰えます。
R部員：20個
SR部員：50個
UR部員：500個,224030109
4110043,・登場する部員については「登場割合」をご確認ください。
・「スペシャル勧誘」で登場する部員は重複する場合があります。
・登場割合は小数第五位を四捨五入して記載しています。
そのため、それぞれの登場割合を足した値と全体の登場割合の表示に差が生じる場合があります。
・登場割合は表示の関係上、合計が100％にならないことがあります。
・「スペシャル勧誘」は登場割合に基づき1回ごとに抽選を行います。
例えば提供割合1％のメンバーが100回中1回かならず加入する仕組みではございません。
・登場割合につきましては登場割合タブにてご確認ください。
・「スペシャル勧誘」実行後に強制終了、もしくは回線が切断され正常に勧誘リザルト画面が表示されなかった場合でも、勧誘は正しく実施されております。部員一覧やペンライトの個数をご確認下さい。
・本勧誘で登場する部員は、今後再登場する場合がございます。
・本勧誘は再販される場合がございます。
・開催期間及び内容は予告なく変更される場合がございます。
・勧誘チケットは画面右下の「チケットで勧誘」からご利用いただけます。
「チケットで勧誘」内に表示されないチケットは、本勧誘ではご利用いただけません。
・すでに加入済の部員は2回目以降に加入する代わりに、レアリティに応じてペンライトが貰えます。
R部員：20個
SR部員：50個
UR部員：500個,224031602
4110044,・登場する部員については「登場割合」をご確認ください。
・「スクールアイドル感謝祭 全員集合勧誘」で登場する部員は重複する場合があります。
・登場割合は小数第五位を四捨五入して記載しています。
そのため、それぞれの登場割合を足した値と全体の登場割合の表示に差が生じる場合があります。
・登場割合は表示の関係上、合計が100％にならないことがあります。
・「スクールアイドル感謝祭 全員集合勧誘」は登場割合に基づき1回ごとに抽選を行います。
例えば提供割合1％のメンバーが100回中1回かならず加入する仕組みではございません。
・登場割合につきましては登場割合タブにてご確認ください。
・「スクールアイドル感謝祭 全員集合勧誘」実行後に強制終了、もしくは回線が切断され正常に勧誘リザルト画面が表示されなかった場合でも、勧誘は正しく実施されております。部員一覧やペンライトの個数をご確認下さい。
・本勧誘で登場する部員は、今後再登場する場合がございます。
・本勧誘は再販される場合がございます。
・開催期間及び内容は予告なく変更される場合がございます。
・すでに加入済の部員は2回目以降に加入する代わりに、レアリティに応じてペンライトが貰えます。
R部員：20個
SR部員：50個
UR部員：500個,224032003
+5110001,・登場する部員については「登場割合」をご確認ください。
・「全部員大集合！ステップアップ勧誘」はSTEPごとに登場割合と必要なラブカの個数が異なります。
・STEPは勧誘を実施するごとに1つ進み、STEP 5の実施後はSTEP 1に戻ります。
・登場割合は小数第五位を四捨五入して記載しています。
・「全部員大集合！ステップアップ勧誘」実行後に強制終了、もしくは回線が切断され正常に勧誘リザルト画面が表示されなかった場合でも、勧誘は正しく実施されております。部員一覧やペンライトの個数をご確認下さい。
・すでに加入済の部員は2回目以降に加入する代わりに、レアリティに応じてペンライトが貰えます。
R部員：20個
SR部員：50個
UR部員：500個,1
7110002,・登場する部員については「登場割合」をご確認ください。
・「スクフェスデータ連携特典 チケット勧誘」で登場する部員は重複する場合があります。
・登場割合は小数第五位を四捨五入して記載しています。
そのため、それぞれの登場割合を足した値と全体の登場割合の表示に差が生じる場合があります。
・登場割合は表示の関係上、合計が100％にならないことがあります。
・「スクフェスデータ連携特典 チケット勧誘」は登場割合に基づき1回ごとに抽選を行います。
例えば提供割合1％のメンバーが100回中1回かならず加入する仕組みではございません。
・登場割合につきましては登場割合タブにてご確認ください。
・「スクフェスデータ連携特典 チケット勧誘」実行後に強制終了、もしくは回線が切断され正常に勧誘リザルト画面が表示されなかった場合でも、勧誘は正しく実施されております。部員一覧やペンライトの個数をご確認下さい。
・本勧誘で登場する部員は、今後再登場する場合がございます。
・本勧誘は再販される場合がございます。
・開催期間及び内容は予告なく変更される場合がございます。
・すでに加入済の部員は2回目以降に加入する代わりに、レアリティに応じてペンライトが貰えます。
R部員：20個
SR部員：50個
UR部員：500個,223043003
7110003,・登場する部員については「登場割合」をご確認ください。
・「スクスタデータ連携特典 チケット勧誘」で登場する部員は重複する場合があります。
・登場割合は小数第五位を四捨五入して記載しています。
そのため、それぞれの登場割合を足した値と全体の登場割合の表示に差が生じる場合があります。
・登場割合は表示の関係上、合計が100％にならないことがあります。
・「スクスタデータ連携特典 チケット勧誘」は登場割合に基づき1回ごとに抽選を行います。
例えば提供割合1％のメンバーが100回中1回かならず加入する仕組みではございません。
・登場割合につきましては登場割合タブにてご確認ください。
・「スクスタデータ連携特典 チケット勧誘」実行後に強制終了、もしくは回線が切断され正常に勧誘リザルト画面が表示されなかった場合でも、勧誘は正しく実施されております。部員一覧やペンライトの個数をご確認下さい。
・本勧誘で登場する部員は、今後再登場する場合がございます。
・本勧誘は再販される場合がございます。
・開催期間及び内容は予告なく変更される場合がございます。
・すでに加入済の部員は2回目以降に加入する代わりに、レアリティに応じてペンライトが貰えます。
R部員：20個
SR部員：50個
UR部員：500個,223071202
8110001,・排出されるアイテムについては「勧誘概要」をご確認ください。
・「アイテム勧誘」で排出されるアイテムは重複する場合があります。
・「アイテム勧誘」実行後に強制終了、もしくは回線が切断され正常に結果画面が表示されなかった場合でも、アイテムは獲得されております。アイテムリストをご確認ください。,1
diff --git a/src/router/databases/csv/lottery_image.csv b/src/router/databases/csv/lottery_image.csv
index e4ec5ac..2bfcd09 100644
--- a/src/router/databases/csv/lottery_image.csv
+++ b/src/router/databases/csv/lottery_image.csv
@@ -142,6 +142,7 @@
4110042,4110042,thumbnail_4110042,gacha_title_4110042,,"40010014,40020012,40030012,40060011,40080010",224030109
4110043,4110043,thumbnail_4110043,gacha_title_4110043,,"30030015,40060013,20050019,10060018",224031602
4110044,4110044,thumbnail_4110044,gacha_title_4110044,,"10040020,10030018,20070016,20060016,30010018,30040014,40030014,40050013",224032003
+5110001,5110001,thumbnail_common_1,gacha_title_common_1,,"40020009,40090009,10010013,20010011,30010007,40010007",1
7110002,7110002,thumbnail_1110001,gacha_title_1110001,,"10010013,20010011,30010007,40010007",223043003
7110003,7110003,thumbnail_1110001,gacha_title_1110001,,"10010013,20010011,30010007,40010007",223071202
8110001,8110001,thumbnail_10003,gacha_title_10003,,ItemGachaBg,1
diff --git a/src/router/databases/csv/lottery_info.csv b/src/router/databases/csv/lottery_info.csv
index a39ad23..03b7e9b 100644
--- a/src/router/databases/csv/lottery_info.csv
+++ b/src/router/databases/csv/lottery_info.csv
@@ -142,6 +142,7 @@
4110042,スクフェス2 大感謝勧誘～Liella!編～,「スクフェス2 大感謝勧誘～Liella!編～」は、Liella!所属のR以上の部員が必ず登場します。
「スクフェス2 大感謝勧誘～Liella!編～」は、「10回勧誘チケット（スクフェス2 大感謝勧誘）」で実施できます。
すでに加入している部員が登場した場合、自動で「ペンライト」に変換されます。
※変換されたペンライトは、プレゼントを経由せず直接加算されます
※ペンライトの所持上限に達している場合は、プレゼントに贈られます
※ペンライトの獲得量は、部員のレアリティに応じて異なります
・UR：500個
・SR：50個
・R ：20個
また、登場した部員の人数に応じて「勧誘ポイント [大感謝勧誘]」を入手します。
獲得した「勧誘ポイント」は交換所にて部員やアイテム等と交換できます。
交換されなかった「勧誘ポイント」は、本勧誘の終了時に自動的に「スキルブック（中）」に変換されます。
※変換されたスキルブック（中）は、プレゼントを経由せず直接加算されます
※スキルブック（中）の所持上限に達している場合は、プレゼントに贈られます,224030109
4110043,スペシャル勧誘,「スペシャル勧誘」は、R以上の部員が必ず登場します。
「1回勧誘」は、ラブカ300個で実施できます。
「10回勧誘」は、ラブカ3000個で実施でき、SR以上の部員が1人以上必ず加入します。
「有償1回勧誘」は、有償ラブカ150個で毎日1回だけ実施できます。
「有償10回勧誘」は、有償ラブカ2000個で期間中1回だけ実施できます。
すでに加入している部員が登場した場合、自動で「ペンライト」に変換されます。
※変換されたペンライトは、プレゼントを経由せず直接加算されます
※ペンライトの所持上限に達している場合は、プレゼントに贈られます
※ペンライトの獲得量は、部員のレアリティに応じて異なります
・UR：500個
・SR：50個
・R ：20個
また、登場した部員の人数に応じて「勧誘ポイント [スペシャル勧誘]」を入手します。
獲得した「勧誘ポイント」は交換所にて部員やアイテム等と交換できます。
交換されなかった「勧誘ポイント」は、本勧誘の終了時に自動的に「スキルブック（中）」に変換されます。
※変換されたスキルブック（中）は、プレゼントを経由せず直接加算されます
※スキルブック（中）の所持上限に達している場合は、プレゼントに贈られます,224031602
4110044,スクールアイドル感謝祭 全員集合勧誘,「スクールアイドル感謝祭 全員集合勧誘」は、R以上の部員が必ず登場します。
「10回勧誘」は、ラブカ3000個で毎日1回まで実施できます。
「有償10回勧誘」は、有償ラブカ3000個で実施できます。
「有償1回勧誘」は、有償ラブカ50個で毎日3回まで実施できます。
すでに加入している部員が登場した場合、自動で「ペンライト」に変換されます。
※変換されたペンライトは、プレゼントを経由せず直接加算されます
※ペンライトの所持上限に達している場合は、プレゼントに贈られます
※ペンライトの獲得量は、部員のレアリティに応じて異なります
・UR：500個
・SR：50個
・R ：20個,224032003
+5110001,全部員大集合！ステップアップ勧誘,「全部員大集合！ステップアップ勧誘」は、STEPが進むごとに内容が変化するお得な勧誘です。
勧誘で入手可能な全部員（R・SR・UR）が登場します。
各STEPは10回勧誘で、STEPごとに必要なラブカの個数と確定枠が変化します。
・STEP 1：ラブカ500個（SR以上1人確定）
・STEP 2：ラブカ1000個（SR以上1人確定・UR確率アップ）
・STEP 3：ラブカ1500個（SR以上1人確定・UR確率アップ）
・STEP 4：ラブカ2000個（SR以上1人確定・UR確率大アップ）
・STEP 5：ラブカ2500個（UR部員1人確定！）
STEP 5の実施後は、再びSTEP 1から繰り返し実施できます。
すでに加入している部員が登場した場合、自動で「ペンライト」に変換されます。
※ペンライトの獲得量は、部員のレアリティに応じて異なります
・UR：500個
・SR：50個
・R ：20個,1
7110002,スクフェスデータ連携特典 チケット勧誘,「スクフェスデータ連携特典 チケット勧誘」は、R以上の部員が必ず登場します。
「10回勧誘」は、「10回勧誘チケット（スクフェスデータ連携特典）」で実施でき、SR以上の部員が1人以上必ず加入します。
すでに加入している部員が登場した場合、自動で「ペンライト」に変換されます。
※変換されたペンライトは、プレゼントを経由せず直接加算されます
※ペンライトの所持上限に達している場合は、プレゼントに贈られます
※ペンライトの獲得量は、部員のレアリティに応じて異なります
・UR：500個
・SR：50個
・R ：20個
また、登場した部員の人数に応じて「勧誘ポイント [リリース記念] 」を入手します。
獲得した「勧誘ポイント」は交換所にて部員やアイテム等と交換できます。,223043003
7110003,スクスタデータ連携特典 チケット勧誘,「スクスタデータ連携特典 チケット勧誘」は、R以上の部員が必ず登場します。
「10回勧誘」は、「10回勧誘チケット（スクフェスデータ連携特典）」で実施でき、SR以上の部員が1人以上必ず加入します。
すでに加入している部員が登場した場合、自動で「ペンライト」に変換されます。
※変換されたペンライトは、プレゼントを経由せず直接加算されます
※ペンライトの所持上限に達している場合は、プレゼントに贈られます
※ペンライトの獲得量は、部員のレアリティに応じて異なります
・UR：500個
・SR：50個
・R ：20個
また、登場した部員の人数に応じて「勧誘ポイント [リリース記念] 」を入手します。
獲得した「勧誘ポイント」は交換所にて部員やアイテム等と交換できます。,223071202
8110001,アイテム勧誘,毎日1回、「アイテム勧誘」を実施できます。
「アイテム勧誘」は毎日0時にリセットされます。
「アイテム勧誘」では、以下のアイテムからランダムで10個登場します。
・ペンライト：×10個
・LPキャンディ[小]：×1個
・レッスンノート（小）：×20個
・レッスンノート（中）：×8個
・レッスンノート（大）：×1個
・スキルブック（小）：×18個
・スキルブック（中）：×3個
・35000ゴールド,1
diff --git a/src/router/databases/csv/lottery_item.csv b/src/router/databases/csv/lottery_item.csv
index dcd2585..b32981e 100644
--- a/src/router/databases/csv/lottery_item.csv
+++ b/src/router/databases/csv/lottery_item.csv
@@ -8087,3 +8087,484 @@
123001,58,2,30110001,1,0,0,0,0,223120104
123001,59,2,30110002,1,0,0,0,0,223120104
123001,60,2,30110003,1,0,0,0,0,223120104
+511000111,1,2,10010001,1,0,0,0,0,1
+511000111,2,2,10010002,1,0,0,0,0,1
+511000111,3,2,10010003,1,0,0,0,0,1
+511000111,4,2,10010004,1,0,0,0,0,1
+511000111,5,2,10010005,1,0,0,0,0,1
+511000111,6,2,10010006,1,0,0,0,0,1
+511000111,7,2,10010007,1,0,0,0,0,1
+511000111,8,2,10010008,1,0,0,0,0,1
+511000111,9,2,10010009,1,0,0,0,0,1
+511000111,10,2,10020001,1,0,0,0,0,1
+511000111,11,2,10020002,1,0,0,0,0,1
+511000111,12,2,10020003,1,0,0,0,0,1
+511000111,13,2,10020004,1,0,0,0,0,1
+511000111,14,2,10020005,1,0,0,0,0,1
+511000111,15,2,10020006,1,0,0,0,0,1
+511000111,16,2,10020007,1,0,0,0,0,1
+511000111,17,2,10020008,1,0,0,0,0,1
+511000111,18,2,10020009,1,0,0,0,0,1
+511000111,19,2,10030001,1,0,0,0,0,1
+511000111,20,2,10030002,1,0,0,0,0,1
+511000111,21,2,10030003,1,0,0,0,0,1
+511000111,22,2,10030004,1,0,0,0,0,1
+511000111,23,2,10030005,1,0,0,0,0,1
+511000111,24,2,10030006,1,0,0,0,0,1
+511000111,25,2,10030007,1,0,0,0,0,1
+511000111,26,2,10030008,1,0,0,0,0,1
+511000111,27,2,10030009,1,0,0,0,0,1
+511000111,28,2,10040001,1,0,0,0,0,1
+511000111,29,2,10040002,1,0,0,0,0,1
+511000111,30,2,10040003,1,0,0,0,0,1
+511000111,31,2,10040004,1,0,0,0,0,1
+511000111,32,2,10040005,1,0,0,0,0,1
+511000111,33,2,10040006,1,0,0,0,0,1
+511000111,34,2,10040007,1,0,0,0,0,1
+511000111,35,2,10040008,1,0,0,0,0,1
+511000111,36,2,10040009,1,0,0,0,0,1
+511000111,37,2,10050001,1,0,0,0,0,1
+511000111,38,2,10050002,1,0,0,0,0,1
+511000111,39,2,10050003,1,0,0,0,0,1
+511000111,40,2,10050004,1,0,0,0,0,1
+511000111,41,2,10050005,1,0,0,0,0,1
+511000111,42,2,10050006,1,0,0,0,0,1
+511000111,43,2,10050007,1,0,0,0,0,1
+511000111,44,2,10050008,1,0,0,0,0,1
+511000111,45,2,10050009,1,0,0,0,0,1
+511000111,46,2,10060001,1,0,0,0,0,1
+511000111,47,2,10060002,1,0,0,0,0,1
+511000111,48,2,10060003,1,0,0,0,0,1
+511000111,49,2,10060004,1,0,0,0,0,1
+511000111,50,2,10060005,1,0,0,0,0,1
+511000111,51,2,10060006,1,0,0,0,0,1
+511000111,52,2,10060007,1,0,0,0,0,1
+511000111,53,2,10060008,1,0,0,0,0,1
+511000111,54,2,10060009,1,0,0,0,0,1
+511000111,55,2,10070001,1,0,0,0,0,1
+511000111,56,2,10070002,1,0,0,0,0,1
+511000111,57,2,10070003,1,0,0,0,0,1
+511000111,58,2,10070004,1,0,0,0,0,1
+511000111,59,2,10070005,1,0,0,0,0,1
+511000111,60,2,10070006,1,0,0,0,0,1
+511000111,61,2,10070007,1,0,0,0,0,1
+511000111,62,2,10070008,1,0,0,0,0,1
+511000111,63,2,10070009,1,0,0,0,0,1
+511000111,64,2,10080001,1,0,0,0,0,1
+511000111,65,2,10080002,1,0,0,0,0,1
+511000111,66,2,10080003,1,0,0,0,0,1
+511000111,67,2,10080004,1,0,0,0,0,1
+511000111,68,2,10080005,1,0,0,0,0,1
+511000111,69,2,10080006,1,0,0,0,0,1
+511000111,70,2,10080007,1,0,0,0,0,1
+511000111,71,2,10080008,1,0,0,0,0,1
+511000111,72,2,10080009,1,0,0,0,0,1
+511000111,73,2,10090001,1,0,0,0,0,1
+511000111,74,2,10090002,1,0,0,0,0,1
+511000111,75,2,10090003,1,0,0,0,0,1
+511000111,76,2,10090004,1,0,0,0,0,1
+511000111,77,2,10090005,1,0,0,0,0,1
+511000111,78,2,10090006,1,0,0,0,0,1
+511000111,79,2,10090007,1,0,0,0,0,1
+511000111,80,2,10090008,1,0,0,0,0,1
+511000111,81,2,10090009,1,0,0,0,0,1
+511000111,82,2,20010001,1,0,0,0,0,1
+511000111,83,2,20010002,1,0,0,0,0,1
+511000111,84,2,20010003,1,0,0,0,0,1
+511000111,85,2,20010004,1,0,0,0,0,1
+511000111,86,2,20010005,1,0,0,0,0,1
+511000111,87,2,20010006,1,0,0,0,0,1
+511000111,88,2,20010007,1,0,0,0,0,1
+511000111,89,2,20020001,1,0,0,0,0,1
+511000111,90,2,20020002,1,0,0,0,0,1
+511000111,91,2,20020003,1,0,0,0,0,1
+511000111,92,2,20020004,1,0,0,0,0,1
+511000111,93,2,20020005,1,0,0,0,0,1
+511000111,94,2,20020006,1,0,0,0,0,1
+511000111,95,2,20020007,1,0,0,0,0,1
+511000111,96,2,20030001,1,0,0,0,0,1
+511000111,97,2,20030002,1,0,0,0,0,1
+511000111,98,2,20030003,1,0,0,0,0,1
+511000111,99,2,20030004,1,0,0,0,0,1
+511000111,100,2,20030005,1,0,0,0,0,1
+511000111,101,2,20030006,1,0,0,0,0,1
+511000111,102,2,20030007,1,0,0,0,0,1
+511000111,103,2,20040001,1,0,0,0,0,1
+511000111,104,2,20040002,1,0,0,0,0,1
+511000111,105,2,20040003,1,0,0,0,0,1
+511000111,106,2,20040004,1,0,0,0,0,1
+511000111,107,2,20040005,1,0,0,0,0,1
+511000111,108,2,20040006,1,0,0,0,0,1
+511000111,109,2,20040007,1,0,0,0,0,1
+511000111,110,2,20050001,1,0,0,0,0,1
+511000111,111,2,20050002,1,0,0,0,0,1
+511000111,112,2,20050003,1,0,0,0,0,1
+511000111,113,2,20050004,1,0,0,0,0,1
+511000111,114,2,20050005,1,0,0,0,0,1
+511000111,115,2,20050006,1,0,0,0,0,1
+511000111,116,2,20050007,1,0,0,0,0,1
+511000111,117,2,20060001,1,0,0,0,0,1
+511000111,118,2,20060002,1,0,0,0,0,1
+511000111,119,2,20060003,1,0,0,0,0,1
+511000111,120,2,20060004,1,0,0,0,0,1
+511000111,121,2,20060005,1,0,0,0,0,1
+511000111,122,2,20060006,1,0,0,0,0,1
+511000111,123,2,20060007,1,0,0,0,0,1
+511000111,124,2,20070001,1,0,0,0,0,1
+511000111,125,2,20070002,1,0,0,0,0,1
+511000111,126,2,20070003,1,0,0,0,0,1
+511000111,127,2,20070004,1,0,0,0,0,1
+511000111,128,2,20070005,1,0,0,0,0,1
+511000111,129,2,20070006,1,0,0,0,0,1
+511000111,130,2,20070007,1,0,0,0,0,1
+511000111,131,2,20080001,1,0,0,0,0,1
+511000111,132,2,20080002,1,0,0,0,0,1
+511000111,133,2,20080003,1,0,0,0,0,1
+511000111,134,2,20080004,1,0,0,0,0,1
+511000111,135,2,20080005,1,0,0,0,0,1
+511000111,136,2,20080006,1,0,0,0,0,1
+511000111,137,2,20080007,1,0,0,0,0,1
+511000111,138,2,20090001,1,0,0,0,0,1
+511000111,139,2,20090002,1,0,0,0,0,1
+511000111,140,2,20090003,1,0,0,0,0,1
+511000111,141,2,20090004,1,0,0,0,0,1
+511000111,142,2,20090005,1,0,0,0,0,1
+511000111,143,2,20090006,1,0,0,0,0,1
+511000111,144,2,20090007,1,0,0,0,0,1
+511000111,145,2,30010001,1,0,0,0,0,1
+511000111,146,2,30010002,1,0,0,0,0,1
+511000111,147,2,30010003,1,0,0,0,0,1
+511000111,148,2,30020001,1,0,0,0,0,1
+511000111,149,2,30020002,1,0,0,0,0,1
+511000111,150,2,30020003,1,0,0,0,0,1
+511000111,151,2,30030001,1,0,0,0,0,1
+511000111,152,2,30030002,1,0,0,0,0,1
+511000111,153,2,30030003,1,0,0,0,0,1
+511000111,154,2,30040001,1,0,0,0,0,1
+511000111,155,2,30040002,1,0,0,0,0,1
+511000111,156,2,30040003,1,0,0,0,0,1
+511000111,157,2,30050001,1,0,0,0,0,1
+511000111,158,2,30050002,1,0,0,0,0,1
+511000111,159,2,30050003,1,0,0,0,0,1
+511000111,160,2,30060001,1,0,0,0,0,1
+511000111,161,2,30060002,1,0,0,0,0,1
+511000111,162,2,30060003,1,0,0,0,0,1
+511000111,163,2,30070001,1,0,0,0,0,1
+511000111,164,2,30070002,1,0,0,0,0,1
+511000111,165,2,30070003,1,0,0,0,0,1
+511000111,166,2,30080001,1,0,0,0,0,1
+511000111,167,2,30080002,1,0,0,0,0,1
+511000111,168,2,30080003,1,0,0,0,0,1
+511000111,169,2,30090001,1,0,0,0,0,1
+511000111,170,2,30090002,1,0,0,0,0,1
+511000111,171,2,30090003,1,0,0,0,0,1
+511000111,172,2,30100001,1,0,0,0,0,1
+511000111,173,2,30100002,1,0,0,0,0,1
+511000111,174,2,30100003,1,0,0,0,0,1
+511000111,175,2,30110001,1,0,0,0,0,1
+511000111,176,2,30110002,1,0,0,0,0,1
+511000111,177,2,30110003,1,0,0,0,0,1
+511000111,178,2,30120001,1,0,0,0,0,1
+511000111,179,2,30120002,1,0,0,0,0,1
+511000111,180,2,30120003,1,0,0,0,0,1
+511000111,181,2,40010001,1,0,0,0,0,1
+511000111,182,2,40010002,1,0,0,0,0,1
+511000111,183,2,40010003,1,0,0,0,0,1
+511000111,184,2,40020001,1,0,0,0,0,1
+511000111,185,2,40020002,1,0,0,0,0,1
+511000111,186,2,40020003,1,0,0,0,0,1
+511000111,187,2,40030001,1,0,0,0,0,1
+511000111,188,2,40030002,1,0,0,0,0,1
+511000111,189,2,40030003,1,0,0,0,0,1
+511000111,190,2,40040001,1,0,0,0,0,1
+511000111,191,2,40040002,1,0,0,0,0,1
+511000111,192,2,40040003,1,0,0,0,0,1
+511000111,193,2,40050001,1,0,0,0,0,1
+511000111,194,2,40050002,1,0,0,0,0,1
+511000111,195,2,40050003,1,0,0,0,0,1
+511000111,196,2,40060001,1,0,0,0,0,1
+511000111,197,2,40060002,1,0,0,0,0,1
+511000111,198,2,40060003,1,0,0,0,0,1
+511000111,199,2,40070001,1,0,0,0,0,1
+511000111,200,2,40070002,1,0,0,0,0,1
+511000111,201,2,40070003,1,0,0,0,0,1
+511000111,202,2,40080001,1,0,0,0,0,1
+511000111,203,2,40080002,1,0,0,0,0,1
+511000111,204,2,40080003,1,0,0,0,0,1
+511000111,205,2,40090001,1,0,0,0,0,1
+511000111,206,2,40090002,1,0,0,0,0,1
+511000111,207,2,40090003,1,0,0,0,0,1
+511000112,1,2,10010010,1,0,0,0,0,1
+511000112,2,2,10010011,1,0,0,0,0,1
+511000112,3,2,10010012,1,0,0,0,0,1
+511000112,4,2,10010019,1,0,0,0,0,1
+511000112,5,2,10020010,1,0,0,0,0,1
+511000112,6,2,10020011,1,0,0,0,0,1
+511000112,7,2,10020012,1,0,0,0,0,1
+511000112,8,2,10030010,1,0,0,0,0,1
+511000112,9,2,10030011,1,0,0,0,0,1
+511000112,10,2,10030012,1,0,0,0,0,1
+511000112,11,2,10040010,1,0,0,0,0,1
+511000112,12,2,10040011,1,0,0,0,0,1
+511000112,13,2,10040012,1,0,0,0,0,1
+511000112,14,2,10040017,1,0,0,0,0,1
+511000112,15,2,10050010,1,0,0,0,0,1
+511000112,16,2,10050011,1,0,0,0,0,1
+511000112,17,2,10050012,1,0,0,0,0,1
+511000112,18,2,10060010,1,0,0,0,0,1
+511000112,19,2,10060011,1,0,0,0,0,1
+511000112,20,2,10060012,1,0,0,0,0,1
+511000112,21,2,10070010,1,0,0,0,0,1
+511000112,22,2,10070011,1,0,0,0,0,1
+511000112,23,2,10070012,1,0,0,0,0,1
+511000112,24,2,10080010,1,0,0,0,0,1
+511000112,25,2,10080011,1,0,0,0,0,1
+511000112,26,2,10080012,1,0,0,0,0,1
+511000112,27,2,10090010,1,0,0,0,0,1
+511000112,28,2,10090011,1,0,0,0,0,1
+511000112,29,2,10090012,1,0,0,0,0,1
+511000112,30,2,20010008,1,0,0,0,0,1
+511000112,31,2,20010009,1,0,0,0,0,1
+511000112,32,2,20010010,1,0,0,0,0,1
+511000112,33,2,20010017,1,0,0,0,0,1
+511000112,34,2,20020008,1,0,0,0,0,1
+511000112,35,2,20020009,1,0,0,0,0,1
+511000112,36,2,20020010,1,0,0,0,0,1
+511000112,37,2,20030008,1,0,0,0,0,1
+511000112,38,2,20030009,1,0,0,0,0,1
+511000112,39,2,20030010,1,0,0,0,0,1
+511000112,40,2,20040008,1,0,0,0,0,1
+511000112,41,2,20040009,1,0,0,0,0,1
+511000112,42,2,20040010,1,0,0,0,0,1
+511000112,43,2,20050008,1,0,0,0,0,1
+511000112,44,2,20050009,1,0,0,0,0,1
+511000112,45,2,20050010,1,0,0,0,0,1
+511000112,46,2,20050015,1,0,0,0,0,1
+511000112,47,2,20060008,1,0,0,0,0,1
+511000112,48,2,20060009,1,0,0,0,0,1
+511000112,49,2,20060010,1,0,0,0,0,1
+511000112,50,2,20070008,1,0,0,0,0,1
+511000112,51,2,20070009,1,0,0,0,0,1
+511000112,52,2,20070010,1,0,0,0,0,1
+511000112,53,2,20080008,1,0,0,0,0,1
+511000112,54,2,20080009,1,0,0,0,0,1
+511000112,55,2,20080010,1,0,0,0,0,1
+511000112,56,2,20090008,1,0,0,0,0,1
+511000112,57,2,20090009,1,0,0,0,0,1
+511000112,58,2,20090010,1,0,0,0,0,1
+511000112,59,2,30010004,1,0,0,0,0,1
+511000112,60,2,30010005,1,0,0,0,0,1
+511000112,61,2,30010006,1,0,0,0,0,1
+511000112,62,2,30010013,1,0,0,0,0,1
+511000112,63,2,30020004,1,0,0,0,0,1
+511000112,64,2,30020005,1,0,0,0,0,1
+511000112,65,2,30020006,1,0,0,0,0,1
+511000112,66,2,30030004,1,0,0,0,0,1
+511000112,67,2,30030005,1,0,0,0,0,1
+511000112,68,2,30030006,1,0,0,0,0,1
+511000112,69,2,30040004,1,0,0,0,0,1
+511000112,70,2,30040005,1,0,0,0,0,1
+511000112,71,2,30040006,1,0,0,0,0,1
+511000112,72,2,30050004,1,0,0,0,0,1
+511000112,73,2,30050005,1,0,0,0,0,1
+511000112,74,2,30050006,1,0,0,0,0,1
+511000112,75,2,30060004,1,0,0,0,0,1
+511000112,76,2,30060005,1,0,0,0,0,1
+511000112,77,2,30060006,1,0,0,0,0,1
+511000112,78,2,30070004,1,0,0,0,0,1
+511000112,79,2,30070005,1,0,0,0,0,1
+511000112,80,2,30070006,1,0,0,0,0,1
+511000112,81,2,30070011,1,0,0,0,0,1
+511000112,82,2,30080004,1,0,0,0,0,1
+511000112,83,2,30080005,1,0,0,0,0,1
+511000112,84,2,30080006,1,0,0,0,0,1
+511000112,85,2,30090004,1,0,0,0,0,1
+511000112,86,2,30090005,1,0,0,0,0,1
+511000112,87,2,30090006,1,0,0,0,0,1
+511000112,88,2,30100004,1,0,0,0,0,1
+511000112,89,2,30100005,1,0,0,0,0,1
+511000112,90,2,30100006,1,0,0,0,0,1
+511000112,91,2,30110004,1,0,0,0,0,1
+511000112,92,2,30110005,1,0,0,0,0,1
+511000112,93,2,30110006,1,0,0,0,0,1
+511000112,94,2,30120004,1,0,0,0,0,1
+511000112,95,2,30120005,1,0,0,0,0,1
+511000112,96,2,30120006,1,0,0,0,0,1
+511000112,97,2,40010004,1,0,0,0,0,1
+511000112,98,2,40010005,1,0,0,0,0,1
+511000112,99,2,40010006,1,0,0,0,0,1
+511000112,100,2,40010013,1,0,0,0,0,1
+511000112,101,2,40020004,1,0,0,0,0,1
+511000112,102,2,40020005,1,0,0,0,0,1
+511000112,103,2,40020006,1,0,0,0,0,1
+511000112,104,2,40030004,1,0,0,0,0,1
+511000112,105,2,40030005,1,0,0,0,0,1
+511000112,106,2,40030006,1,0,0,0,0,1
+511000112,107,2,40030011,1,0,0,0,0,1
+511000112,108,2,40040004,1,0,0,0,0,1
+511000112,109,2,40040005,1,0,0,0,0,1
+511000112,110,2,40040006,1,0,0,0,0,1
+511000112,111,2,40050004,1,0,0,0,0,1
+511000112,112,2,40050005,1,0,0,0,0,1
+511000112,113,2,40050006,1,0,0,0,0,1
+511000112,114,2,40060004,1,0,0,0,0,1
+511000112,115,2,40060005,1,0,0,0,0,1
+511000112,116,2,40060006,1,0,0,0,0,1
+511000112,117,2,40070004,1,0,0,0,0,1
+511000112,118,2,40070005,1,0,0,0,0,1
+511000112,119,2,40070006,1,0,0,0,0,1
+511000112,120,2,40080004,1,0,0,0,0,1
+511000112,121,2,40080005,1,0,0,0,0,1
+511000112,122,2,40080006,1,0,0,0,0,1
+511000112,123,2,40090004,1,0,0,0,0,1
+511000112,124,2,40090005,1,0,0,0,0,1
+511000112,125,2,40090006,1,0,0,0,0,1
+511000112,126,2,40100001,1,0,0,0,0,1
+511000112,127,2,40110001,1,0,0,0,0,1
+511000112,128,2,60010001,1,0,0,0,0,1
+511000112,129,2,60020001,1,0,0,0,0,1
+511000112,130,2,60030001,1,0,0,0,0,1
+511000112,131,2,60040001,1,0,0,0,0,1
+511000112,132,2,60050001,1,0,0,0,0,1
+511000112,133,2,60060001,1,0,0,0,0,1
+511000112,134,2,60070001,1,0,0,0,0,1
+511000112,135,2,60080001,1,0,0,0,0,1
+511000112,136,2,60090001,1,0,0,0,0,1
+511000113,1,2,10010013,1,0,0,0,0,1
+511000113,2,2,10010016,1,0,0,0,0,1
+511000113,3,2,10010017,1,0,0,0,0,1
+511000113,4,2,10020013,1,0,0,0,0,1
+511000113,5,2,10020015,1,0,0,0,0,1
+511000113,6,2,10020017,1,0,0,0,0,1
+511000113,7,2,10030013,1,0,0,0,0,1
+511000113,8,2,10030016,1,0,0,0,0,1
+511000113,9,2,10030017,1,0,0,0,0,1
+511000113,10,2,10030018,1,0,0,0,0,1
+511000113,11,2,10040013,1,0,0,0,0,1
+511000113,12,2,10040019,1,0,0,0,0,1
+511000113,13,2,10040020,1,0,0,0,0,1
+511000113,14,2,10050013,1,0,0,0,0,1
+511000113,15,2,10050015,1,0,0,0,0,1
+511000113,16,2,10050016,1,0,0,0,0,1
+511000113,17,2,10060013,1,0,0,0,0,1
+511000113,18,2,10060015,1,0,0,0,0,1
+511000113,19,2,10060017,1,0,0,0,0,1
+511000113,20,2,10060018,1,0,0,0,0,1
+511000113,21,2,10070013,1,0,0,0,0,1
+511000113,22,2,10070015,1,0,0,0,0,1
+511000113,23,2,10070017,1,0,0,0,0,1
+511000113,24,2,10080013,1,0,0,0,0,1
+511000113,25,2,10080017,1,0,0,0,0,1
+511000113,26,2,10090013,1,0,0,0,0,1
+511000113,27,2,10090016,1,0,0,0,0,1
+511000113,28,2,10090018,1,0,0,0,0,1
+511000113,29,2,20010011,1,0,0,0,0,1
+511000113,30,2,20010014,1,0,0,0,0,1
+511000113,31,2,20010015,1,0,0,0,0,1
+511000113,32,2,20020011,1,0,0,0,0,1
+511000113,33,2,20020013,1,0,0,0,0,1
+511000113,34,2,20020014,1,0,0,0,0,1
+511000113,35,2,20020016,1,0,0,0,0,1
+511000113,36,2,20030011,1,0,0,0,0,1
+511000113,37,2,20030013,1,0,0,0,0,1
+511000113,38,2,20030016,1,0,0,0,0,1
+511000113,39,2,20040011,1,0,0,0,0,1
+511000113,40,2,20040013,1,0,0,0,0,1
+511000113,41,2,20040015,1,0,0,0,0,1
+511000113,42,2,20040016,1,0,0,0,0,1
+511000113,43,2,20050011,1,0,0,0,0,1
+511000113,44,2,20050017,1,0,0,0,0,1
+511000113,45,2,20050019,1,0,0,0,0,1
+511000113,46,2,20060011,1,0,0,0,0,1
+511000113,47,2,20060014,1,0,0,0,0,1
+511000113,48,2,20060015,1,0,0,0,0,1
+511000113,49,2,20060016,1,0,0,0,0,1
+511000113,50,2,20070011,1,0,0,0,0,1
+511000113,51,2,20070015,1,0,0,0,0,1
+511000113,52,2,20070016,1,0,0,0,0,1
+511000113,53,2,20080011,1,0,0,0,0,1
+511000113,54,2,20080013,1,0,0,0,0,1
+511000113,55,2,20080014,1,0,0,0,0,1
+511000113,56,2,20090011,1,0,0,0,0,1
+511000113,57,2,20090013,1,0,0,0,0,1
+511000113,58,2,20090014,1,0,0,0,0,1
+511000113,59,2,20090016,1,0,0,0,0,1
+511000113,60,2,30010007,1,0,0,0,0,1
+511000113,61,2,30010010,1,0,0,0,0,1
+511000113,62,2,30010012,1,0,0,0,0,1
+511000113,63,2,30010018,1,0,0,0,0,1
+511000113,64,2,30020007,1,0,0,0,0,1
+511000113,65,2,30020011,1,0,0,0,0,1
+511000113,66,2,30020014,1,0,0,0,0,1
+511000113,67,2,30030007,1,0,0,0,0,1
+511000113,68,2,30030012,1,0,0,0,0,1
+511000113,69,2,30030014,1,0,0,0,0,1
+511000113,70,2,30030015,1,0,0,0,0,1
+511000113,71,2,30040007,1,0,0,0,0,1
+511000113,72,2,30040009,1,0,0,0,0,1
+511000113,73,2,30040011,1,0,0,0,0,1
+511000113,74,2,30040014,1,0,0,0,0,1
+511000113,75,2,30050007,1,0,0,0,0,1
+511000113,76,2,30050009,1,0,0,0,0,1
+511000113,77,2,30050012,1,0,0,0,0,1
+511000113,78,2,30050013,1,0,0,0,0,1
+511000113,79,2,30060007,1,0,0,0,0,1
+511000113,80,2,30060009,1,0,0,0,0,1
+511000113,81,2,30060011,1,0,0,0,0,1
+511000113,82,2,30060013,1,0,0,0,0,1
+511000113,83,2,30070007,1,0,0,0,0,1
+511000113,84,2,30070009,1,0,0,0,0,1
+511000113,85,2,30070013,1,0,0,0,0,1
+511000113,86,2,30070014,1,0,0,0,0,1
+511000113,87,2,30080007,1,0,0,0,0,1
+511000113,88,2,30080009,1,0,0,0,0,1
+511000113,89,2,30080011,1,0,0,0,0,1
+511000113,90,2,30080014,1,0,0,0,0,1
+511000113,91,2,30090007,1,0,0,0,0,1
+511000113,92,2,30090009,1,0,0,0,0,1
+511000113,93,2,30090012,1,0,0,0,0,1
+511000113,94,2,30090013,1,0,0,0,0,1
+511000113,95,2,30100007,1,0,0,0,0,1
+511000113,96,2,30100009,1,0,0,0,0,1
+511000113,97,2,30100010,1,0,0,0,0,1
+511000113,98,2,30100013,1,0,0,0,0,1
+511000113,99,2,30110007,1,0,0,0,0,1
+511000113,100,2,30110010,1,0,0,0,0,1
+511000113,101,2,30110013,1,0,0,0,0,1
+511000113,102,2,30110014,1,0,0,0,0,1
+511000113,103,2,30120007,1,0,0,0,0,1
+511000113,104,2,30120010,1,0,0,0,0,1
+511000113,105,2,30120013,1,0,0,0,0,1
+511000113,106,2,30120014,1,0,0,0,0,1
+511000113,107,2,40010007,1,0,0,0,0,1
+511000113,108,2,40010010,1,0,0,0,0,1
+511000113,109,2,40010014,1,0,0,0,0,1
+511000113,110,2,40020007,1,0,0,0,0,1
+511000113,111,2,40020009,1,0,0,0,0,1
+511000113,112,2,40020010,1,0,0,0,0,1
+511000113,113,2,40020012,1,0,0,0,0,1
+511000113,114,2,40030007,1,0,0,0,0,1
+511000113,115,2,40030012,1,0,0,0,0,1
+511000113,116,2,40030014,1,0,0,0,0,1
+511000113,117,2,40040007,1,0,0,0,0,1
+511000113,118,2,40040009,1,0,0,0,0,1
+511000113,119,2,40040010,1,0,0,0,0,1
+511000113,120,2,40050007,1,0,0,0,0,1
+511000113,121,2,40050009,1,0,0,0,0,1
+511000113,122,2,40050011,1,0,0,0,0,1
+511000113,123,2,40050013,1,0,0,0,0,1
+511000113,124,2,40060007,1,0,0,0,0,1
+511000113,125,2,40060011,1,0,0,0,0,1
+511000113,126,2,40060013,1,0,0,0,0,1
+511000113,127,2,40070007,1,0,0,0,0,1
+511000113,128,2,40070010,1,0,0,0,0,1
+511000113,129,2,40070011,1,0,0,0,0,1
+511000113,130,2,40070013,1,0,0,0,0,1
+511000113,131,2,40080007,1,0,0,0,0,1
+511000113,132,2,40080009,1,0,0,0,0,1
+511000113,133,2,40080010,1,0,0,0,0,1
+511000113,134,2,40090007,1,0,0,0,0,1
+511000113,135,2,40090009,1,0,0,0,0,1
+511000113,136,2,40090010,1,0,0,0,0,1
+511000113,137,2,40100002,1,0,0,0,0,1
+511000113,138,2,40110002,1,0,0,0,0,1
diff --git a/src/router/databases/csv/lottery_price.csv b/src/router/databases/csv/lottery_price.csv
index c19e693..1026799 100644
--- a/src/router/databases/csv/lottery_price.csv
+++ b/src/router/databases/csv/lottery_price.csv
@@ -894,3 +894,8 @@
9110037,1,0,10,0,1,0,0,0,1
9110038,1,0,10,0,1,0,0,0,1
9110039,1,0,10,0,1,0,0,0,1
+511000101,1,1,10,500,0,0,0,0,1
+511000102,1,1,10,1000,0,0,0,0,1
+511000103,1,1,10,1500,0,0,0,0,1
+511000104,1,1,10,2000,0,0,0,0,1
+511000105,1,1,10,2500,0,0,0,0,1
diff --git a/src/router/databases/csv/lottery_rarity.csv b/src/router/databases/csv/lottery_rarity.csv
index 7b05762..688ad39 100644
--- a/src/router/databases/csv/lottery_rarity.csv
+++ b/src/router/databases/csv/lottery_rarity.csv
@@ -1095,3 +1095,27 @@
9110039,2,200001,2,2700,0,0,1
9110039,3,300001,3,300,0,0,1
9110039,4,911003901,3,10000,0,1,1
+511000101,1,511000111,1,7000,0,0,1
+511000101,2,511000112,2,2700,0,0,1
+511000101,3,511000113,3,300,0,0,1
+511000101,4,511000112,2,9700,0,1,1
+511000101,5,511000113,3,300,0,1,1
+511000102,1,511000111,1,7000,0,0,1
+511000102,2,511000112,2,2700,0,0,1
+511000102,3,511000113,3,300,0,0,1
+511000102,4,511000112,2,9000,0,1,1
+511000102,5,511000113,3,1000,0,1,1
+511000103,1,511000111,1,6900,0,0,1
+511000103,2,511000112,2,2700,0,0,1
+511000103,3,511000113,3,400,0,0,1
+511000103,4,511000112,2,7000,0,1,1
+511000103,5,511000113,3,3000,0,1,1
+511000104,1,511000111,1,6800,0,0,1
+511000104,2,511000112,2,2700,0,0,1
+511000104,3,511000113,3,500,0,0,1
+511000104,4,511000112,2,5000,0,1,1
+511000104,5,511000113,3,5000,0,1,1
+511000105,1,511000111,1,6500,0,0,1
+511000105,2,511000112,2,2700,0,0,1
+511000105,3,511000113,3,800,0,0,1
+511000105,4,511000113,3,10000,0,1,1
diff --git a/src/router/databases/csv/lottery_stepup.csv b/src/router/databases/csv/lottery_stepup.csv
index 0012e9b..24ff890 100644
--- a/src/router/databases/csv/lottery_stepup.csv
+++ b/src/router/databases/csv/lottery_stepup.csv
@@ -1 +1,6 @@
_masterLotteryId,_count,_nextCount,_masterLotteryPriceId,_masterLotteryRarityId,_masterReleaseLabelId
+5110001,1,2,511000101,511000101,1
+5110001,2,3,511000102,511000102,1
+5110001,3,4,511000103,511000103,1
+5110001,4,5,511000104,511000104,1
+5110001,5,1,511000105,511000105,1
diff --git a/src/router/databases/mod.rs b/src/router/databases/mod.rs
index 11067d9..a800736 100644
--- a/src/router/databases/mod.rs
+++ b/src/router/databases/mod.rs
@@ -149,6 +149,26 @@ lazy_static! {
cardz
};
+ pub static ref STEPUP: JsonValue = {
+ let mut cardz = object! {};
+ let mut seen_ids = array![];
+ for data in t("lottery_stepup").members() {
+ let id = data["masterLotteryId"].to_string();
+ if cardz[&id].is_null() {
+ cardz[&id] = array![];
+ seen_ids.push(id.clone()).unwrap();
+ }
+ cardz[&id].push(data.clone()).unwrap();
+ }
+ for data in g("lottery_stepup").members() {
+ let id = data["masterLotteryId"].to_string();
+ if seen_ids.contains(id.as_str()) { continue; }
+ if cardz[&id].is_null() { cardz[&id] = array![]; }
+ cardz[&id].push(data.clone()).unwrap();
+ }
+ cardz
+ };
+
pub static ref LOTTERY: JsonValue = {
let mut cardz = object! {};
for data in t("lottery").members() {
diff --git a/src/router/lottery.rs b/src/router/lottery.rs
index f89b7c6..60460de 100644
--- a/src/router/lottery.rs
+++ b/src/router/lottery.rs
@@ -70,27 +70,34 @@ fn get_random_card(item: &JsonValue, rv: &mut JsonValue, rng: &mut rand::rngs::T
}
fn get_random_cards(id: i64, mut count: usize) -> JsonValue {
- let total_ratio: i64 = databases::RARITY[id.to_string()].members().map(|item| if item["ensured"].as_i32().unwrap() == 1 { 0 } else { item["ratio"].as_i64().unwrap() }).sum();
+ let rarity = &databases::RARITY[id.to_string()];
+ let total_ratio: i64 = rarity.members().map(|item| if item["ensured"].as_i32().unwrap() == 1 { 0 } else { item["ratio"].as_i64().unwrap() }).sum();
+ let ensured_ratio: i64 = rarity.members().map(|item| if item["ensured"].as_i32().unwrap() == 1 { item["ratio"].as_i64().unwrap() } else { 0 }).sum();
let mut rng = rand::rng();
let mut rv = array![];
- let mut promised = false;
-
- if count > 1 {
- for item in databases::RARITY[id.to_string()].members() {
- if item["ensured"].as_i32().unwrap() == 1 {
+
+ if count > 1 && ensured_ratio > 0 {
+ let random_number: i64 = rng.random_range(1..ensured_ratio + 1);
+ let mut cumulative_ratio = 0;
+ for item in rarity.members() {
+ if item["ensured"].as_i32().unwrap() != 1 {
+ continue;
+ }
+ cumulative_ratio += item["ratio"].as_i64().unwrap();
+ if random_number <= cumulative_ratio {
get_random_card(item, &mut rv, &mut rng);
- promised = true;
+ count -= 1;
break;
}
}
}
- if promised {
- count -= 1;
- }
for _i in 0..count {
let random_number: i64 = rng.random_range(1..total_ratio + 1);
let mut cumulative_ratio = 0;
- for item in databases::RARITY[id.to_string()].members() {
+ for item in rarity.members() {
+ if item["ensured"].as_i32().unwrap() == 1 {
+ continue;
+ }
cumulative_ratio += item["ratio"].as_i64().unwrap();
if random_number <= cumulative_ratio {
get_random_card(item, &mut rv, &mut rng);
@@ -101,9 +108,92 @@ fn get_random_cards(id: i64, mut count: usize) -> JsonValue {
rv
}
+fn lottery_day() -> i64 {
+ (global::timestamp() as i64 + 32400) / 86400
+}
+
+fn get_draw_count(user: &JsonValue, lottery_id: i64, price_number: i64) -> i64 {
+ for data in user["lottery_list"].members() {
+ if data["master_lottery_id"].as_i64() == Some(lottery_id) && data["master_lottery_price_number"].as_i64() == Some(price_number) {
+ return data["count"].as_i64().unwrap_or(0);
+ }
+ }
+ 0
+}
+
+fn add_draw_count(user: &mut JsonValue, lottery_id: i64, price_number: i64) {
+ let today = lottery_day();
+ if !user["lottery_list"].is_array() {
+ user["lottery_list"] = array![];
+ }
+ for data in user["lottery_list"].members_mut() {
+ if data["master_lottery_id"].as_i64() == Some(lottery_id) && data["master_lottery_price_number"].as_i64() == Some(price_number) {
+ let daily = if data["last_count_date"].as_i64() == Some(today) { data["daily_count"].as_i64().unwrap_or(0) } else { 0 };
+ data["count"] = (data["count"].as_i64().unwrap_or(0) + 1).into();
+ data["daily_count"] = (daily + 1).into();
+ data["last_count_date"] = today.into();
+ return;
+ }
+ }
+ user["lottery_list"].push(object!{
+ "master_lottery_id": lottery_id,
+ "master_lottery_price_number": price_number,
+ "count": 1,
+ "daily_count": 1,
+ "last_count_date": today
+ }).unwrap();
+}
+
+fn is_stepup(lottery_id: i64) -> bool {
+ databases::LOTTERY[lottery_id.to_string()]["type"].as_i64() == Some(2)
+}
+
+fn stepup_step(lottery_id: i64, draws: i64) -> JsonValue {
+ let steps = &databases::STEPUP[lottery_id.to_string()];
+ let step = draws % steps.len() as i64 + 1;
+ steps.members().find(|n| n["count"].as_i64() == Some(step)).unwrap().clone()
+}
+
+fn get_lottery_list(user: &JsonValue) -> JsonValue {
+ let today = lottery_day();
+ let mut rv = array![];
+ for data in user["lottery_list"].members() {
+ let lottery_id = data["master_lottery_id"].as_i64().unwrap_or(0);
+ let price_number = data["master_lottery_price_number"].as_i64().unwrap_or(0);
+ let mut count = data["count"].as_i64().unwrap_or(0);
+ if price_number == 1 && is_stepup(lottery_id) {
+ count += 1;
+ }
+ let daily = if data["last_count_date"].as_i64() == Some(today) { data["daily_count"].as_i64().unwrap_or(0) } else { 0 };
+ rv.push(object!{
+ "master_lottery_id": lottery_id,
+ "master_lottery_price_number": price_number,
+ "count": count,
+ "daily_count": daily,
+ "last_count_date": ""
+ }).unwrap();
+ }
+ for entry in databases::STEPUP.entries() {
+ let lottery_id = entry.0.parse::().unwrap();
+ if rv.members().any(|data| data["master_lottery_id"].as_i64() == Some(lottery_id) && data["master_lottery_price_number"].as_i64() == Some(1)) {
+ continue;
+ }
+ rv.push(object!{
+ "master_lottery_id": lottery_id,
+ "master_lottery_price_number": 1,
+ "count": 1,
+ "daily_count": 0,
+ "last_count_date": ""
+ }).unwrap();
+ }
+ rv
+}
+
async fn lottery(req: HttpRequest) -> impl Responder {
+ let key = global::get_login(req.headers(), "");
+ let user = userdata::get_acc(&key);
global::api(&req, Some(object!{
- "lottery_list": []
+ "lottery_list": get_lottery_list(&user)
}))
}
@@ -118,8 +208,20 @@ async fn lottery_post(req: HttpRequest, body: String) -> impl Responder {
let mut cleared_missions = array![];
let lottery_id = body["master_lottery_id"].as_i64().unwrap();
- let price = databases::PRICE[lottery_id.to_string()][body["master_lottery_price_number"].to_string()].clone();
-
+ let price_number = body["master_lottery_price_number"].as_i64().unwrap();
+
+ let lottery = &databases::LOTTERY[lottery_id.to_string()];
+ let lottery_type = lottery["category"].as_i32().unwrap();
+ let exchange_id = lottery["exchangeMasterItemId"].as_i64().unwrap_or(0);
+
+ let (price_id, rarity_id) = if is_stepup(lottery_id) && price_number == 1 {
+ let step = stepup_step(lottery_id, get_draw_count(&user, lottery_id, 1));
+ (step["masterLotteryPriceId"].as_i64().unwrap(), step["masterLotteryRarityId"].as_i64().unwrap())
+ } else {
+ (lottery["masterLotteryPriceId"].as_i64().unwrap_or(lottery_id), lottery["masterLotteryRarityId"].as_i64().unwrap_or(lottery_id))
+ };
+ let price = databases::PRICE[price_id.to_string()][price_number.to_string()].clone();
+
items::use_item(&object!{
value: price["masterItemId"].clone(),
amount: price["price"].clone(),
@@ -127,12 +229,8 @@ async fn lottery_post(req: HttpRequest, body: String) -> impl Responder {
}, 1, &mut user);
let count = price["count"].as_usize().unwrap();
-
- let cardstogive = get_random_cards(lottery_id, count);
-
- let lottery = &databases::LOTTERY[lottery_id.to_string()];
- let lottery_type = lottery["category"].as_i32().unwrap();
- let exchange_id = lottery["exchangeMasterItemId"].as_i64().unwrap_or(0);
+
+ let cardstogive = get_random_cards(rarity_id, count);
let mut new_cards = array![];
let mut lottery_list = array![];
@@ -186,7 +284,13 @@ async fn lottery_post(req: HttpRequest, body: String) -> impl Responder {
if exchange_id != 0 {
items::give_gift_basic(3, exchange_id, 10, &mut user, &mut missions, &mut cleared_missions, &mut chats);
}
-
+
+ add_draw_count(&mut user, lottery_id, price_number);
+ let mut new_count = get_draw_count(&user, lottery_id, price_number);
+ if is_stepup(lottery_id) && price_number == 1 {
+ new_count += 1;
+ }
+
userdata::save_acc(&key, user.clone());
userdata::save_acc_chats(&key, chats);
userdata::save_acc_missions(&key, missions);
@@ -199,6 +303,14 @@ async fn lottery_post(req: HttpRequest, body: String) -> impl Responder {
},
"gift_list": user2["home"]["gift_list"].clone(),
"clear_mission_ids": cleared_missions,
- "draw_count_list": []
+ "draw_count_list": [
+ {
+ "number": price_number,
+ "count": new_count
+ }
+ ]
}))
}
+
+
+