update data

data/achievement.json

@@ -1066,7 +1066,7 @@
         "name": "刷刷刷",
         "description": "集齐橙色天赋",
         "grade": 3,
-        "condition": "(ATLT?[1023])&(ATLT?[1048])&(ATLT?[1064])&(ATLT?[1114])",
+        "condition": "(ATLT?[1023])&(ATLT?[1048])&(ATLT?[1064])&(ATLT?[1114])&(ATLT?[1135])",
         "hide": 0,
         "opportunity": "START"
     },
@@ -1342,7 +1342,7 @@
     },
     "250": {
         "id": 250,
-        "name": "你是我的了",
+        "name": "嫁衣",
         "description": "被夺舍",
         "grade": 1,
         "condition": "EVT?[40033]",
@@ -1420,5 +1420,23 @@
         "condition": "EVT?[11176]",
         "hide": 0,
         "opportunity": "TRAJECTORY"
+    },
+    "259": {
+        "id": 259,
+        "name": "你是我的了",
+        "description": "夺舍成功",
+        "grade": 2,
+        "condition": "EVT?[40083,40084]",
+        "hide": 1,
+        "opportunity": "TRAJECTORY"
+    },
+    "260": {
+        "id": 260,
+        "name": "孽魂",
+        "description": "被炼进魂幡里",
+        "grade": 1,
+        "condition": "EVT?[40070]",
+        "hide": 1,
+        "opportunity": "TRAJECTORY"
     }
 }

data/events.json

@@ -790,6 +790,7 @@
         "include": "EVT?[10084,10162,10219,20056]",
         "exclude": "(EVT?[10085,10087])|(TLT?[1017])",
         "branch": [
+            "(STR<1)&(TLT?[1135]):40062",
             "STR<1:10000"
         ]
     },
@@ -802,6 +803,7 @@
         },
         "include": "EVT?[10085]",
         "branch": [
+            "(STR<1)&(TLT?[1135]):40062",
             "STR<1:10000"
         ]
     },
@@ -2114,6 +2116,7 @@
         "include": "EVT?[10248]",
         "exclude": "EVT?[10249]",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10248]:10000"
         ]
     },
@@ -2246,6 +2249,7 @@
         "include": "EVT?[10259]",
         "exclude": "EVT?[10267]",
         "branch": [
+            "TLT?[1135]:40062",
             "INT<6:10000"
         ]
     },
@@ -2435,6 +2439,7 @@
         "exclude": "TLT?[1043]",
         "branch": [
             "EVT?[10007,10008]:30002",
+            "TLT?[1135]:40062",
             "EVT?[10009]:10000"
         ]
     },
@@ -2927,7 +2932,7 @@
             "LIF": -1
         },
         "include": "TLT?[1048]",
-        "exclude": "EVT?[10333,40001,40061]",
+        "exclude": "EVT?[10333,40001,40003,40061]",
         "branch": [
             "TLT?[1048]:10000"
         ]
@@ -2939,7 +2944,7 @@
             "LIF": -1
         },
         "include": "TLT?[1048]",
-        "exclude": "EVT?[10345,10361,40001,40061]",
+        "exclude": "EVT?[10345,10361,40001,40003,40061]",
         "branch": [
             "TLT?[1048]:10000"
         ]
