diff --git a/data/age.json b/data/age.json index 839310c..9b53e52 100644 --- a/data/age.json +++ b/data/age.json @@ -11523,7 +11523,16 @@ "11471*0.1", "11472*0.1", "11473*0.1", - "11474*0.1" + "11474*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "57": { @@ -11691,7 +11700,16 @@ "11471*0.1", "11472*0.1", "11473*0.1", - "11474*0.1" + "11474*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "58": { @@ -11859,7 +11877,16 @@ "11471*0.1", "11472*0.1", "11473*0.1", - "11474*0.1" + "11474*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "59": { @@ -12027,7 +12054,16 @@ "11471*0.1", "11472*0.1", "11473*0.1", - "11474*0.1" + "11474*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "60": { @@ -12228,7 +12264,16 @@ "11449*0.05", "11450*0.05", "11469", - "20323*0.1" + "20323*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "61": { @@ -12429,7 +12474,16 @@ "11449*0.05", "11450*0.05", "11469", - "20567*0.1" + "20567*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "62": { @@ -12835,7 +12889,16 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "64": { @@ -13240,7 +13303,16 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "66": { @@ -13436,7 +13508,16 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "67": { @@ -13632,7 +13713,16 @@ "11449*0.05", "11450*0.05", "11469", - "20567*0.1" + "20567*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "68": { @@ -13828,7 +13918,16 @@ "11450*0.05", "11469", "20323*0.1", - "20567*0.1" + "20567*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "69": { @@ -14022,7 +14121,16 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "70": { @@ -14215,7 +14323,16 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "71": { @@ -14403,7 +14520,16 @@ "11448*0.05", "11449*0.05", "11450*0.05", - "11469" + "11469", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "72": { @@ -14926,7 +15052,16 @@ "11348*0.01", "11349", "20323*0.1", - "20567*0.1" + "20567*0.1", + "11475*0.05", + "11476*0.05", + "11477*0.05", + "11478*0.05", + "11479*0.05", + "11480*0.05", + "11481*0.05", + "11482*0.05", + "11483*0.05" ] }, "75": { diff --git a/data/age.xlsx b/data/age.xlsx index 19ebb6c..099c9a0 100644 Binary files a/data/age.xlsx and b/data/age.xlsx differ diff --git a/data/events.json b/data/events.json index 41498d1..22472c2 100644 --- a/data/events.json +++ b/data/events.json @@ -3658,7 +3658,7 @@ "id": 10424, "event": "日本发生8.0级地震。", "include": "EVT?[10009,10010]", - "exclude": "EVT?[10424,10425]", + "exclude": "EVT?[10424,11476,10425]", "branch": [ "SPR>9:20425" ] @@ -3667,7 +3667,7 @@ "id": 10425, "event": "日本发生9.0级地震。", "include": "EVT?[10009]", - "exclude": "EVT?[10425,10424]", + "exclude": "EVT?[10425,11476,10424]", "branch": [ "SPR>7:20425" ] @@ -3772,7 +3772,7 @@ "id": 10439, "event": "日本武力攻占珍珠港。", "include": "EVT?[10009]", - "exclude": "EVT?[10439]" + "exclude": "EVT?[10439,11476]" }, "10440": { "id": 10440, @@ -3921,7 +3921,7 @@ }, "10460": { "id": 10460, - "event": "美国宣布进入社会主义社会。", + "event": "美国爆发了第二次南北战争,南方社会主义党和北方民主党之间发生了战争,最终南方获得了胜利,美国成为了新的社会主义国家。", "include": "EVT?[10009]", "exclude": "EVT?[10460]", "branch": [ @@ -5558,13 +5558,13 @@ "id": 10698, "event": "日本动漫产业彻底灭亡。", "include": "EVT?[10011,10010]", - "exclude": "EVT?[10698]" + "exclude": "EVT?[10698,11476]" }, "10699": { "id": 10699, "event": "日本制造出最新作战兵器:高达。", "include": "EVT?[10011]", - "exclude": "EVT?[10699]" + "exclude": "EVT?[10699,11476]" }, "10700": { "id": 10700, @@ -6327,7 +6327,7 @@ "id": 10812, "event": "全球变暖严重,专家称100年内日本就会彻底沉没。", "include": "EVT?[10011]", - "exclude": "EVT?[10812]" + "exclude": "EVT?[10812,11476]" }, "10813": { "id": 10813, @@ -6623,7 +6623,7 @@ "id": 10854, "event": "爸妈带你去日本旅游。", "include": "EVT?[10822,10823]", - "exclude": "EVT?[10854,10868,10869]" + "exclude": "EVT?[10854,10868,10869,11476]" }, "10855": { "id": 10855, @@ -10690,7 +10690,7 @@ "id": 11463, "event": "你消灭了日本所有的男性。", "include": "EVT?[21457]", - "exclude": "EVT?[11463]" + "exclude": "EVT?[11463,11476]" }, "11464": { "id": 11464, @@ -10751,7 +10751,7 @@ "11470": { "id": 11470, "event": "为维护网络文明环境,日本将被和谐为月本。", - "exclude": "EVT?[11470]" + "exclude": "EVT?[11470,11476]" }, "11471": { "id": 11471, @@ -10778,12 +10778,59 @@ }, "11475": { "id": 11475, + "event": "你去听了一场电子管风琴音乐会,感觉自己的洪荒之力正在觉醒", + "effect": { + "STR": 1 + }, + "include": "(MNY>7)&(EVT?[10010])", "exclude": "EVT?[11475]" }, "11476": { "id": 11476, + "event": "小日子过得不错的国家认祖归宗,归化为恒桑省。", "exclude": "EVT?[11476]" }, + "11477": { + "id": 11477, + "event": "某孙姓漫画家沉迷摸鱼,最终放弃漫画。意外中奖一亿后,醒来发现是做梦。", + "include": "EVT?[10009]", + "exclude": "EVT?[11477]" + }, + "11478": { + "id": 11478, + "event": "某网红天天忙于相亲,导致粉丝不满,最终不得不公开宣布自己转投独身主义。", + "include": "EVT?[10009]", + "exclude": "EVT?[11478]" + }, + "11479": { + "id": 11479, + "event": "可以自主发明的发明机被发明,奇怪的发明充斥世界,引发了灾难。", + "include": "EVT?[10010]", + "exclude": "EVT?[11479]" + }, + "11480": { + "id": 11480, + "event": "国足夺得世界杯。", + "exclude": "EVT?[11480]" + }, + "11481": { + "id": 11481, + "event": "虚拟偶像王加然在一次直播中宣布与同事杜向碗成为恋人。", + "include": "EVT?[10010]", + "exclude": "EVT?[11481]" + }, + "11482": { + "id": 11482, + "event": "民间一款名为“人生重开模拟器”的游戏正在兴起,引起热议。", + "include": "EVT?[10009]", + "exclude": "EVT?[11482]" + }, + "11483": { + "id": 11483, + "event": "一位打气球摊老板被发现竟是地下军火大亨。", + "include": "EVT?[10011]", + "exclude": "EVT?[11483]" + }, "20007": { "id": 20007, "event": "你喜欢看画面人设好看的动漫。", diff --git a/data/events.xlsx b/data/events.xlsx index f9f1995..6adf8cb 100644 Binary files a/data/events.xlsx and b/data/events.xlsx differ diff --git a/data/specialthanks.json b/data/specialthanks.json index 5f360f1..01f761f 100644 --- a/data/specialthanks.json +++ b/data/specialthanks.json @@ -205,7 +205,7 @@ "41": { "id": 41, "group": 2, - "name": "爱发电用户_4KcF" + "name": "爷只想要修仙" }, "42": { "id": 42, @@ -374,8 +374,9 @@ }, "75": { "id": 75, - "group": 2, - "name": "indigle" + "group": 1, + "name": "indigle", + "comment": "Bronies,bronies everywhere." }, "76": { "id": 76, @@ -517,5 +518,325 @@ "id": 103, "group": 2, "name": "leavatain" + }, + "104": { + "id": 104, + "group": 2, + "name": "南溪潇湘" + }, + "105": { + "id": 105, + "group": 2, + "name": "弥夏" + }, + "106": { + "id": 106, + "group": 2, + "name": "午安僵尸" + }, + "107": { + "id": 107, + "group": 2, + "name": "抹茶菠萝包" + }, + "108": { + "id": 108, + "group": 2, + "name": "血溅未央" + }, + "109": { + "id": 109, + "group": 1, + "name": "千层蛋糕", + "comment": "如果可以,请拾起年少时的幻想与疯狂,那是生活不曾亏待于我们的证明" + }, + "110": { + "id": 110, + "group": 1, + "name": "零下热情", + "comment": "作者真给力,游戏真稀奇" + }, + "111": { + "id": 111, + "group": 2, + "name": "淼" + }, + "112": { + "id": 112, + "group": 2, + "name": "呆了个呆" + }, + "113": { + "id": 113, + "group": 2, + "name": "天一方" + }, + "114": { + "id": 114, + "group": 2, + "name": "冰棍雪糕" + }, + "115": { + "id": 115, + "group": 2, + "name": "番茄一碗" + }, + "116": { + "id": 116, + "group": 2, + "name": "我也不知道" + }, + "117": { + "id": 117, + "group": 2, + "name": "江子川" + }, + "118": { + "id": 118, + "group": 2, + "name": "嘿嘿567" + }, + "119": { + "id": 119, + "group": 2, + "name": "Undead恩赐" + }, + "120": { + "id": 120, + "group": 2, + "name": "安德拉" + }, + "121": { + "id": 121, + "group": 2, + "name": "rua宝rua宝rua" + }, + "122": { + "id": 122, + "group": 2, + "name": "变成光出轨奶琳小姐" + }, + "123": { + "id": 123, + "group": 2, + "name": "二哥没牛子" + }, + "124": { + "id": 124, + "group": 2, + "name": "活在梦里" + }, + "125": { + "id": 125, + "group": 2, + "name": "胖贼" + }, + "126": { + "id": 126, + "group": 2, + "name": "wairy" + }, + "127": { + "id": 127, + "group": 2, + "name": "尨图" + }, + "128": { + "id": 128, + "group": 2, + "name": "哆啦xzx梦" + }, + "129": { + "id": 129, + "group": 2, + "name": "符狸" + }, + "130": { + "id": 130, + "group": 2, + "name": "吾名洛尉迟" + }, + "131": { + "id": 131, + "group": 2, + "name": "Nybama" + }, + "132": { + "id": 132, + "group": 2, + "name": "全体目光向我看齐" + }, + "133": { + "id": 133, + "group": 2, + "name": "墨水" + }, + "134": { + "id": 134, + "group": 2, + "name": "lkaiser" + }, + "135": { + "id": 135, + "group": 2, + "name": " 鱿鱼有了忧郁症很犹豫" + }, + "136": { + "id": 136, + "group": 2, + "name": "sky_sam" + }, + "137": { + "id": 137, + "group": 2, + "name": "没人要的瓜娃子" + }, + "138": { + "id": 138, + "group": 2, + "name": "六道神" + }, + "139": { + "id": 139, + "group": 2, + "name": "Incubator" + }, + "140": { + "id": 140, + "group": 2, + "name": "雨溟" + }, + "141": { + "id": 141, + "group": 1, + "name": "印记", + "comment": "特别感谢媳妇对我事业的支持。" + }, + "142": { + "id": 142, + "group": 2, + "name": "草帽" + }, + "143": { + "id": 143, + "group": 2, + "name": "好大只36" + }, + "144": { + "id": 144, + "group": 2, + "name": "MissVIP_ms" + }, + "145": { + "id": 145, + "group": 2, + "name": "拂晓" + }, + "146": { + "id": 146, + "group": 2, + "name": "…" + }, + "147": { + "id": 147, + "group": 2, + "name": "清岗" + }, + "148": { + "id": 148, + "group": 2, + "name": "红尘多情客" + }, + "149": { + "id": 149, + "group": 2, + "name": "Akily" + }, + "150": { + "id": 150, + "group": 2, + "name": "工具人老衲" + }, + "151": { + "id": 151, + "group": 2, + "name": "小爱" + }, + "152": { + "id": 152, + "group": 2, + "name": "羊296" + }, + "153": { + "id": 153, + "group": 2, + "name": "轻幻幻啊" + }, + "154": { + "id": 154, + "group": 2, + "name": "Brinter" + }, + "155": { + "id": 155, + "group": 2, + "name": "俗人" + }, + "156": { + "id": 156, + "group": 2, + "name": "我大哥瀚青青" + }, + "157": { + "id": 157, + "group": 2, + "name": "233号咸鱼" + }, + "158": { + "id": 158, + "group": 2, + "name": "Leeeooo" + }, + "159": { + "id": 159, + "group": 2, + "name": "阿泰格" + }, + "160": { + "id": 160, + "group": 2, + "name": "⁣​ " + }, + "161": { + "id": 161, + "group": 2, + "name": "老茶树菇" + }, + "162": { + "id": 162, + "group": 1, + "name": "爱发电用户_fUH5", + "comment": "若真的可以重来,那这次人生的意义不就变了吗?" + }, + "163": { + "id": 163, + "group": 2, + "name": "Autumn_Loveworld" + }, + "164": { + "id": 164, + "group": 2, + "name": "PPCC" + }, + "165": { + "id": 165, + "group": 2, + "name": "白微瑕" + }, + "166": { + "id": 166, + "group": 1, + "name": "瓜皮", + "comment": "祝国内各位有梦想的独立游戏制作人一切顺利" } } \ No newline at end of file diff --git a/data/specialthanks.xlsx b/data/specialthanks.xlsx index 9d7f2da..f18916f 100644 Binary files a/data/specialthanks.xlsx and b/data/specialthanks.xlsx differ