Skip to content

Commit

Permalink
v3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Jirehlov committed Oct 31, 2022
1 parent 2973506 commit c6c63b2
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 110 deletions.
29 changes: 19 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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)\
Expand All @@ -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)\
Expand Down Expand Up @@ -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)\
Expand Down Expand Up @@ -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 (魈, 云堇, 凝光, 重云)\
Expand All @@ -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 (四风原典, 狼的末路, 祭礼剑, 祭礼弓, 祭礼大剑, 祭礼残章, 匣里灭辰)\
Expand Down Expand Up @@ -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 (新增迪奥娜和辛焱)\
Expand Down Expand Up @@ -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 (魈, 雲菫, 凝光, 重雲)\
Expand All @@ -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 (四風原典, 狼の末路, 祭礼の剣, 祭礼の弓, 祭礼の大剣, 祭礼の断片, 匣中滅龍)\
Expand Down Expand Up @@ -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 (ディオナと辛炎を追加)\
Expand Down
37 changes: 20 additions & 17 deletions cn_item.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 \
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
49 changes: 32 additions & 17 deletions en_item.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 " \
Expand All @@ -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 \
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading

0 comments on commit c6c63b2

Please sign in to comment.