diff --git a/data/age.json b/data/age.json index 8e3db0e..fb481f0 100644 --- a/data/age.json +++ b/data/age.json @@ -1390,7 +1390,7 @@ "age": "12", "event": [ 10007, - 10008, + "10008*0.1", 10012, 10014, 10022, @@ -1483,7 +1483,7 @@ "age": "13", "event": [ 10007, - 10008, + "10008*0.1", 10022, 10023, "10069*0.03", @@ -1693,7 +1693,7 @@ "age": "14", "event": [ 10007, - 10008, + "10008*0.1", 10022, 10023, "10069*0.03", @@ -1903,7 +1903,7 @@ "age": "15", "event": [ 10007, - 10008, + "10008*0.1", 10022, 10023, "10069*0.03", @@ -2115,7 +2115,7 @@ "age": "16", "event": [ 10007, - 10008, + "10008*0.1", 10022, 10023, "10069*0.03", @@ -2339,7 +2339,7 @@ "age": "17", "event": [ 10007, - 10008, + "10008*0.1", 10022, 10023, "10069*0.03", @@ -2573,7 +2573,7 @@ "age": "18", "event": [ 10007, - 10008, + "10008*0.1", "10069*0.03", "10070*0.03", "10071*0.03", @@ -2662,7 +2662,7 @@ "age": "19", "event": [ 10007, - 10008, + "10008*0.1", "10069*0.03", "10070*0.03", "10071*0.03", diff --git a/data/age.xlsx b/data/age.xlsx index 081a4d7..0811050 100644 Binary files a/data/age.xlsx and b/data/age.xlsx differ diff --git a/data/events.json b/data/events.json index 2c02b51..7f218be 100644 --- a/data/events.json +++ b/data/events.json @@ -2004,7 +2004,7 @@ "effect": { "SPR": 1 }, - "include": "EVT?[10210]", + "include": "(EVT?[10210])&(EVT?[10009])", "exclude": "(EVT?[10235])|(TLT?[1027])" }, "10236": { @@ -3544,7 +3544,7 @@ "id": 10410, "event": "你成为了动漫高手,经常在网上骂战。", "include": "EVT?[10189]", - "exclude": "(EVT?[10410])|(TLT?[1014])", + "exclude": "(EVT?[10410,10002])|(TLT?[1014])", "branch": [ "STR>5:20410", "INT<6:20411" diff --git a/data/events.xlsx b/data/events.xlsx index ad1fd46..9f5058a 100644 Binary files a/data/events.xlsx and b/data/events.xlsx differ