@@ -3140,7 +3145,7 @@
             "INT": 2,
             "STR": 1
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])"
+        "include": "(EVT?[10365])&(INT>100)"
     },
     "10368": {
         "id": 10368,
@@ -3148,7 +3153,6 @@
         "effect": {
             "LIF": -1
         },
-        "include": "TLT?[1048]",
         "exclude": "EVT?[10365,10361,40001,40061]",
         "branch": [
             "TLT?[1048]:10000"
@@ -3160,7 +3164,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10365])&(INT>150)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>150)",
         "exclude": "EVT?[10369]"
     },
     "10370": {
@@ -3169,7 +3173,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10369])&(INT>180)&(TLT?[1048])",
+        "include": "(EVT?[10369])&(INT>180)",
         "exclude": "EVT?[10370]"
     },
     "10371": {
@@ -3178,7 +3182,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10370])&(INT>210)&(TLT?[1048])",
+        "include": "(EVT?[10370])&(INT>210)",
         "exclude": "EVT?[10371]"
     },
     "10372": {
@@ -3187,7 +3191,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10371])&(INT>240)&(TLT?[1048])",
+        "include": "(EVT?[10371])&(INT>240)",
         "exclude": "EVT?[10372]"
     },
     "10373": {
@@ -3196,7 +3200,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10372])&(INT>280)&(TLT?[1048])",
+        "include": "(EVT?[10372])&(INT>280)",
         "exclude": "EVT?[10373]"
     },
     "10374": {
@@ -3205,7 +3209,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10373])&(INT>320)&(TLT?[1048])",
+        "include": "(EVT?[10373])&(INT>320)",
         "exclude": "EVT?[10374]"
     },
     "10375": {
@@ -3214,7 +3218,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10374])&(INT>360)&(TLT?[1048])",
+        "include": "(EVT?[10374])&(INT>360)",
         "exclude": "EVT?[10375]"
     },
     "10376": {
@@ -3223,7 +3227,7 @@
         "effect": {
             "INT": 2
         },
-        "include": "(EVT?[10375])&(INT>400)&(TLT?[1048])",
+        "include": "(EVT?[10375])&(INT>400)",
         "exclude": "EVT?[10376]"
     },
     "10377": {
@@ -3233,7 +3237,7 @@
             "INT": 10,
             "STR": 10
         },
-        "include": "(EVT?[10375])&(INT>500)&(TLT?[1048])",
+        "include": "(EVT?[10375])&(INT>500)",
         "exclude": "EVT?[10377]"
     },
     "10378": {
@@ -3243,7 +3247,7 @@
             "INT": 1,
             "STR": 10
         },
-        "include": "(EVT?[10377])&(INT>500)&(TLT?[1048])",
+        "include": "(EVT?[10377])&(INT>500)",
         "exclude": "EVT?[10378]"
     },
     "10379": {
@@ -3252,7 +3256,6 @@
         "effect": {
             "LIF": -1
         },
-        "include": "TLT?[1048]",
         "exclude": "EVT?[10377]",
         "branch": [
             "TLT?[1048]:10000"
@@ -3265,7 +3268,7 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[10380]"
     },
     "10381": {
@@ -3275,7 +3278,7 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[10381]"
     },
     "10382": {
@@ -3285,7 +3288,7 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[10382]"
     },
     "10383": {
@@ -3295,7 +3298,7 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[10383]"
     },
     "10384": {
@@ -3305,7 +3308,7 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[10384]"
     },
     "10385": {
@@ -3314,7 +3317,7 @@
         "effect": {
             "INT": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])"
+        "include": "(EVT?[10365])&(INT>100)"
     },
     "10386": {
         "id": 10386,
@@ -3323,7 +3326,7 @@
             "INT": 50,
             "STR": 50
         },
-        "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>300)",
         "exclude": "EVT?[10386]"
     },
     "10387": {
@@ -3333,7 +3336,7 @@
             "INT": 50,
             "STR": 50
         },
-        "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>300)",
         "exclude": "EVT?[10387]"
     },
     "10388": {
@@ -3343,7 +3346,7 @@
             "INT": 100,
             "STR": 100
         },
-        "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>300)",
         "exclude": "EVT?[10388]"
     },
     "10389": {
@@ -3353,7 +3356,7 @@
             "INT": 75,
             "STR": 75
         },
-        "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>300)",
         "exclude": "EVT?[10389]"
     },
     "10390": {
@@ -3363,7 +3366,7 @@
             "INT": 75,
             "STR": 75
         },
-        "include": "(EVT?[10365])&(INT>300)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>300)",
         "exclude": "EVT?[10390]"
     },
     "10391": {
@@ -3923,6 +3926,7 @@
         "postEvent": "你没有搭理他。",
         "exclude": "EVT?[10458]",
         "branch": [
+            "(INT>10)&(TLT?[1135]):20462",
             "INT>10:20461"
         ]
     },
