update origin to 1.4.71510 (#40)

Wing924 · Oct 4, 2022 · 7d37dd2 · 7d37dd2
1 parent 46a4482
commit 7d37dd2
Show file tree

Hide file tree

Showing 20 changed files with 139,873 additions and 139,345 deletions.
diff --git a/origin/data/global/excel/_diabloiidatafileguide.mht b/origin/data/global/excel/_diabloiidatafileguide.mht
diff --git a/origin/data/global/excel/monstats.txt b/origin/data/global/excel/monstats.txt
diff --git a/origin/data/global/excel/skillcalc.txt b/origin/data/global/excel/skillcalc.txt
@@ -90,3 +90,7 @@ dm21	((110 * lvl) * (pa12 - pa11)) / (100 * (lvl + 6)) + pa11
 clc5	The calc5 field value
 clc6	The calc6 field value
 pst6	The passivecalc6 field value
+pst7	The passivecalc7 field value
+pst8	The passivecalc8 field value
+pst9	The passivecalc9 field value
+ps10	The passivecalc10 field value
diff --git a/origin/data/global/excel/skills.txt b/origin/data/global/excel/skills.txt
diff --git a/origin/data/global/excel/states.txt b/origin/data/global/excel/states.txt
diff --git a/origin/data/global/excel/superuniques.txt b/origin/data/global/excel/superuniques.txt
diff --git a/origin/data/global/excel/treasureclassex.txt b/origin/data/global/excel/treasureclassex.txt
diff --git a/origin/data/global/excel/uniqueitems.txt b/origin/data/global/excel/uniqueitems.txt
@@ -401,9 +401,9 @@ Rainbow Facet	397	100	1		1		85	49	jew	jewel		3	5000								dmg-cold	3	24	38	pier
 Rainbow Facet	398	100	1		1		85	49	jew	jewel		3	5000								dmg-fire		17	45	pierce-fire		3	5	extra-fire		3	5	levelup-skill	Blaze	100	29																																		0
 Rainbow Facet	399	100	1		1		85	49	jew	jewel		3	5000								dmg-pois	50	187	187	pierce-pois		3	5	extra-pois		3	5	levelup-skill	Venom	100	23																																		0
 Hellfire Torch	400	100	1		1		110	75	cm2	charm	1	3	5000			flptrch	invtrch	item_gem	12	item_gem	randclassskill		0	6	all-stats		10	20	res-all		10	20	light		8	8	hit-skill	197	5	10	charged	Hydra	10	30																										0
-Cold Rupture	401	100		1	1		75	75	cm3	charm		3	5000	lblu	lblu						pierce-immunity-cold		300	300	res-cold		-75	-75																																										0
-Flame Rift	402	100		1	1		75	75	cm3	charm		3	5000	lred	lred						pierce-immunity-fire		300	300	res-fire		-75	-75																																										0
-Crack of the Heavens	403	100		1	1		75	75	cm3	charm		3	5000	lyel	lyel						pierce-immunity-light		300	300	res-ltng		-75	-75																																										0
-Rotting Fissure	404	100		1	1		75	75	cm3	charm		3	5000	lgrn	lgrn						pierce-immunity-poison		300	300	res-pois		-75	-75																																										0
-Bone Break	405	100		1	1		75	75	cm3	charm		3	5000	whit	whit						pierce-immunity-damage		300	300	red-dmg%		-25	-25																																										0
-Black Cleft	406	100		1	1		75	75	cm3	charm		3	5000	lgry	lgry						pierce-immunity-magic		300	300	res-mag		-50	-50																																										0
+Cold Rupture	401	100		1	1		69	75	cm3	charm		3	5000	lblu	lblu						pierce-immunity-cold		300	300	res-cold		-90	-70																																										0
+Flame Rift	402	100		1	1		69	75	cm3	charm		3	5000	lred	lred						pierce-immunity-fire		300	300	res-fire		-90	-70																																										0
+Crack of the Heavens	403	100		1	1		69	75	cm3	charm		3	5000	lyel	lyel						pierce-immunity-light		300	300	res-ltng		-90	-70																																										0
+Rotting Fissure	404	100		1	1		69	75	cm3	charm		3	5000	lgrn	lgrn						pierce-immunity-poison		300	300	res-pois		-90	-70																																										0
+Bone Break	405	100		1	1		69	75	cm3	charm		3	5000	whit	whit						pierce-immunity-damage		300	300	red-dmg%		-20	-10																																										0
+Black Cleft	406	100		1	1		69	75	cm3	charm		3	5000	lgry	lgry						pierce-immunity-magic		300	300	res-mag		-65	-45																																										0
diff --git a/origin/data/global/ui/layouts/hudwarnings.json b/origin/data/global/ui/layouts/hudwarnings.json
@@ -17,7 +17,7 @@
         {
             "type": "LayoutItemWidget", "name": "InfoTextWrapper",
             "fields": {
-                "minHeight": 64,
+                "minHeight": 48,
                 "marginRight": 4,
                 "marginTop": 4,
                 "marginBottom": 4,
@@ -37,6 +37,29 @@
                 },
             ]
         },
