From c6c63b23470fbf67710d872bdbfed5ea44f0da7b Mon Sep 17 00:00:00 2001 From: Jirehlov <34600796+Jirehlov@users.noreply.github.com> Date: Mon, 31 Oct 2022 13:18:21 +0000 Subject: [PATCH] v3.2 --- README.md | 29 ++++++++++------ cn_item.h | 37 ++++++++++---------- en_item.h | 49 +++++++++++++++++---------- giwscli.cpp | 97 +++++++++++++++++++++++++++++++---------------------- giwscli.h | 12 +++---- jp_item.h | 43 ++++++++++++++---------- lang.cpp | 2 +- lang.h | 2 +- 8 files changed, 161 insertions(+), 110 deletions(-) diff --git a/README.md b/README.md index 4098f52..172c429 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # libgiwscli A library for Genshin Impact Wish Simulators written in C++\ -Current version: 3.1.3 +Current version: 3.2 ## Applications (dead) CLI: https://github.com/Jirehlov/Genshin-Impact-Wish-Simulator-CLI \ @@ -73,7 +73,8 @@ Notes: 34 Viridescent Vigil_20220824-20220909 (Tighnari, Collei, Diona, Fischl)\ 35 Adrift in the Harbor_20220909-20220927 (Ganyu, Dori, Sucrose, Xingqiu)\ 36 Twilight Arbiter_20220928-20221014 (Cyno, Candace, Kuki Shinobu, Sayu)\ -37 Twirling Lotus_20221014-20221101 (Nilou, Beidou, Barbara, Xiangling) +37 Twirling Lotus_20221014-20221101 (Nilou, Beidou, Barbara, Xiangling)\ +38 The Moongrass' Enlightenment_20221102-20221118 (Nahida, Razor, Noelle, Bennett) 1 Born of Ocean Swell_20211124-20211214 (Eula, Rosaria, Noelle, Bennett)\ 2 Invitation to Mundane Life_20220105-20220125 (Xiao, Yun Jin, Ningguang, Chongyun)\ @@ -85,7 +86,8 @@ Notes: 8 Gentry of Hermitage_20220824-20220909 (Zhongli, Collei, Diona, Fischl)\ 9 Drifting Luminescence_20220909-20220927 (Sangonomiya Kokomi, Dori, Sucrose, Xingqiu)\ 10 Ballad in Goblets_20220928-20221014 (Venti, Candace, Kuki Shinobu, Sayu)\ -11 Secretum Secretorum_20221014-20221101 (Albedo, Beidou, Barbara, Xiangling) +11 Secretum Secretorum_20221014-20221101 (Albedo, Beidou, Barbara, Xiangling)\ +12 Tapestry of Golden Flames_20221102-20221118 (Yoimiya, Razor, Noelle, Bennett) 1 Epitome Invocation_20200928-20201018 (Aquila Favonia, Amos' Bow, The Flute, The Bell, The Widsith, The Stringless, Favonius Lance)\ 2 Epitome Invocation_20201020-20201109 (Lost Prayer to the Sacred Winds, Wolf's Gravestone, Sacrificial Sword, Sacrificial Bow, Sacrificial Greatsword, Sacrificial Fragments, Dragon's Bane)\ @@ -122,7 +124,8 @@ Notes: 33 Epitome Invocation_20220824-20220909 (Hunter's Path, Vortex Vanquisher, Favonius Sword, The Bell, Favonius Lance, Favonius Codex, The Stringless)\ 34 Epitome Invocation_20220909-20220927(Everlasting Moonglow, Amos' Bow, Sacrificial Sword, Favonius Greatsword, Dragon's Bane, Eye of Perception, Rust) \ 35 Epitome Invocation_20220928-20221014 (Staff of the Scarlet Sands, Elegy for the End, Makhaira Aquamarine, Lion's Roar, Favonius Lance, Sacrificial Fragments, Favonius Warbow)\ -36 Epitome Invocatio_20221014-20221101 (Key of Khaj-Nisut, Primordial Jade Cutter, Xiphos' Moonlight, Wandering Evenstar, Rainslasher, Dragon's Bane, Sacrificial Bow) +36 Epitome Invocatio_20221014-20221101 (Key of Khaj-Nisut, Primordial Jade Cutter, Xiphos' Moonlight, Wandering Evenstar, Rainslasher, Dragon's Bane, Sacrificial Bow)\ +37 Epitome Invocatio_20221102-20221118 (A Thousand Floating Dreams, Thundering Pulse, The Flute, Sacrificial Greatsword, Favonius Lance, The Widsith, Rust) 1 Wanderlust Invocation_20200928-20201222\ 2 Wanderlust Invocation_20201223-20210427 (Added Diona and Xinyan)\ @@ -177,7 +180,8 @@ Notes: 34 巡御蘙荟_20220824-20220909 (提纳里, 柯莱, 迪奥娜, 菲谢尔)\ 35 浮生孰来_20220909-20220927 (甘雨, 多莉, 砂糖, 行秋)\ 36 雳裁冥昭_20220928-20221014 (赛诺, 坎蒂丝, 久岐忍, 早柚)\ -37 翩舞歈莲_20221014-20221101 (妮露, 北斗, 芭芭拉, 香菱) +37 翩舞歈莲_20221014-20221101 (妮露, 北斗, 芭芭拉, 香菱)\ +38 月草的赐慧_20221102-20221118 (纳西妲, 雷泽, 诺艾尔, 班尼特) 1 浪涌之瞬_20211124-20211214 (优菈, 罗莎莉亚, 诺艾尔, 班尼特)\ 2 烟火之邀_20220105-20220125 (魈, 云堇, 凝光, 重云)\ @@ -189,7 +193,8 @@ Notes: 8 陵薮市朝_20220824-20220909 (钟离, 柯莱, 迪奥娜, 菲谢尔)\ 9 浮岳虹珠_20220909-20220927 (珊瑚宫心海, 多莉, 砂糖, 行秋)\ 10 杯装之诗_20220928-20221014 (温迪, 坎蒂丝, 久岐忍, 早柚)\ -11 深秘之息_20221014-20221101 (阿贝多, 北斗, 芭芭拉, 香菱) +11 深秘之息_20221014-20221101 (阿贝多, 北斗, 芭芭拉, 香菱)\ +12 焰色天河_20221102-20221118 (宵宫, 雷泽, 诺艾尔, 班尼特) 1 神铸赋形_20200928-20201018 (风鹰剑, 阿莫斯之弓, 笛剑, 钟剑, 流浪乐章, 绝弦, 西风长枪)\ 2 神铸赋形_20201020-20201109 (四风原典, 狼的末路, 祭礼剑, 祭礼弓, 祭礼大剑, 祭礼残章, 匣里灭辰)\ @@ -226,7 +231,8 @@ Notes: 33 神铸赋形_20220824-20220909 (猎人之径, 贯虹之槊, 西风剑, 钟剑, 西风长枪, 西风秘典, 绝弦)\ 34 神铸赋形_20220909-20220927 (不灭月华, 阿莫斯之弓, 祭礼剑, 西风大剑, 匣里灭辰, 昭心, 弓藏)\ 35 神铸赋形_20220928-20221014 (赤沙之杖, 终末嗟叹之诗, 玛海菈的水色, 匣里龙吟, 西风长枪, 祭礼残章, 西风猎弓)\ -36 神铸赋形_20221014-20221101 (圣显之钥, 磐岩结绿, 西福斯的月光, 流浪的晚星, 雨裁, 匣里灭辰, 祭礼弓) +36 神铸赋形_20221014-20221101 (圣显之钥, 磐岩结绿, 西福斯的月光, 流浪的晚星, 雨裁, 匣里灭辰, 祭礼弓)\ +37 神铸赋形_20221102-20221118 (千夜浮梦, 飞雷之弦振, 笛剑, 祭礼大剑, 西风长枪, 流浪乐章, 弓藏) 1 奔行世间_20200928-20201222\ 2 奔行世间_20201223-20210427 (新增迪奥娜和辛焱)\ @@ -281,7 +287,8 @@ Notes: 34 深き森の巡回者_20220824-20220909 (ティナリ, コレイ, ディオナ, フィッシュル)\ 35 逸俗逡巡_20220909-20220927 (甘雨, ドリー, スクロース, 行秋)\ 36 冥昼の裁定_20220928-20221014 (セノ, キャンディス, 久岐忍, 早柚)\ -37 優々たる蓮歌の舞_20221014-20221101 (ニィロウ, 北斗, バーバラ, 香菱) +37 優々たる蓮歌の舞_20221014-20221101 (ニィロウ, 北斗, バーバラ, 香菱)\ +38 叡智を恵む月見草_20221102-20221118 (ナヒーダ, レザー, ノエル, ベネット) 1 波折りの刹那_20211124-20211214 (エウルア, ロサリア, ノエル, ベネット)\ 2 灯宴の招き_20220105-20220125 (魈, 雲菫, 凝光, 重雲)\ @@ -293,7 +300,8 @@ Notes: 8 大隠朝市_20220824-20220909 (鍾離, コレイ, ディオナ, フィッシュル)\ 9 海原に浮かぶ虹珠_20220909-20220927 (珊瑚宮心海, ドリー, スクロース, 行秋)\ 10 杯に注がれた詩_20220928-20221014 (ウェンティ, キャンディス, 久岐忍, 早柚)\ -11 深秘の生息_20221014-20221101 (アルベド, 北斗, バーバラ, 香菱) +11 深秘の生息_20221014-20221101 (アルベド, 北斗, バーバラ, 香菱)\ +12 天の川に咲きし大輪_20221102-20221118 (宵宮, レザー, ノエル, ベネット) 1 神鋳賦形_20200928-20201018 (風鷹剣, アモスの弓, 笛の剣, 鐘の剣, 流浪楽章, 絶弦, 西風長槍)\ 2 神鋳賦形_20201020-20201109 (四風原典, 狼の末路, 祭礼の剣, 祭礼の弓, 祭礼の大剣, 祭礼の断片, 匣中滅龍)\ @@ -330,7 +338,8 @@ Notes: 33 神鋳賦形_20220824-20220909 (狩人の道, 破天の槍, 西風剣, 鐘の剣, 西風長槍, 西風秘典, 絶弦)\ 34 神鋳賦形_20220909-20220927 (不滅の月華, アモスの弓, 祭礼の剣, 西風大剣, 匣中滅龍, 昭心, 弓蔵)\ 35 神鋳賦形_20220928-20221014 (赤砂の杖, 終焉を嘆く詩, マカイラの水色, 匣中龍吟, 西風長槍, 祭礼の断片, 西風猟弓)\ -36 神鋳賦形_20221014-20221101 (聖顕の鍵, 磐岩結緑, サイフォスの月明かり, 彷徨える星, 雨裁, 匣中滅龍, 祭礼の弓) +36 神鋳賦形_20221014-20221101 (聖顕の鍵, 磐岩結緑, サイフォスの月明かり, 彷徨える星, 雨裁, 匣中滅龍, 祭礼の弓)\ +37 神鋳賦形_20221102-20221118 (千夜に浮かぶ夢, 飛雷の鳴弦, 笛の剣, 祭礼の大剣, 西風長槍, 流浪楽章, 弓蔵) 1 奔走世間_20200928-20201222\ 2 奔走世間_20201223-20210427 (ディオナと辛炎を追加)\ diff --git a/cn_item.h b/cn_item.h index e18965b..6e2172d 100644 --- a/cn_item.h +++ b/cn_item.h @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #ifndef CN_ITEM_H #define CN_ITEM_H 1 // mark it 0 if encoding error occurs @@ -132,16 +132,16 @@ #define CN_C_126 "浮金的誓愿·坎蒂丝(水)" #define CN_C_127 "弓·猎人之径" #define CN_C_128 "绮思晚星·莱依拉(冰)" -#define CN_C_129 "珐露珊" +#define CN_C_129 "机逐封秘·珐露珊(风)" #define CN_C_130 "米卡" #define CN_C_131 "单手剑·圣显之钥" #define CN_C_132 "长柄武器·赤沙之杖" #define CN_C_133 "单手剑·西福斯的月光" #define CN_C_134 "双手剑·玛海菈的水色" #define CN_C_135 "法器·流浪的晚星" -#define CN_C_136 "Placeholder" -#define CN_C_137 "Placeholder" -#define CN_C_138 "Placeholder" +#define CN_C_136 "法器·千夜浮梦" +#define CN_C_137 "久世浮倾·流浪者(风)" +#define CN_C_138 "卡维" #define CN_C_139 "Placeholder" #define CN_C_140 "Placeholder" #define CN_C_141 "Placeholder" @@ -395,9 +395,9 @@ #define CN_X_133 "西福斯的月光" #define CN_X_134 "玛海菈的水色" #define CN_X_135 "流浪的晚星" -#define CN_X_136 "Placeholder" -#define CN_X_137 "Placeholder" -#define CN_X_138 "Placeholder" +#define CN_X_136 "千夜浮梦" +#define CN_X_137 "流浪者" +#define CN_X_138 "卡维" #define CN_X_139 "Placeholder" #define CN_X_140 "Placeholder" #define CN_X_141 "Placeholder" @@ -719,13 +719,14 @@ #define CN_D_121 "艾尔海森" #define CN_D_122 "迪希雅" #define CN_D_123 "祖拜尔剧场的知名舞者，舞姿灵动优美，为人纯真亲善。" -#define CN_D_124 "纳西妲" +#define CN_D_124 "深居净善宫的笼中之鸟，只能在梦中将世界尽收眼底。" #define CN_D_125 \ "教令院内负责监管学者们的「大风纪官」。工作时比刹诃伐罗学院制作的「大风机关" \ "」更有效率。" #define CN_D_126 "有着琥珀色左眼的赤王后裔，阿如村的守护者。" #define CN_D_127 "以珍贵的白枝制成的饰金猎弓，曾经射落无数侵入森林的恶兽。" -#define CN_D_128 "莱依拉" +#define CN_D_128 \ + "专攻理论星相学的梨多梵谛学院学生。时常梦游，长期缺觉，饱受睡眠问题困扰。" #define CN_D_129 "珐露珊" #define CN_D_130 "米卡" #define CN_D_131 \ @@ -738,9 +739,9 @@ #define CN_D_134 "一柄光泽如水的古老大剑，经过千年流沙磨洗，锋刃依然锐利异常。" #define CN_D_135 \ "原本是学者用于观测与计算天象的古老仪器。具有传导力量，作为法器的能力。" -#define CN_D_136 "Placeholder" -#define CN_D_137 "Placeholder" -#define CN_D_138 "Placeholder" +#define CN_D_136 "浮映千夜之梦的灯盏，苍翠的光中流溢着遥世的歌。" +#define CN_D_137 "流浪者" +#define CN_D_138 "卡维" #define CN_D_139 "Placeholder" #define CN_D_140 "Placeholder" #define CN_D_141 "Placeholder" @@ -903,7 +904,7 @@ #define CN_CBI_35 "浮生孰来_20220909-20220927 (甘雨, 多莉, 砂糖, 行秋)" #define CN_CBI_36 "雳裁冥昭_20220928-20221014 (赛诺, 坎蒂丝, 久岐忍, 早柚)" #define CN_CBI_37 "翩舞歈莲_20221014-20221101 (妮露, 北斗, 芭芭拉, 香菱)" -#define CN_CBI_38 "Placeholder" +#define CN_CBI_38 "月草的赐慧_20221102-20221118 (纳西妲, 雷泽, 诺艾尔, 班尼特)" #define CN_CBI_39 "Placeholder" #define CN_CBI_40 "Placeholder" #define CN_CBI_41 "Placeholder" @@ -942,7 +943,7 @@ #define CN_CBII_9 "浮岳虹珠_20220909-20220927 (珊瑚宫心海, 多莉, 砂糖, 行秋)" #define CN_CBII_10 "杯装之诗_20220928-20221014 (温迪, 坎蒂丝, 久岐忍, 早柚)" #define CN_CBII_11 "深秘之息_20221014-20221101 (阿贝多, 北斗, 芭芭拉, 香菱)" -#define CN_CBII_12 "Placeholder" +#define CN_CBII_12 "焰色天河_20221102-20221118 (宵宫, 雷泽, 诺艾尔, 班尼特)" #define CN_CBII_13 "Placeholder" #define CN_CBII_14 "Placeholder" #define CN_CBII_15 "Placeholder" @@ -1071,7 +1072,9 @@ #define CN_WB_36 \ "神铸赋形_20221014-20221101 (圣显之钥, 磐岩结绿, 西福斯的月光, 流浪的晚星, " \ "雨裁, 匣里灭辰, 祭礼弓)" -#define CN_WB_37 "Placeholder" +#define CN_WB_37 \ + "神铸赋形_20221102-20221118 (千夜浮梦, 飞雷之弦振, 笛剑, 祭礼大剑, " \ + "西风长枪, 流浪乐章, 弓藏)" #define CN_WB_38 "Placeholder" #define CN_WB_39 "Placeholder" #define CN_WB_40 "Placeholder" @@ -1156,7 +1159,7 @@ #define CN_V_15 "2.8版本 「仲夏！幻夜？奇想曲！」" #define CN_V_16 "3.0版本 「千朵玫瑰带来的黎明」" #define CN_V_17 "3.1版本 「赤土之王与三朝圣者」" -#define CN_V_18 "Placeholder" +#define CN_V_18 "3.2版本 「虚空鼓动，劫火高扬」" #define CN_V_19 "Placeholder" #define CN_V_20 "Placeholder" #define CN_V_21 "Placeholder" diff --git a/en_item.h b/en_item.h index 9d25c31..fef9631 100644 --- a/en_item.h +++ b/en_item.h @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #ifndef EN_ITEM_H #define EN_ITEM_H 1 // mark it 0 if encoding error occurs @@ -132,16 +132,16 @@ #define EN_C_126 "\"Golden Vow\" Candace (Hydro)" #define EN_C_127 "Hunter's Path (Bow)" #define EN_C_128 "\"Fantastical Evening Star\" Layla (Cryo)" -#define EN_C_129 "Faruzan" +#define EN_C_129 "\"Enigmatic Machinist\" Faruzan (Anemo)" #define EN_C_130 "Mika" #define EN_C_131 "Key of Khaj-Nisut (Sword)" #define EN_C_132 "Staff of the Scarlet Sands (Polearm)" #define EN_C_133 "Xiphos' Moonlight (Sword)" #define EN_C_134 "Makhaira Aquamarine (Claymore)" #define EN_C_135 "Wandering Evenstar (Catalyst)" -#define EN_C_136 "Placeholder" -#define EN_C_137 "Placeholder" -#define EN_C_138 "Placeholder" +#define EN_C_136 "A Thousand Floating Dreams (Catalyst)" +#define EN_C_137 "\"Eons Adrift\" Wanderer (Anemo)" +#define EN_C_138 "Kaveh" #define EN_C_139 "Placeholder" #define EN_C_140 "Placeholder" #define EN_C_141 "Placeholder" @@ -395,9 +395,9 @@ #define EN_X_133 "Xiphos' Moonlight" #define EN_X_134 "Makhaira Aquamarine" #define EN_X_135 "Wandering Evenstar" -#define EN_X_136 "Placeholder" -#define EN_X_137 "Placeholder" -#define EN_X_138 "Placeholder" +#define EN_X_136 "A Thousand Floating Dreams" +#define EN_X_137 "Wanderer" +#define EN_X_138 "Kaveh" #define EN_X_139 "Placeholder" #define EN_X_140 "Placeholder" #define EN_X_141 "Placeholder" @@ -912,7 +912,9 @@ #define EN_D_123 \ "The star of the Zubayr Theater. She is full of warmth and innocence, and " \ "her dances are lively and elegant." -#define EN_D_124 "Nahida" +#define EN_D_124 \ + "A caged bird secluded within the confines of the Sanctuary of Surasthana " \ + "who can only see the world in her dreams." #define EN_D_125 \ "The General Mahamatra in charge of supervising the researchers of the " \ "Akademiya. It is said that when he gets down to work, the General " \ @@ -924,7 +926,11 @@ #define EN_D_127 \ "This gilded bow was made using precious white branches. It has felled " \ "countless wicked beasts attempting to infiltrate the woods." -#define EN_D_128 "Layla" +#define EN_D_128 \ + "A Rtawahist student who specializes in Theoretical Astrology. Heavily " \ + "prone to somnambulism and locked in a grinding war with sleep " \ + "deprivation, the problem of restful slumber is a most troubling one to " \ + "her." #define EN_D_129 "Faruzan" #define EN_D_130 "Mika" #define EN_D_131 \ @@ -945,9 +951,11 @@ #define EN_D_135 \ "This was originally a device used by researchers to observe and perform " \ "calculations on celestial phenomena. It serves as a conduit and catalyst." -#define EN_D_136 "Placeholder" -#define EN_D_137 "Placeholder" -#define EN_D_138 "Placeholder" +#define EN_D_136 \ + "This lamp illuminates the dreams that float up over a thousand nights, " \ + "and in its emerald-green light flows a song of ancient days." +#define EN_D_137 "Wanderer" +#define EN_D_138 "Kaveh" #define EN_D_139 "Placeholder" #define EN_D_140 "Placeholder" #define EN_D_141 "Placeholder" @@ -1154,7 +1162,9 @@ "Twilight Arbiter_20220928-20221014 (Cyno, Candace, Kuki Shinobu, Sayu)" #define EN_CBI_37 \ "Twirling Lotus_20221014-20221101 (Nilou, Beidou, Barbara, Xiangling)" -#define EN_CBI_38 "Placeholder" +#define EN_CBI_38 \ + "The Moongrass' Enlightenment_20221102-20221118 (Nahida, Razor, Noelle, " \ + "Bennett)" #define EN_CBI_39 "Placeholder" #define EN_CBI_40 "Placeholder" #define EN_CBI_41 "Placeholder" @@ -1208,7 +1218,9 @@ "Ballad in Goblets_20220928-20221014 (Venti, Candace, Kuki Shinobu, Sayu)" #define EN_CBII_11 \ "Secretum Secretorum_20221014-20221101 (Albedo, Beidou, Barbara, Xiangling)" -#define EN_CBII_12 "Placeholder" +#define EN_CBII_12 \ + "Tapestry of Golden Flames_20221102-20221118 (Yoimiya, Razor, Noelle, " \ + "Bennett)" #define EN_CBII_13 "Placeholder" #define EN_CBII_14 "Placeholder" #define EN_CBII_15 "Placeholder" @@ -1365,7 +1377,10 @@ "Epitome Invocatio_20221014-20221101 (Key of Khaj-Nisut, Primordial Jade " \ "Cutter, Xiphos' Moonlight, Wandering Evenstar, Rainslasher, Dragon's " \ "Bane, Sacrificial Bow)" -#define EN_WB_37 "Placeholder" +#define EN_WB_37 \ + "Epitome Invocatio_20221102-20221118 (A Thousand Floating Dreams, " \ + "Thundering Pulse, The Flute, Sacrificial Greatsword, Favonius Lance, The " \ + "Widsith, Rust)" #define EN_WB_38 "Placeholder" #define EN_WB_39 "Placeholder" #define EN_WB_40 "Placeholder" @@ -1453,7 +1468,7 @@ #define EN_V_15 "Version 2.8 \"Summer Fantasia\"" #define EN_V_16 "Version 3.0 \"The Morn a Thousand Roses Brings\"" #define EN_V_17 "Version 3.1 \"King Deshret and the Three Magi\"" -#define EN_V_18 "Placeholder" +#define EN_V_18 "Version 3.2 \"Akasha Pulses, the Kalpa Flame Rises\"" #define EN_V_19 "Placeholder" #define EN_V_20 "Placeholder" #define EN_V_21 "Placeholder" diff --git a/giwscli.cpp b/giwscli.cpp index c89a8ac..f774364 100644 --- a/giwscli.cpp +++ b/giwscli.cpp @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #include "giwscli.h" @@ -93,16 +93,16 @@ const size_t giwscli::four_stars_c[31] = {15, 16, 17, 18, 19, 20, 21, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 79, 80, 82, 83, 84, 88, 102, 103, 104, 133, 134, 135}, - giwscli::five_stars_c[30] = {0, 1, 2, 3, 4, 63, - 64, 65, 66, 67, 68, 69, - 70, 72, 86, 89, 90, 94, - 96, 99, 105, 109, 111, 114, - 119, 121, 122, 123, 124, 125}, - giwscli::five_stars_w[32] = { - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 73, - 74, 75, 76, 77, 78, 81, 85, 87, 92, 93, 97, - 98, 101, 107, 110, 112, 113, 117, 127, 131, 132}; -const size_t giwscli::tempga1[38][3] = { + giwscli::five_stars_c[31] = {0, 1, 2, 3, 4, 63, 64, + 65, 66, 67, 68, 69, 70, 72, + 86, 89, 90, 94, 96, 99, 105, + 109, 111, 114, 119, 121, 122, 123, + 124, 125, 137}, + giwscli::five_stars_w[33] = { + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 73, + 74, 75, 76, 77, 78, 81, 85, 87, 92, 93, 97, + 98, 101, 107, 110, 112, 113, 117, 127, 131, 132, 136}; +const size_t giwscli::tempga1[39][3] = { {MAX_ITEMS, MAX_ITEMS, MAX_ITEMS}, // 0 {22, 26, 30}, // 1 {17, 20, 24}, // 2 @@ -140,10 +140,11 @@ const size_t giwscli::tempga1[38][3] = { {18, 22, 118}, // 34 {17, 24, 120}, // 35 {91, 115, 126}, // 36 - {25, 26, 30} // 37 + {25, 26, 30}, // 37 + {20, 21, 28} // 38 }; // MID_MOD -const size_t giwscli::tempga2[38][3] = { +const size_t giwscli::tempga2[39][3] = { {MAX_ITEMS, MAX_ITEMS, MAX_ITEMS}, // 0 {22, 26, 30}, // 1 {17, 20, 24}, // 2 @@ -181,15 +182,16 @@ const size_t giwscli::tempga2[38][3] = { {18, 22, MAX_ITEMS}, // 34 {17, 24, MAX_ITEMS}, // 35 {91, 115, MAX_ITEMS}, // 36 - {25, 26, 30} // 37 + {25, 26, 30}, // 37 + {20, 21, 28} // 38 }; -const size_t giwscli::tempga3[38] = { +const size_t giwscli::tempga3[39] = { MAX_ITEMS, 63, 64, 65, 66, 67, 68, 69, 0, 70, 63, 65, 66, 72, 64, 86, 89, 90, 96, 94, 65, 70, 67, 105, 109, 66, - 99, 96, 111, 89, 114, 105, 86, 90, 119, 68, 125, 123}; + 99, 96, 111, 89, 114, 105, 86, 90, 119, 68, 125, 123, 124}; -const size_t giwscli::tempgb1[12][3] = { +const size_t giwscli::tempgb1[13][3] = { {MAX_ITEMS, MAX_ITEMS, MAX_ITEMS}, // 0 {15, 20, 21}, // 1 {19, 23, 108}, // 2 @@ -201,10 +203,11 @@ const size_t giwscli::tempgb1[12][3] = { {18, 22, 118}, // 8 {17, 24, 120}, // 9 {91, 115, 126}, // 10 - {25, 26, 30} // 11 + {25, 26, 30}, // 11 + {20, 21, 28} // 12 }; -const size_t giwscli::tempgb2[12][3] = { +const size_t giwscli::tempgb2[13][3] = { {MAX_ITEMS, MAX_ITEMS, MAX_ITEMS}, // 0 {15, 20, 21}, // 1 {19, 23, MAX_ITEMS}, // 2 @@ -216,13 +219,14 @@ const size_t giwscli::tempgb2[12][3] = { {18, 22, MAX_ITEMS}, // 8 {17, 24, MAX_ITEMS}, // 9 {91, 115, MAX_ITEMS}, // 10 - {25, 26, 30} // 11 + {25, 26, 30}, // 11 + {20, 21, 28} // 12 }; -const size_t giwscli::tempgb3[12] = {MAX_ITEMS, 72, 69, 68, 94, 63, - 69, 64, 66, 94, 63, 67}; +const size_t giwscli::tempgb3[13] = {MAX_ITEMS, 72, 69, 68, 94, 63, 69, + 64, 66, 94, 63, 67, 90}; -const size_t giwscli::tempgc1[37][2] = { +const size_t giwscli::tempgc1[38][2] = { {MAX_ITEMS, MAX_ITEMS}, // 0 {5, 14}, // 1 {7, 11}, // 2 @@ -259,10 +263,11 @@ const size_t giwscli::tempgc1[37][2] = { {74, 127}, // 33 {98, 5}, // 34 {132, 81}, // 35 - {131, 77} // 36 + {131, 77}, // 36 + {136, 93} // 37 }; -const size_t giwscli::tempgc2[37][5] = { +const size_t giwscli::tempgc2[38][5] = { {MAX_ITEMS, MAX_ITEMS, MAX_ITEMS, MAX_ITEMS, MAX_ITEMS}, // 0 {34, 38, 40, 44, 48}, // 1 {33, 37, 41, 43, 49}, // 2 @@ -299,10 +304,11 @@ const size_t giwscli::tempgc2[37][5] = { {34, 39, 40, 44, 49}, // 33 {32, 36, 41, 45, 47}, // 34 {134, 35, 37, 40, 46}, // 35 - {133, 135, 33, 41, 42} // 36 + {133, 135, 33, 41, 42}, // 36 + {32, 38, 40, 43, 48} // 37 }; -const size_t giwscli::tempgc3[37][5] = { +const size_t giwscli::tempgc3[38][5] = { {MAX_ITEMS, MAX_ITEMS, MAX_ITEMS, MAX_ITEMS, MAX_ITEMS}, // 0 {34, 38, 40, 44, 48}, // 1 {33, 37, 41, 43, 49}, // 2 @@ -339,10 +345,11 @@ const size_t giwscli::tempgc3[37][5] = { {34, 39, 40, 44, 49}, // 33 {32, 36, 41, 45, 47}, // 34 {MAX_ITEMS, 35, 37, 40, 46}, // 35 - {MAX_ITEMS, MAX_ITEMS, 33, 41, 42} // 36 + {MAX_ITEMS, MAX_ITEMS, 33, 41, 42}, // 36 + {32, 38, 40, 43, 48} // 37 }; -const size_t giwscli::tempgc4[37][2] = { +const size_t giwscli::tempgc4[38][2] = { {MAX_ITEMS, MAX_ITEMS}, // 0 {5, 14}, // 1 {7, 11}, // 2 @@ -379,7 +386,8 @@ const size_t giwscli::tempgc4[37][2] = { {MAX_ITEMS, MAX_ITEMS}, // 33 {MAX_ITEMS, 5}, // 34 {MAX_ITEMS, MAX_ITEMS}, // 35 - {MAX_ITEMS, MAX_ITEMS} // 36 + {MAX_ITEMS, MAX_ITEMS}, // 36 + {MAX_ITEMS, MAX_ITEMS} // 37 }; const size_t giwscli::nup_four_cg31[14] = {17, 19, 20, 21, 22, 23, 24, @@ -419,10 +427,10 @@ const size_t giwscli::nup_four_cg313[28] = { const size_t giwscli::nup_four_cg314[29] = { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 71, 91, 95, 100, 106, 108, 115, 116, 118, 120, 126, 128}; -const ptrdiff_t giwscli::tempga4[17] = {0, 1, 0, 2, 3, 0, 4, 5, 0, - 6, 0, 7, 0, 8, 9, 10, 11}; -const ptrdiff_t giwscli::tempgb4[12] = {0, 22, 24, 25, 27, 28, - 30, 32, 34, 35, 36, 37}; +const ptrdiff_t giwscli::tempga4[18] = {0, 1, 0, 2, 3, 0, 4, 5, 0, + 6, 0, 7, 0, 8, 9, 10, 11, 12}; +const ptrdiff_t giwscli::tempgb4[13] = {0, 22, 24, 25, 27, 28, 30, + 32, 34, 35, 36, 37, 38}; unsigned int giwscli::resultt = 0; unsigned int giwscli::resultu = 0; unsigned int giwscli::star = 0; @@ -554,6 +562,9 @@ int giwscli::pool_stair_1(ptrdiff_t chosen_event_p) { } else if (chosen_event_p < 38) { set_pool_check += set_pool_1(chosen_event_p, 24, 6, nup_four_cg12, nup_five_c2); + } else if (chosen_event_p < 39) { + set_pool_check += + set_pool_1(chosen_event_p, 25, 6, nup_four_cg13, nup_five_c2); } else { error_code = 5; } @@ -584,6 +595,9 @@ int giwscli::pool_stair_2(ptrdiff_t chosen_event_p) { } else if (chosen_event_p < 12) { set_pool_check += set_pool_2(chosen_event_p, 24, 6, nup_four_cg12, nup_five_c2); + } else if (chosen_event_p < 13) { + set_pool_check += + set_pool_2(chosen_event_p, 25, 6, nup_four_cg13, nup_five_c2); } else { error_code = 5; } @@ -632,6 +646,9 @@ int giwscli::pool_stair_3(ptrdiff_t chosen_event_p) { } else if (chosen_event_p < 37) { set_pool_check += set_pool_3(chosen_event_p, 24, 6, nup_four_cg12, nup_five_c2); + } else if (chosen_event_p < 38) { + set_pool_check += + set_pool_3(chosen_event_p, 25, 6, nup_four_cg13, nup_five_c2); } else { error_code = 5; } @@ -843,11 +860,11 @@ int giwscli::core_f_1() { kind = rspick(up_four_g, 3); four_star_guarantee_number = false; } else { - if (unmet4_c < 17 && unmet4_w < 17) { + if (unmet4_c < 18 && unmet4_w < 18) { const ptrdiff_t weight1[2] = {255, 255}; resultu = WRSpick(weight1, 2); switch_0(); - } else if (unmet4_c > 16) { + } else if (unmet4_c > 17) { const ptrdiff_t weight1[2] = {255 + 2550 * (unmet4_c - 16), 255}; resultu = WRSpick(weight1, 2); switch_0(); @@ -871,10 +888,8 @@ int giwscli::core_f_1() { int giwscli::core_f_3() { if (five_star_assurance_number < 63) { five_weight = 70; - } else if (five_star_assurance_number < 74) { - five_weight = 70 + 700 * (five_star_assurance_number - 62); } else { - five_weight = 7770 + 350 * (five_star_assurance_number - 73); + five_weight = 70 + 700 * (five_star_assurance_number - 62); } if (four_star_assurance_number < 8) { four_weight = 600; @@ -998,11 +1013,11 @@ int giwscli::core_f_4() { four_pity[10]++; } four_star_assurance_number = 0; - if (unmet4_c < 17 && unmet4_w < 17) { + if (unmet4_c < 18 && unmet4_w < 18) { const ptrdiff_t weight3[2] = {255, 255}; resultu = WRSpick(weight3, 2); switch_6(); - } else if (unmet4_c > 16) { + } else if (unmet4_c > 17) { const ptrdiff_t weight3[2] = {255 + 2550 * (unmet4_c - 16), 255}; resultu = WRSpick(weight3, 2); switch_6(); diff --git a/giwscli.h b/giwscli.h index d36e8b8..b4ab8b0 100644 --- a/giwscli.h +++ b/giwscli.h @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #ifndef GIWSCLI_H #define GIWSCLI_H 1 @@ -6,7 +6,7 @@ #include #include -#define MAX_ITEMS 136 +#define MAX_ITEMS 139 namespace giwscli { extern std::random_device seed_gen; @@ -28,14 +28,14 @@ extern const size_t nup_five_c1[5], nup_five_c2[6], nup_five_w[10], nup_four_cg3[14], nup_four_cg4[15], nup_four_cg5[16], nup_four_cg6[17], nup_four_cg7[18], nup_four_cg8[19], nup_four_cg9[20], nup_four_cg10[21], nup_four_cg11[22], nup_four_cg12[24], nup_four_cg13[25], nup_four_cg14[26], - tempga1[38][3], tempga2[38][3], tempga3[38], tempgb1[12][3], tempgb2[12][3], - tempgb3[12], tempgc1[37][2], tempgc2[37][5], tempgc3[37][5], tempgc4[37][2], + tempga1[39][3], tempga2[39][3], tempga3[39], tempgb1[13][3], tempgb2[13][3], + tempgb3[13], tempgc1[38][2], tempgc2[38][5], tempgc3[38][5], tempgc4[38][2], nup_four_cg31[14], nup_four_cg32[16], nup_four_cg33[17], nup_four_cg34[18], nup_four_cg35[19], nup_four_cg36[20], nup_four_cg37[21], nup_four_cg38[22], nup_four_cg39[23], nup_four_cg310[24], nup_four_cg311[25], nup_four_cg312[27], nup_four_cg313[28], nup_four_cg314[29], - four_stars_c[31], four_stars_w[30], five_stars_c[30], five_stars_w[32]; -extern const ptrdiff_t tempga4[17], tempgb4[12]; + four_stars_c[31], four_stars_w[30], five_stars_c[31], five_stars_w[33]; +extern const ptrdiff_t tempga4[18], tempgb4[13]; extern unsigned int resultt, resultu, star, type; extern ptrdiff_t chosen_event, chosen_banner, unmet4_c, unmet4_w, unmet5_c, unmet5_w, switch_e_should_be, switch_e_sav, four_star_assurance_number, diff --git a/jp_item.h b/jp_item.h index ac73dc7..40ea2b1 100644 --- a/jp_item.h +++ b/jp_item.h @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #ifndef JP_ITEM_H #define JP_ITEM_H 1 // mark it 0 if encoding error occurs @@ -132,16 +132,16 @@ #define JP_C_126 "浮金の誓願・キャンディス（水）" #define JP_C_127 "弓・狩人の道" #define JP_C_128 "綺思と夜星・レイラ（氷）" -#define JP_C_129 "ファルザン" +#define JP_C_129 "機求封秘・ファルザン（風）" #define JP_C_130 "ミカ" #define JP_C_131 "片手剣・聖顕の鍵" #define JP_C_132 "長柄武器・赤砂の杖" #define JP_C_133 "片手剣・サイフォスの月明かり" #define JP_C_134 "両手剣・マカイラの水色" #define JP_C_135 "法器・彷徨える星" -#define JP_C_136 "Placeholder" -#define JP_C_137 "Placeholder" -#define JP_C_138 "Placeholder" +#define JP_C_136 "法器・千夜に浮かぶ夢" +#define JP_C_137 "久世浮傾・放浪者（風）" +#define JP_C_138 "カーヴェ" #define JP_C_139 "Placeholder" #define JP_C_140 "Placeholder" #define JP_C_141 "Placeholder" @@ -395,9 +395,9 @@ #define JP_X_133 "サイフォスの月明かり" #define JP_X_134 "マカイラの水色" #define JP_X_135 "彷徨える星" -#define JP_X_136 "Placeholder" -#define JP_X_137 "Placeholder" -#define JP_X_138 "Placeholder" +#define JP_X_136 "千夜に浮かぶ夢" +#define JP_X_137 "放浪者" +#define JP_X_138 "カーヴェ" #define JP_X_139 "Placeholder" #define JP_X_140 "Placeholder" #define JP_X_141 "Placeholder" @@ -798,7 +798,9 @@ #define JP_D_123 \ "「ズバイルシアター」の噂に名高い踊り子。そのダンスはしなやかで美しく、彼女" \ "自身も優しく純粋な心で人と接する。" -#define JP_D_124 "ナヒーダ" +#define JP_D_124 \ + "スラサタンナ聖処に幽棲する籠の中の鳥。夢の中でしか世界を眺めることができな" \ + "い。" #define JP_D_125 \ "教令院の学者たちを監督する「大マハマトラ」。クシャレワー学院が作った『大マ" \ "ッハマシン』よりも効率よく仕事をこなす。" @@ -808,7 +810,9 @@ #define JP_D_127 \ "貴重な白き枝で作られた金メッキの弓。森に侵入する無数の悪しき獣を倒してきた" \ "。" -#define JP_D_128 "レイラ" +#define JP_D_128 \ + "理論占星学を専攻するルタワヒスト学院の学生。時々夢遊状態になる。寝不足が長" \ + "期にわたり続いており、睡眠障害に悩まされている。" #define JP_D_129 "ファルザン" #define JP_D_130 "ミカ" #define JP_D_131 \ @@ -826,9 +830,10 @@ #define JP_D_135 \ "元々は、学者が天象を観測し、計算するために使用していた古い装置。力を伝導で" \ "き、法器としても機能する。" -#define JP_D_136 "Placeholder" -#define JP_D_137 "Placeholder" -#define JP_D_138 "Placeholder" +#define JP_D_136 \ + "千夜の夢を映して浮かぶランプ。蒼翠の光から遥かなる世の歌が溢れ出す。" +#define JP_D_137 "放浪者" +#define JP_D_138 "カーヴェ" #define JP_D_139 "Placeholder" #define JP_D_140 "Placeholder" #define JP_D_141 "Placeholder" @@ -1027,7 +1032,8 @@ "冥昼の裁定_20220928-20221014 (セノ, キャンディス, 久岐忍, 早柚)" #define JP_CBI_37 \ "優々たる蓮歌の舞_20221014-20221101 (ニィロウ, 北斗, バーバラ, 香菱)" -#define JP_CBI_38 "Placeholder" +#define JP_CBI_38 \ + "叡智を恵む月見草_20221102-20221118 (ナヒーダ, レザー, ノエル, ベネット)" #define JP_CBI_39 "Placeholder" #define JP_CBI_40 "Placeholder" #define JP_CBI_41 "Placeholder" @@ -1079,7 +1085,8 @@ "杯に注がれた詩_20220928-20221014 (ウェンティ, キャンディス, 久岐忍, 早柚)" #define JP_CBII_11 \ "深秘の生息_20221014-20221101 (アルベド, 北斗, バーバラ, 香菱)" -#define JP_CBII_12 "Placeholder" +#define JP_CBII_12 \ + "天の川に咲きし大輪_20221102-20221118 (宵宮, レザー, ノエル, ベネット)" #define JP_CBII_13 "Placeholder" #define JP_CBII_14 "Placeholder" #define JP_CBII_15 "Placeholder" @@ -1211,7 +1218,9 @@ #define JP_WB_36 \ "神鋳賦形_20221014-20221101 (聖顕の鍵, 磐岩結緑, サイフォスの月明かり, " \ "彷徨える星, 雨裁, 匣中滅龍, 祭礼の弓)" -#define JP_WB_37 "Placeholder" +#define JP_WB_37 \ + "神鋳賦形_20221102-20221118 (千夜に浮かぶ夢, 飛雷の鳴弦, 笛の剣, " \ + "祭礼の大剣, 西風長槍, 流浪楽章, 弓蔵)" #define JP_WB_38 "Placeholder" #define JP_WB_39 "Placeholder" #define JP_WB_40 "Placeholder" @@ -1296,7 +1305,7 @@ #define JP_V_15 "Ver.2.8「常夏！幻夜？奇想曲！」" #define JP_V_16 "Ver.3.0「黎明を告げる千の薔薇」" #define JP_V_17 "Ver.3.1「赤砂の王と三人の巡礼者」" -#define JP_V_18 "Placeholder" +#define JP_V_18 "Ver.3.2「虚空の鼓動、熾盛の劫火」" #define JP_V_19 "Placeholder" #define JP_V_20 "Placeholder" #define JP_V_21 "Placeholder" diff --git a/lang.cpp b/lang.cpp index fe118dc..50e44ab 100644 --- a/lang.cpp +++ b/lang.cpp @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #include "lang.h" diff --git a/lang.h b/lang.h index dbb2e26..a8cdcea 100644 --- a/lang.h +++ b/lang.h @@ -1,4 +1,4 @@ -/*Version 3.1.3*/ +/*Version 3.2*/ #include "cn_item.h" #include "en_item.h"