From 751a0dec0fb9cb5118f85647d8e678934c1cb0b6 Mon Sep 17 00:00:00 2001
From: Vick Scarlet <scarlet_vick@outlook.com>
Date: Mon, 31 Jan 2022 17:24:29 +0800
Subject: [PATCH] hotfix

---
 public/data/en-us/events.json  | 18 +++---------------
 public/data/en-us/talents.json |  6 +++---
 public/data/zh-cn/events.json  | 18 +++---------------
 public/data/zh-cn/talents.json |  6 +++---
 4 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/public/data/en-us/events.json b/public/data/en-us/events.json
index 74072c7..9ce0599 100644
--- a/public/data/en-us/events.json
+++ b/public/data/en-us/events.json
@@ -7,9 +7,9 @@
         },
         "NoRandom": 1,
         "branch": [
-            "(TLT?[1148])&(EVT![20001]):20001",
-            "(TLT?[1147])&(EVT![20000]):20000",
-            "(TLT?[2024])&(EVT?[10679,10680,10681])&(EVT![11504]):11504"
+            "(AGE![500])&(TLT?[1148])&(EVT![20001]):20001",
+            "(AGE![500])&(TLT?[1147])&(EVT![20000]):20000",
+            "(AGE![500])&(TLT?[2024])&(EVT?[10679,10680,10681])&(EVT![11504]):11504"
         ]
     },
     "10001": {
@@ -3003,9 +3003,6 @@
     "10346": {
         "id": 10346,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "include": "TLT?[1048]",
         "exclude": "EVT?[10333,40001,40003,40061]",
         "branch": [
@@ -3015,9 +3012,6 @@
     "10347": {
         "id": 10347,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "include": "TLT?[1048]",
         "exclude": "EVT?[10345,10361,40001,40003,40061]",
         "branch": [
@@ -3242,9 +3236,6 @@
     "10368": {
         "id": 10368,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "exclude": "EVT?[10365,10361,40001,40061]",
         "branch": [
             "STR>0:10000"
@@ -3355,9 +3346,6 @@
     "10379": {
         "id": 10379,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "exclude": "EVT?[10377]",
         "branch": [
             "STR>0:10000"
diff --git a/public/data/en-us/talents.json b/public/data/en-us/talents.json
index 36267d4..034b132 100644
--- a/public/data/en-us/talents.json
+++ b/public/data/en-us/talents.json
@@ -979,8 +979,8 @@
     "1105": {
         "id": "1105",
         "name": "蓝色胶囊",
-        "description": "你20岁或30岁时无事发生",
-        "condition": "AGE?[20]",
+        "description": "你20岁和30岁时无事发生",
+        "condition": "AGE?[20,30]",
         "grade": 1
     },
     "1106": {
@@ -1606,7 +1606,7 @@
         "id": 2018,
         "name": "高产",
         "description": "60岁时体质-2",
-        "condition": "AGE?[10]",
+        "condition": "AGE?[60]",
         "grade": 0,
         "exclusive": 1,
         "effect": {
diff --git a/public/data/zh-cn/events.json b/public/data/zh-cn/events.json
index 74072c7..9ce0599 100644
--- a/public/data/zh-cn/events.json
+++ b/public/data/zh-cn/events.json
@@ -7,9 +7,9 @@
         },
         "NoRandom": 1,
         "branch": [
-            "(TLT?[1148])&(EVT![20001]):20001",
-            "(TLT?[1147])&(EVT![20000]):20000",
-            "(TLT?[2024])&(EVT?[10679,10680,10681])&(EVT![11504]):11504"
+            "(AGE![500])&(TLT?[1148])&(EVT![20001]):20001",
+            "(AGE![500])&(TLT?[1147])&(EVT![20000]):20000",
+            "(AGE![500])&(TLT?[2024])&(EVT?[10679,10680,10681])&(EVT![11504]):11504"
         ]
     },
     "10001": {
@@ -3003,9 +3003,6 @@
     "10346": {
         "id": 10346,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "include": "TLT?[1048]",
         "exclude": "EVT?[10333,40001,40003,40061]",
         "branch": [
@@ -3015,9 +3012,6 @@
     "10347": {
         "id": 10347,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "include": "TLT?[1048]",
         "exclude": "EVT?[10345,10361,40001,40003,40061]",
         "branch": [
@@ -3242,9 +3236,6 @@
     "10368": {
         "id": 10368,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "exclude": "EVT?[10365,10361,40001,40061]",
         "branch": [
             "STR>0:10000"
@@ -3355,9 +3346,6 @@
     "10379": {
         "id": 10379,
         "event": "寿元终。",
-        "effect": {
-            "LIF": -1
-        },
         "exclude": "EVT?[10377]",
         "branch": [
             "STR>0:10000"
diff --git a/public/data/zh-cn/talents.json b/public/data/zh-cn/talents.json
index 36267d4..034b132 100644
--- a/public/data/zh-cn/talents.json
+++ b/public/data/zh-cn/talents.json
@@ -979,8 +979,8 @@
     "1105": {
         "id": "1105",
         "name": "蓝色胶囊",
-        "description": "你20岁或30岁时无事发生",
-        "condition": "AGE?[20]",
+        "description": "你20岁和30岁时无事发生",
+        "condition": "AGE?[20,30]",
         "grade": 1
     },
     "1106": {
@@ -1606,7 +1606,7 @@
         "id": 2018,
         "name": "高产",
         "description": "60岁时体质-2",
-        "condition": "AGE?[10]",
+        "condition": "AGE?[60]",
         "grade": 0,
         "exclusive": 1,
         "effect": {