@@ -4774,6 +4778,7 @@
         "exclude": "TLT?[1072]",
         "branch": [
             "STR>9:20576",
+            "TLT?[1135]:40062",
             "EVT?[10505]:10000"
         ]
     },
@@ -6039,6 +6044,7 @@
         "exclude": "(EVT?[10768])|(TLT?[1043])",
         "branch": [
             "(EVT?[10010])&(EVT?[10007,10008]):30002",
+            "TLT?[1135]:40062",
             "STR<9:10000"
         ]
     },
@@ -8923,6 +8929,7 @@
         "include": "EVT?[10966]",
         "exclude": "EVT?[11204]",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10966]:10000"
         ]
     },
@@ -9023,6 +9030,7 @@
         "include": "EVT?[10010]",
         "exclude": "(EVT?[11219])|(TLT?[1043])",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10010]:10000"
         ]
     },
@@ -9361,6 +9369,7 @@
         "include": "EVT?[11264]",
         "exclude": "EVT?[11268]",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10010]:10000"
         ]
     },
@@ -9429,6 +9438,7 @@
         "include": "(CHR>9)&(EVT?[10010])",
         "exclude": "EVT?[11277]",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10010]:10000"
         ]
     },
@@ -9708,6 +9718,7 @@
         "include": "EVT?[10010]",
         "exclude": "(EVT?[11314,11318])|(TLT?[1016])",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10010]:10000"
         ]
     },
@@ -11093,6 +11104,7 @@
         "event": "由于你喜欢没事找事，你也试着翻围墙，结果也死了。",
         "NoRandom": 1,
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10101]:10000"
         ]
     },
@@ -11101,6 +11113,7 @@
         "event": "你想离近点看，结果被流弹击中。",
         "NoRandom": 1,
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10009]:10000"
         ]
     },
@@ -11305,13 +11318,13 @@
             "STR": 1000,
             "SPR": 10
         },
-        "include": "(EVT?[10365])&(TLT?[1048])&((TLT?[1033,1122])|(EVT?[10715]))",
+        "include": "(EVT?[10365])&((TLT?[1033,1122])|(EVT?[10715]))",
         "exclude": "EVT?[20367]"
     },
     "20369": {
         "id": 20369,
         "event": "你截杀一个金丹修士，不料被其越级反杀。",
-        "include": "(EVT?[10365])&(STR<1100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(STR<1100)",
         "branch": [
             "TLT?[1048]:10000"
         ]
@@ -11323,7 +11336,7 @@
         "effect": {
             "STR": 50
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[20380]"
     },
     "20381": {
@@ -11334,7 +11347,7 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[20381]"
     },
     "20382": {
@@ -11346,7 +11359,7 @@
             "STR": 20,
             "SPR": 2
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[20382]"
     },
     "20383": {
@@ -11357,14 +11370,14 @@
             "INT": 20,
             "STR": 20
         },
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[20383]"
     },
     "20384": {
         "id": 20384,
         "event": "你悟出了空手道。",
         "postEvent": "好像没什么用。",
-        "include": "(EVT?[10365])&(INT>100)&(TLT?[1048])",
+        "include": "(EVT?[10365])&(INT>100)",
         "exclude": "EVT?[20384]"
     },
     "20408": {
@@ -11550,7 +11563,13 @@
     },
     "20461": {
         "id": 20461,
-        "event": "你购买了一本《仙脉图录》。"
+        "event": "你购买了一本《仙脉图录》。",
+        "NoRandom": 1
+    },
+    "20462": {
+        "id": 20462,
+        "event": "你购买了一本《元神不灭》。",
+        "NoRandom": 1
     },
     "20529": {
         "id": 20529,
@@ -11595,6 +11614,7 @@
         "include": "EVT?[10011]",
         "exclude": "(TLT?[1072])|(EVT?[10578,10682])",
         "branch": [
+            "TLT?[1135]:40062",
             "EVT?[10011]:10000"
         ]
     },
@@ -11894,7 +11914,7 @@
             "SPR": 3
         },
         "include": "(TLT?[1048])&(EVT?[20461])",
