Merge from q0706 to q0604.

TWValues · Feb 24, 2024 · 907235a · 907235a
1 parent d101dc7
commit 907235a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 28 deletions.
diff --git a/src/data/political_party.jsx b/src/data/political_party.jsx
@@ -42,7 +42,7 @@ export const getPoliticalParties = () => [
       economic: 30,
       civil: 30,
       environmental: 35,
-      societal: 20,
+      societal: 25,
       sovereignty: 20,
       us_vs_china: 25,
     },

diff --git a/src/data/question.jsx b/src/data/question.jsx
@@ -278,12 +278,6 @@ export const getQuestions = () => [
       societal: -WEIGHTS.p100,
     },
   },
-  {
-    id: 'q0706',
-    weight: {
-      societal: -WEIGHTS.p100,
-    },
-  },
   {
     id: 'q0800',
     weight: {

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -154,9 +154,6 @@
       "q0705": {
         "description": "- Young and beautiful girls, suitable for being counter staff.\n- It is scary for women to go out on the street without makeup.\n- Too many unmarried women are a national security concern."
       },
-      "q0706": {
-        "description": "It is important that we maintain the traditions of our past."
-      },
       "q0800": {
         "description": "Climate change is currently one of the greatest threats to our way of life."
       },

diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json
@@ -131,7 +131,7 @@
         "description": "死刑应该被废除。"
       },
       "q0604": {
-        "description": "过去的传统一点价值都没有。"
+        "description": "我们应该全盘西化，完全舍弃中华文化。"
       },
       "q0605": {
         "description": "女性也有义务要服兵役，共同保家卫国。"
@@ -154,9 +154,6 @@
       "q0705": {
         "description": "●年轻漂亮的女生，适合坐柜台。\n●女性同胞不化妆上街会吓死人。\n●女性超过30岁未结婚的比例太高是一种国安问题。"
       },
-      "q0706": {
-        "description": "我们应该维持传统中华文化，而非全盘西化。"
-      },
       "q0800": {
         "description": "气候变迁已经严重威胁到人类的生存。"
       },

diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json
@@ -131,7 +131,7 @@
         "description": "死刑應該被廢除。"
       },
       "q0604": {
-        "description": "過去的傳統一點價值都沒有。"
+        "description": "我們應該全盤西化，完全捨棄傳統中華文化。"
       },
       "q0605": {
         "description": "女性也有義務要服兵役，共同保家衛國。"
@@ -154,9 +154,6 @@
       "q0705": {
         "description": "●年輕漂亮的女生，適合坐櫃檯。\n●女性同胞不化妝上街會嚇死人。\n●女性超過30歲未結婚的比例太高是一種國安問題。"
       },
-      "q0706": {
-        "description": "我們應該維持傳統中華文化，而非全盤西化。"
-      },
       "q0800": {
         "description": "氣候變遷已經嚴重威脅到人類的生存。"
       },

diff --git a/src/utils/match.test.js b/src/utils/match.test.js
@@ -73,15 +73,14 @@ test('party:kmt', () => {
     q0601: MULTIPLIER.d,
     q0602: MULTIPLIER.cd,
     q0603: MULTIPLIER.cd,
-    q0604: MULTIPLIER.d,
+    q0604: MULTIPLIER.cd,
     q0605: MULTIPLIER.d,
     q0700: MULTIPLIER.a,
     q0701: MULTIPLIER.d,
     q0702: MULTIPLIER.a,
     q0703: MULTIPLIER.n,
     q0704: MULTIPLIER.a,
     q0705: MULTIPLIER.a,
-    q0706: MULTIPLIER.ca,
     q0800: MULTIPLIER.a,
     q0801: MULTIPLIER.d,
     q0802: MULTIPLIER.d,
@@ -151,15 +150,14 @@ test('party:lp', () => {
     q0601: MULTIPLIER.n,
     q0602: MULTIPLIER.n,
     q0603: MULTIPLIER.n,
-    q0604: MULTIPLIER.n,
+    q0604: MULTIPLIER.cd,
     q0605: MULTIPLIER.n,
     q0700: MULTIPLIER.n,
     q0701: MULTIPLIER.n,
     q0702: MULTIPLIER.n,
     q0703: MULTIPLIER.n,
     q0704: MULTIPLIER.n,
     q0705: MULTIPLIER.d,
-    q0706: MULTIPLIER.ca,
     q0800: MULTIPLIER.n,
     q0801: MULTIPLIER.n,
     q0802: MULTIPLIER.n,
@@ -237,7 +235,6 @@ test('party:dpp', () => {
     q0703: MULTIPLIER.n,
     q0704: MULTIPLIER.a,
     q0705: MULTIPLIER.d,
-    q0706: MULTIPLIER.a,
     q0800: MULTIPLIER.a,
     q0801: MULTIPLIER.a,
     q0802: MULTIPLIER.a,
@@ -315,7 +312,6 @@ test('party:np', () => {
     q0703: MULTIPLIER.n,
     q0704: MULTIPLIER.a,
     q0705: MULTIPLIER.a,
-    q0706: MULTIPLIER.ca,
     q0800: MULTIPLIER.a,
     q0801: MULTIPLIER.d,
     q0802: MULTIPLIER.d,
@@ -393,7 +389,6 @@ test('party:gpt', () => {
     q0703: MULTIPLIER.d,
     q0704: MULTIPLIER.d,
     q0705: MULTIPLIER.cd,
-    q0706: MULTIPLIER.n,
     q0800: MULTIPLIER.ca,
     q0801: MULTIPLIER.a,
     q0802: MULTIPLIER.ca,
@@ -504,7 +499,6 @@ test('party:npp', () => {
     q0703: MULTIPLIER.d,
     q0704: MULTIPLIER.n,
     q0705: MULTIPLIER.cd,
-    q0706: MULTIPLIER.n,
     q0800: MULTIPLIER.a,
     q0801: MULTIPLIER.a,
     q0802: MULTIPLIER.ca,
@@ -594,15 +588,14 @@ test('party:tpp', () => {
     q0601: MULTIPLIER.d,
     q0602: MULTIPLIER.n,
     q0603: MULTIPLIER.n,
-    q0604: MULTIPLIER.d,
+    q0604: MULTIPLIER.cd,
     q0605: MULTIPLIER.n,
     q0700: MULTIPLIER.a,
     q0701: MULTIPLIER.n,
     q0702: MULTIPLIER.d,
     q0703: MULTIPLIER.d,
     q0704: MULTIPLIER.n,
     q0705: MULTIPLIER.a,
-    q0706: MULTIPLIER.a,
     q0800: MULTIPLIER.a,
     q0801: MULTIPLIER.d,
     q0802: MULTIPLIER.a,