+        {
+            "type": "LayoutItemWidget", "name": "TerrorZoneInfoTextWrapper",
+            "fields": {
+                "minHeight": 16,
+                "marginRight": 4,
+                "marginTop": -4,
+                "marginBottom": 4,
+            },
+            "children": [
+                {
+                    "type": "TextBoxWidget", "name": "TerrorZoneInfoText",
+                    "fields": {
+                        "fitToText": true,
+                        "fontType": "16pt",
+                        "style": {
+                            "fontColor": { "r": 135, "g": 82, "b": 161 },
+                            "alignment": { "v": "top", "h": "right" },
+                            "options": { "newlineHandling": "standard" }
+                        },
+                    }
+                },
+            ]
+        },
         {
             "type": "ImageWidget", "name": "HostileWarning",
             "fields": {

diff --git a/origin/data/global/ui/layouts/hudwarningshd.json b/origin/data/global/ui/layouts/hudwarningshd.json
@@ -17,7 +17,7 @@
         {
             "type": "LayoutItemWidget", "name": "InfoTextWrapper",
             "fields": {
-                "minHeight": 175,
+                "minHeight": 125,
                 "marginRight": 12,
                 "marginTop": 12,
                 "marginBottom": 12,
@@ -38,7 +38,32 @@
                 },
             ]
         },
- {
+        {
+            "type": "LayoutItemWidget", "name": "TerrorZoneInfoTextWrapper",
+            "fields": {
+                "minHeight": 50,
+                "marginRight": 12,
+                "marginTop": -12,
+                "marginBottom": 12,
+            },
+            "children": [
+                {
+                    "type": "TextBoxWidget", "name": "TerrorZoneInfoText",
+                    "fields": {
+                        "fitToText": true,
+                        "fontType": "16pt",
+                        "style": {
+                            "pointSize": "$MediumFontSize",
+                            "fontColor": { "r": 135, "g": 82, "b": 161 },
+                            "alignment": { "v": "top", "h": "right" },
+                            "options": { "newlineHandling": "standard" },
+                            "spacing": { "kerning": 0.9 }
+                        },
+                    }
+                },
+            ]
+        },
+        {
             "type": "LayoutItemWidget", "name": "QuantityWarningWrapper",
             "fields": {
                 "marginRight": 5,
@@ -53,7 +78,7 @@
                        }
               },
              ]
-},
+        },
         {
             "type": "DurabilityWidget", "name": "DurabilityWarning",
             "fields": {

diff --git a/origin/data/local/lng/strings/item-modifiers.json b/origin/data/local/lng/strings/item-modifiers.json
@@ -5561,13 +5561,13 @@
   {
     "id": 23001,
     "Key": "ModStr2uPercent",
-    "enUS": "Damage Reduced by %d%%",
+    "enUS": "Physical Damage Received Reduced by %d%%",
     "zhTW": "傷害降低 %d%%",
     "deDE": "Schaden reduziert um %d%%",
     "esES": "Daño reducido un %d%%",
     "frFR": "Dégâts réduits de %d%%",
     "itIT": "Danni ridotti del %d%%",
-    "koKR": "피해 %d%% 감소",
+    "koKR": "받는 물리 피해 %d%% 감소",
     "plPL": "Zmniejsza obrażenia o %d%%",
     "esMX": "Reduce un %d%% el daño",
     "jaJP": "ダメージを軽減（%d%%）",
@@ -5816,18 +5816,18 @@
   {
     "id": 27351,
     "Key": "ModStr2uPercentNegative",
-    "enUS": "Damage Increased by %d%%",
-    "zhTW": "傷害提高 %d%%",
-    "deDE": "Schaden um %d%% erhöht",
-    "esES": "Daño aumentado un %d%%",
-    "frFR": "Dégâts augmentés de %d%%",
-    "itIT": "Danni aumentati del %d%%",
-    "koKR": "피해 %d%% 증가",
-    "plPL": "Obrażenia zwiększone o %d%%",
-    "esMX": "Se aumentó el daño un %d%%",
-    "jaJP": "物理ダメージ%d%%増加",
-    "ptBR": "Dano aumentado em %d%%",
-    "ruRU": "Наносимый урон увеличен на %d%%",
-    "zhCN": "伤害提高 %d%%"
+    "enUS": "Physical Damage Received Increased by %d%%",
+    "zhTW": "受到的傷害提高 %d%%",
+    "deDE": "Erlittener Schaden um %d%% erhöht",
+    "esES": "Daño sufrido aumentado un %d%%",
+    "frFR": "Dégâts subis augmentés de %d%%",
+    "itIT": "Danni ricevuti aumentati del %d%%",
+    "koKR": "받는 물리 피해 %d%% 증가",
+    "plPL": "Otrzymane obrażenia są zwiększone o %d%%",
+    "esMX": "El daño recibido aumenta un %d%%",
+    "jaJP": "受ける物理ダメージ%d%%増加",
+    "ptBR": "Dano recebido aumentado em %d%%",
+    "ruRU": "Получаемый урон увеличен на %d%%",
+    "zhCN": "受到的伤害提高 %d%%"
   }
 ]
diff --git a/origin/data/local/lng/strings/item-nameaffixes.json b/origin/data/local/lng/strings/item-nameaffixes.json
@@ -4383,7 +4383,7 @@
     "jaJP": "切断",
     "ptBR": "[fs]Fraturadora",
     "ruRU": "[ms]раскалыватель",
-    "zhCN": "破碎者"
+    "zhCN": "碎击"
   },
   {
     "id": 2339,

diff --git a/origin/data/local/lng/strings/ui.json b/origin/data/local/lng/strings/ui.json
@@ -31911,36 +31911,36 @@
   {
     "id": 27296,
     "Key": "DesecratedManyLevelsListLastFormat",
-    "enUS": "and ÿc;%sÿc0",
+    "enUS": ", and ÿc;%sÿc0",
     "zhTW": "與ÿc;%sÿc0",
-    "deDE": "und ÿc;%sÿc0",
-    "esES": "y ÿc;%sÿc0",
-    "frFR": "et ÿc;%sÿc0",
-    "itIT": "e ÿc;%sÿc0",
-    "koKR": "및 ÿc;%sÿc0",
-    "plPL": "i ÿc;%sÿc0",
-    "esMX": "y ÿc;%sÿc0",
+    "deDE": " und ÿc;%sÿc0",
+    "esES": " y ÿc;%sÿc0",
+    "frFR": " et ÿc;%sÿc0",
+    "itIT": " e ÿc;%sÿc0",
+    "koKR": " 및 ÿc;%sÿc0",
+    "plPL": " i ÿc;%sÿc0",
+    "esMX": " y ÿc;%sÿc0",
     "jaJP": "そしてÿc;%sÿc0",
-    "ptBR": "e ÿc;%sÿc0",
-    "ruRU": "и ÿc;%sÿc0",
+    "ptBR": " e ÿc;%sÿc0",
+    "ruRU": " и ÿc;%sÿc0",
     "zhCN": "与ÿc;%sÿc0"
   },
   {
     "id": 27297,
     "Key": "DesecratedManyLevelsListEntryFormat",
-    "enUS": "ÿc;%sÿc0, ",
-    "zhTW": "ÿc;%sÿc0、",
-    "deDE": "ÿc;%sÿc0, ",
-    "esES": "ÿc;%sÿc0,",
-    "frFR": "ÿc;%sÿc0, ",
-    "itIT": "ÿc;%sÿc0, ",
-    "koKR": "ÿc;%sÿc0, ",
-    "plPL": "ÿc;%sÿc0,",
-    "esMX": "ÿc;%sÿc0, ",
-    "jaJP": "ÿc;%sÿc0, ",
-    "ptBR": "ÿc;%sÿc0, ",
-    "ruRU": "ÿc;%sÿc0, ",
-    "zhCN": "ÿc;%sÿc0, "
+    "enUS": "ÿc;%sÿc0",
+    "zhTW": "ÿc;%sÿc0",
+    "deDE": "ÿc;%sÿc0",
+    "esES": "ÿc;%sÿc0",
+    "frFR": "ÿc;%sÿc0",
+    "itIT": "ÿc;%sÿc0",
+    "koKR": "ÿc;%sÿc0",
+    "plPL": "ÿc;%sÿc0",
+    "esMX": "ÿc;%sÿc0",
+    "jaJP": "ÿc;%sÿc0",
+    "ptBR": "ÿc;%sÿc0",
+    "ruRU": "ÿc;%sÿc0",
+    "zhCN": "ÿc;%sÿc0"
   },
   {
     "id": 27298,
@@ -31962,7 +31962,7 @@
   {
     "id": 27299,
     "Key": "DesecratedFeatureUnlocked",
-    "enUS": "The aftermath of the Worldstone's destruction, has caused dangerous tremors. Terrorized game creation unlocked on this difficulty.",
+    "enUS": "The aftermath of the Worldstone's destruction has caused dangerous tremors. Terrorized game creation unlocked on this difficulty.",
     "zhTW": "世界之石遭到摧毀，在大地四處引發危險的波動與震盪。已可在此難度建立邪惡威脅遊戲。",
     "deDE": "Die Zerstörung des Weltsteins hat gefährliche Beben ausgelöst. Erstellung Terrorisierter Spiele für diesen Schwierigkeitsgrad freigeschaltet.",
     "esES": "Las secuelas de la destrucción de la Piedra del Mundo han creado peligrosos temblores. Creación de partidas de terror desbloqueada en esta dificultad.",
@@ -32366,5 +32366,22 @@
     "ptBR": "Buscar",
     "ruRU": "Поиск",
     "zhCN": "搜索"
+  },
+  {
+    "id": 27353,
+    "Key": "DesecratedManyLevelsListDivider",
+    "enUS": ", ",
+    "zhTW": "、",
+    "deDE": ", ",
+    "esES": ",",
+    "frFR": ", ",
+    "itIT": ", ",
+    "koKR": ", ",
+    "plPL": ",",
+    "esMX": ", ",
+    "jaJP": ", ",
+    "ptBR": ", ",
+    "ruRU": ", ",
+    "zhCN": ", "
   }
 ]
diff --git a/patches/11_level_names/data/local/lng/strings/levels.json.sh b/patches/11_level_names/data/local/lng/strings/levels.json.sh
@@ -22,7 +22,7 @@ cat > "$levels_json"
 for i in $(seq 0 2 ${#NEW_KEYS[*]}); do
   act="${NEW_KEYS[$i]}"
   key="${NEW_KEYS[$(($i + 1))]}"
-  cat "$levels_json" | jq ".[] | select(.Key == \"$key\") | (.Key |= \"act$act \" + .) | (.id |= 1${act}0000 + .)"
+  cat "$levels_json" | jq ".[] | select(.Key == \"$key\") | (.Key |= \"act$act \" + .) | (.id |= 3${act}0000 + .)"
 done | jq -s > "$new_keys_json"
 
 cat "$levels_json" "$new_keys_json" | jq '.[]' | jq -s
diff --git a/resources/generated/levels.tsv b/resources/generated/levels.tsv
@@ -35,7 +35,7 @@ id	Key	act	zhTW	normal	nightmare	hell
 5052	Stony Field	1	亂石曠野	4	37	68
 5053	Cold Plains	1	冰冷之原	2	36	68
 5054	Blood Moor	1	鮮血荒地	1	36	67
-115018	act1 Tristram	1	崔斯特姆	6	39	76
+315018	act1 Tristram	1	崔斯特姆	6	39	76
 824	Arcane Sanctuary	2	秘法聖殿	14	48	79
 825	Duriel's Lair	2	塔拉夏的密室	17	49	80
 826	Tal Rasha's Tomb	2	塔拉夏的古墓	17	49	80
@@ -61,8 +61,8 @@ id	Key	act	zhTW	normal	nightmare	hell
 849	Far Oasis	2	遙遠的綠洲	16	45	76
 850	Dry Hills	2	乾土高地	15	44	76
 851	Rocky Waste	2	碎石荒地	14	43	75
-120844	act2 Sewers Level 2	2	下水道第二層	13	43	74
-120845	act2 Sewers Level 1	2	下水道第一層	13	43	74
+320844	act2 Sewers Level 2	2	下水道第二層	13	43	74
+320845	act2 Sewers Level 1	2	下水道第一層	13	43	74
 795	Durance of Hate Level 3	3	憎恨囚牢第三層	25	55	83
 796	Durance of Hate Level 2	3	憎恨囚牢第二層	25	55	83
 797	Durance of Hate Level 1	3	憎恨囚牢第一層	25	55	83
@@ -88,8 +88,8 @@ id	Key	act	zhTW	normal	nightmare	hell
 817	Flayer Jungle	3	剝皮叢林	22	50	80
 818	Great Marsh	3	大沼澤	21	50	80
 819	Spider Forest	3	蜘蛛森林	21	49	79
-130844	act3 Sewers Level 2	3	下水道第二層	24	53	85
-130845	act3 Sewers Level 1	3	下水道第一層	23	52	85
+330844	act3 Sewers Level 2	3	下水道第二層	24	53	85
+330845	act3 Sewers Level 1	3	下水道第一層	23	52	85
 789	Chaos Sanctum	4	混沌魔殿	28	58	85
 791	River of Flame	4	火焰之河	27	57	85
 792	Outer Steppes	4	外圍荒原	26	56	82
@@ -121,4 +121,4 @@ id	Key	act	zhTW	normal	nightmare	hell
 22665	The Worldstone Keep Level 3	5	世界之石要塞第三層	42	66	85
 22666	The Worldstone Chamber	5	世界之石大殿	43	66	85
 22667	Throne of Destruction	5	毀滅王座	43	66	85
-155018	act5 Tristram	5	崔斯特姆	50	75	83
+355018	act5 Tristram	5	崔斯特姆	50	75	83
diff --git a/resources/generated/uniq-set.tsv b/resources/generated/uniq-set.tsv
@@ -498,9 +498,9 @@ id	Key	zhTW	set	rarity	qlvl
 21876	McAuley's Taboo	山德的禁忌	McAuley's Folly	7	20
 21877	McAuley's Riprap	山德的碎石	McAuley's Folly	7	20
 21878	McAuley's Paragon	山德的模範	McAuley's Folly	3	20
-27345	Cold Rupture	冰寒裂縫		1	75
-27346	Flame Rift	火焰裂隙		1	75
-27347	Crack of the Heavens	天堂裂擊		1	75
-27348	Rotting Fissure	腐敗裂痕		1	75
-27349	Bone Break	分筋裂骨		1	75
-27350	Black Cleft	漆黑裂口		1	75
+27345	Cold Rupture	冰寒裂縫		1	69
+27346	Flame Rift	火焰裂隙		1	69
+27347	Crack of the Heavens	天堂裂擊		1	69
+27348	Rotting Fissure	腐敗裂痕		1	69
+27349	Bone Break	分筋裂骨		1	69
+27350	Black Cleft	漆黑裂口		1	69
diff --git a/wing.mpq/data/local/lng/strings/item-modifiers.json b/wing.mpq/data/local/lng/strings/item-modifiers.json
@@ -5561,13 +5561,13 @@
   {
     "id": 23001,
     "Key": "ModStr2uPercent",
-    "enUS": "Damage Reduced by %d%%",
+    "enUS": "Physical Damage Received Reduced by %d%%",
     "zhTW": "伤害降低(DR) %d%%",
     "deDE": "Schaden reduziert um %d%%",
     "esES": "Daño reducido un %d%%",
     "frFR": "Dégâts réduits de %d%%",
     "itIT": "Danni ridotti del %d%%",
-    "koKR": "피해 %d%% 감소",
+    "koKR": "받는 물리 피해 %d%% 감소",
     "plPL": "Zmniejsza obrażenia o %d%%",
     "esMX": "Reduce un %d%% el daño",
     "jaJP": "ダメージを軽減（%d%%）",
@@ -5816,18 +5816,18 @@
   {
     "id": 27351,
     "Key": "ModStr2uPercentNegative",
-    "enUS": "Damage Increased by %d%%",
-    "zhTW": "伤害提高(DI) %d%%",
-    "deDE": "Schaden um %d%% erhöht",
-    "esES": "Daño aumentado un %d%%",
-    "frFR": "Dégâts augmentés de %d%%",
-    "itIT": "Danni aumentati del %d%%",
-    "koKR": "피해 %d%% 증가",
-    "plPL": "Obrażenia zwiększone o %d%%",
-    "esMX": "Se aumentó el daño un %d%%",
-    "jaJP": "物理ダメージ%d%%増加",
-    "ptBR": "Dano aumentado em %d%%",
-    "ruRU": "Наносимый урон увеличен на %d%%",
-    "zhCN": "伤害提高 %d%%"
+    "enUS": "Physical Damage Received Increased by %d%%",
+    "zhTW": "受到的伤害提高(DI) %d%%",
+    "deDE": "Erlittener Schaden um %d%% erhöht",
+    "esES": "Daño sufrido aumentado un %d%%",
+    "frFR": "Dégâts subis augmentés de %d%%",
+    "itIT": "Danni ricevuti aumentati del %d%%",
+    "koKR": "받는 물리 피해 %d%% 증가",
+    "plPL": "Otrzymane obrażenia są zwiększone o %d%%",
+    "esMX": "El daño recibido aumenta un %d%%",
+    "jaJP": "受ける物理ダメージ%d%%増加",
+    "ptBR": "Dano recebido aumentado em %d%%",
+    "ruRU": "Получаемый урон увеличен на %d%%",
+    "zhCN": "受到的伤害提高 %d%%"
   }
 ]
diff --git a/wing.mpq/data/local/lng/strings/item-nameaffixes.json b/wing.mpq/data/local/lng/strings/item-nameaffixes.json
@@ -4383,7 +4383,7 @@
     "jaJP": "切断",
     "ptBR": "[fs]Fraturadora",
     "ruRU": "[ms]раскалыватель",
-    "zhCN": "破碎者"
+    "zhCN": "碎击"
   },
   {
     "id": 2339,