-        "exclude": "EVT?[40001]"
+        "exclude": "EVT?[40001,40003]"
     },
     "40002": {
         "id": 40002,
@@ -11902,7 +11922,7 @@
         "effect": {
             "STR": 5
         },
-        "include": "EVT?[40001,40061]",
+        "include": "EVT?[40001,40003,40061]",
         "exclude": "EVT?[40010]"
     },
     "40003": {
@@ -11938,7 +11958,7 @@
         "effect": {
             "STR": 20
         },
-        "include": "EVT?[40001,40061]",
+        "include": "EVT?[40001,40003,40061]",
         "exclude": "EVT?[40010]"
     },
     "40007": {
@@ -11947,7 +11967,7 @@
         "effect": {
             "CHR": 1
         },
-        "include": "EVT?[40001,40061]",
+        "include": "EVT?[40001,40003,40061]",
         "exclude": "EVT?[40010]"
     },
     "40008": {
@@ -11957,7 +11977,7 @@
             "INT": 1,
             "STR": 3
         },
-        "include": "EVT?[40001,40061]",
+        "include": "EVT?[40001,40003,40061]",
         "exclude": "EVT?[40010]"
     },
     "40009": {
@@ -12197,7 +12217,7 @@
     "40033": {
         "id": 40033,
         "event": "你遇到一位神游境魂修大能，你被夺舍了。",
-        "include": "EVT?[40001,40061]",
+        "include": "EVT?[40001,40003,40061]",
         "exclude": "EVT?[40010,40039]",
         "branch": [
             "STR>1:10000"
@@ -12274,7 +12294,7 @@
     "40041": {
         "id": 40041,
         "event": "寿元终。",
-        "include": "EVT?[40001,40061]",
+        "include": "EVT?[40001,40003,40061]",
         "exclude": "EVT?[40050,40058]",
         "branch": [
             "STR>1:10000"
@@ -12438,5 +12458,186 @@
         },
         "include": "AEVT?[40060]",
         "exclude": "(AEVT?[40061])|(EVT?[40001])"
+    },
+    "40062": {
+        "id": 40062,
+        "event": "在你死前一刻，灵魂不知为何脱离了身体。",
+        "effect": {
+            "SPR": 1
+        },
+        "NoRandom": 1,
+        "branch": [
+            "EVT?[20462]:40063",
+            "EVT![20462]:40064"
+        ]
+    },
+    "40063": {
+        "id": 40063,
+        "event": "根据之前看过的《元神不灭》，你稳固了魂魄，并且成功跨入脱胎境，开始修炼魂修法门。",
+        "effect": {
+            "INT": 5
+        },
+        "NoRandom": 1
+    },
+    "40064": {
+        "id": 40064,
+        "event": "你的身体死了，但你的灵魂还存于世间。",
+        "postEvent": "但冥冥中知道这不会一直持续。",
+        "effect": {
+            "STR": -9999
+        },
+        "NoRandom": 1
+    },
+    "40065": {
+        "id": 40065,
+        "event": "你在人间无目的地游荡。",
+        "include": "EVT?[40064]"
+    },
+    "40066": {
+        "id": 40066,
+        "event": "你有时也会看到其他魂魄。",
+        "include": "EVT?[40065]",
+        "exclude": "EVT?[40066]"
+    },
+    "40067": {
+        "id": 40067,
+        "event": "人间发生了许多大事，但都与你无关。",
+        "include": "EVT?[40065]"
+    },
+    "40068": {
+        "id": 40068,
+        "event": "你希望能早点解脱。",
+        "include": "EVT?[40069]"
+    },
+    "40069": {
+        "id": 40069,
+        "event": "你累了",
+        "include": "EVT?[40067]"
+    },
+    "40070": {
+        "id": 40070,
+        "event": "你被一位魔修抓住，炼进了魂幡里。",
+        "include": "EVT?[40064]",
+        "branch": [
+            "EVT?[40064]:10000"
+        ]
+    },
+    "40071": {
+        "id": 40071,
+        "event": "你被一位脱胎境魂修吸收了。",
+        "include": "EVT?[40064]",
+        "branch": [
+            "EVT?[40064]:10000"
+        ]
+    },
+    "40072": {
+        "id": 40072,
+        "event": "随着时间的流逝，你渐渐消散了。",
+        "include": "EVT?[40069]",
+        "branch": [
+            "EVT?[40064]:10000"
+        ]
+    },
+    "40073": {
+        "id": 40073,
+        "event": "你到处寻找游魂吸收。",
+        "effect": {
+            "INT": 1,
+            "SPR": 1
+        },
+        "include": "EVT?[40063]",
+        "exclude": "EVT?[40075]"
+    },
+    "40074": {
+        "id": 40074,
+        "event": "固魂，智力提升。",
+        "effect": {
+            "INT": 2
+        },
+        "include": "EVT?[40063]",
+        "exclude": "EVT?[40075]"
+    },
+    "40075": {
+        "id": 40075,
+        "event": "你突破到神游境。",
+        "include": "(EVT?[40063])&(INT>50)",
+        "exclude": "EVT?[40075]"
+    },
+    "40076": {
+        "id": 40076,
+        "event": "养神，智力提升。",
+        "effect": {
+            "INT": 3
+        },
+        "include": "EVT?[40075]",
+        "exclude": "EVT?[40078]"
+    },
+    "40077": {
+        "id": 40077,
+        "event": "你到处寻找游魂和脱胎境魂修吸收。",
+        "effect": {
+            "INT": 2,
+            "SPR": 1
+        },
+        "include": "EVT?[40075]",
+        "exclude": "EVT?[40078]"
+    },
+    "40078": {
+        "id": 40078,
+        "event": "你突破到伪仙境。",
+        "postEvent": "魂修永远不可能成仙，最终都只能尝试夺舍，否则会随着时间消散。",
+        "include": "(EVT?[40063])&(INT>500)",
+        "exclude": "EVT?[40078]"
+    },
+    "40079": {
+        "id": 40079,
+        "event": "你到处寻找适合的夺舍对象。",
+        "include": "EVT?[40078]",
+        "exclude": "EVT?[40083]"
+    },
+    "40080": {
+        "id": 40080,
+        "event": "你尝试夺舍一位无垢筑基修士，被反杀。",
+        "include": "EVT?[40079]",
+        "exclude": "EVT?[40083]",
+        "branch": [
+            "EVT?[40078]:10000"
+        ]
+    },
+    "40081": {
+        "id": 40081,
+        "event": "你尝试夺舍一位太古灵脉修士，被反杀。",
+        "include": "EVT?[40079]",
+        "exclude": "EVT?[40083]",
+        "branch": [
+            "EVT?[40078]:10000"
+        ]
+    },
+    "40082": {
+        "id": 40082,
+        "event": "你魂魄不稳，消散了。",
+        "include": "EVT?[40079]",
+        "exclude": "EVT?[40083]",
+        "branch": [
+            "EVT?[40078]:10000"
+        ]
+    },
+    "40083": {
+        "id": 40083,
+        "event": "你尝试夺舍一位金丹九层修士，成功了。",
+        "include": "EVT?[40079]",
+        "exclude": "EVT?[40083]",
+        "branch": [
+            "EVT?[40078]:10365"
+        ]
+    },
+    "40084": {
+        "id": 40084,
+        "event": "你尝试夺舍一位净息修士，成功了。",
+        "include": "EVT?[40075]",
+        "exclude": "EVT?[40078]",
+        "branch": [
+            "EVT?[40075]:40003"
+        ]
     }
 }

data/talents.json

@@ -79,6 +79,9 @@
         "name": "天龙人",
         "description": "你拥有北京户口",
         "grade": 2,
+        "effect": {
+            "MNY": 1
+        },
         "exclusive": [
             "1012",
             "1013",
@@ -119,7 +122,7 @@
         "description": "你有美国国籍",
         "grade": 2,
         "effect": {
-            "MNY": 3
+            "MNY": 1
         },
         "exclusive": [
             "1010",
@@ -1169,5 +1172,11 @@
         "name": "转世重修",
         "description": "渡劫失败重生",
         "grade": 2
+    },
+    "1135": {
+        "id": 1135,
+        "name": "轮回之外",
+        "description": "死后可能灵魂离体",
+        "grade": 3
     }
 }