Merge pull request #70 from king8fisher/update-to-93001

king8fisher · Nov 2, 2023 · 621933f · 621933f
2 parents fa580a7 + 9c57a20
commit 621933f
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,24 @@ SiegeEngineers combine/copy those:
 - [halfon](https://halfon.aoe2.se/) project:
   - (https://raw.githubusercontent.com/SiegeEngineers/halfon/master/data/units_buildings_techs.de.json - seems to be equal to https://raw.githubusercontent.com/HSZemi/aoe2dat/master/data/units_buildings_techs.json)
 
+## Data Update
+
+- Pull current data from **SeigeEngineers** and **HSZemi**:
+  - Windows:
+    ```powershell
+    > iwr -outf ./src/data/data.json https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/data.json
+    > iwr -outf ./src/data/strings.json https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/locales/en/strings.json
+    > iwr -outf ./src/data/units_buildings_techs.json https://raw.githubusercontent.com/HSZemi/aoe2dat/master/data/units_buildings_techs.json
+    ```
+  - Linux / Mac:  
+    ```shell
+    $ wget -P ./src/data/data.json https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/data.json
+    $ wget -P ./src/data/strings.json https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/locales/en/strings.json
+    $ wget -P ./src/data/units_buildings_techs.json https://raw.githubusercontent.com/HSZemi/aoe2dat/master/data/units_buildings_techs.json
+    ```
+- Format `json` files for uniformness in searches with the `fmt` task defined in `package.json`: `pnpm fmt`.
+- Update current DE build in `./src/data/update.json` (See https://github.com/SiegeEngineers/aoe2techtree/commits/master for the number).
+
 ## Assets Sources
 
 - `\Steam\steamapps\common\AoE2DE\widgetui\textures\ingame\staticons\`
@@ -50,28 +68,6 @@ SiegeEngineers combine/copy those:
 - Huns. Castle upgrade "Marauders" "Enables you to create Tarkans at Stables".
 - Goths. Castle upgrade "Anarchy" "Allows Huskarls to be created at the Barracks.".
 
-## CHANGELOG
-
-- `pnpm create vite aoe2-card-app-react-ts --template react-ts`
-  - `cd ` into
-  - `pnpm i`
-  - `pnpm dev`
-- Create `data` folder (which is now `src/data`).
-  - Step in.
-  - Pull current data from **SeigeEngineers** and **HSZemi**:
-    ```powershell
-    > iwr -outf data.json https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/data.json
-    > iwr -outf strings.json https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/locales/en/strings.json
-    > iwr -outf units_buildings_techs.json https://raw.githubusercontent.com/HSZemi/aoe2dat/master/data/units_buildings_techs.json
-    ```
-    ```console
-    $ wget https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/data.json
-    $ wget https://raw.githubusercontent.com/SiegeEngineers/aoe2techtree/master/data/locales/en/strings.json
-    $ wget https://raw.githubusercontent.com/HSZemi/aoe2dat/master/data/units_buildings_techs.json
-    ```
-  - Format json files for uniformness in searches (`prettier -w .`).
-- `tsx data/model.ts` to run the file in `node` for quick `console.log` outputs.
-
 ## From Vite Template
 
 ### React + TypeScript + Vite

diff --git a/src/data/data.json b/src/data/data.json
@@ -6339,6 +6339,10 @@
           {
             "Amount": 0,
             "Class": 17
+          },
+          {
+            "Amount": 6,
+            "Class": 37
           }
         ],
         "ChargeEvent": 0,
@@ -6868,7 +6872,7 @@
         "ID": 239,
         "LanguageHelpId": 26109,
         "LanguageNameId": 5109,
-        "LineOfSight": 4,
+        "LineOfSight": 7,
         "MaxCharge": 0,
         "MeleeArmor": 1,
         "MinRange": 0,
@@ -8323,7 +8327,7 @@
         "internal_name": "HTHSW"
       },
       "474": {
-        "AccuracyPercent": 50,
+        "AccuracyPercent": 80,
         "Armours": [
           {
             "Amount": 0,
@@ -9897,7 +9901,7 @@
         "ID": 558,
         "LanguageHelpId": 26459,
         "LanguageNameId": 5459,
-        "LineOfSight": 5,
+        "LineOfSight": 8,
         "MaxCharge": 0,
         "MeleeArmor": 1,
         "MinRange": 0,
@@ -10333,7 +10337,7 @@
             "Class": 20
           },
           {
-            "Amount": 75,
+            "Amount": 50,
             "Class": 37
           }
         ],
@@ -16339,7 +16343,7 @@
         "ChargeEvent": 0,
         "ChargeType": 0,
         "Cost": {
-          "Food": 60,
+          "Food": 50,
           "Gold": 35
         },
         "FrameDelay": 0,
@@ -16413,7 +16417,7 @@
         "ChargeEvent": 0,
         "ChargeType": 0,
         "Cost": {
-          "Food": 60,
+          "Food": 50,
           "Gold": 35
         },
         "FrameDelay": 0,
@@ -16487,7 +16491,7 @@
         "ChargeEvent": 0,
         "ChargeType": 0,
         "Cost": {
-          "Food": 60,
+          "Food": 50,
           "Gold": 35
         },
         "FrameDelay": 0,
@@ -16561,7 +16565,7 @@
         "ChargeEvent": 0,
         "ChargeType": 0,
         "Cost": {
-          "Food": 60,
+          "Food": 50,
           "Gold": 35
         },
         "FrameDelay": 0,
@@ -16850,15 +16854,15 @@
             "Class": 37
           }
         ],
-        "Attack": 17,
+        "Attack": 11,
         "AttackDelaySeconds": 0.6222222222222222,
         "Attacks": [
           {
             "Amount": 1,
             "Class": 11
           },
           {
-            "Amount": 17,
+            "Amount": 11,
             "Class": 3
           },
           {
@@ -16874,7 +16878,7 @@
         },
         "FrameDelay": 20,
         "GarrisonCapacity": 0,
-        "HP": 200,
+        "HP": 180,
         "ID": 1704,
         "LanguageHelpId": 26561,
         "LanguageNameId": 5561,
@@ -16924,15 +16928,15 @@
             "Class": 37
           }
         ],
-        "Attack": 20,
+        "Attack": 13,
         "AttackDelaySeconds": 0.6222222222222222,
         "Attacks": [
           {
             "Amount": 2,
             "Class": 11
           },
           {
-            "Amount": 20,
+            "Amount": 13,
             "Class": 3
           },
           {
@@ -16948,7 +16952,7 @@
         },
         "FrameDelay": 20,
         "GarrisonCapacity": 0,
-        "HP": 250,
+        "HP": 230,
         "ID": 1706,
         "LanguageHelpId": 26563,
         "LanguageNameId": 5563,
@@ -17686,7 +17690,7 @@
         "ChargeEvent": 0,
         "ChargeType": 0,
         "Cost": {
-          "Food": 130,
+          "Food": 120,
           "Gold": 95
         },
         "FrameDelay": 0,
@@ -17772,7 +17776,7 @@
         "ChargeEvent": 0,
         "ChargeType": 0,
         "Cost": {
-          "Food": 130,
+          "Food": 120,
           "Gold": 95
         },
         "FrameDelay": 0,
@@ -18775,7 +18779,7 @@
         },
         "FrameDelay": 0,
         "GarrisonCapacity": 0,
-        "HP": 120,
+        "HP": 110,
         "ID": 1790,
         "LanguageHelpId": 26052,
         "LanguageNameId": 5052,
@@ -19217,8 +19221,8 @@
       },
       "units": [
         4, 5, 6, 7, 13, 17, 21, 24, 36, 38, 39, 74, 75, 77, 83, 93, 125, 128, 279, 280, 283, 329, 330, 331, 358, 359,
-        420, 422, 440, 441, 442, 448, 473, 474, 492, 527, 528, 529, 532, 539, 545, 546, 548, 550, 567, 569, 1103, 1104,
-        1105, 1258, 1795
+        422, 440, 441, 442, 448, 473, 474, 492, 527, 528, 529, 532, 539, 545, 546, 548, 550, 567, 569, 1103, 1104, 1105,
+        1258, 1795
       ]
     },
     "Celts": {

diff --git a/src/data/strings.json b/src/data/strings.json
@@ -804,7 +804,7 @@
   "42104": "Create <b>Ratha</b> (‹cost›)<br>\nBengali unique chariot that can switch between melee and ranged attacks. Strong vs. infantry. Weak vs. Skirmishers and Camel Riders.<i> Upgrades: attack, armor (Blacksmith); speed, hit points (Stable); creation speed, to Elite Ratha 800F, 800W (Castle); more resistant to Monks (Monastery).</i><br>\n‹hp› ‹attack› ‹armor› ‹piercearmor› ‹range›",
   "42105": "Create <b>Elite Ratha</b> (‹cost›)<br>\nBengali unique chariot that can switch between melee and ranged attacks. Strong vs. infantry. Weak vs. Skirmishers and Camel Riders.<i> Upgrades: attack, armor (Blacksmith); speed, hit points (Stable); creation speed (Castle); more resistant to Monks (Monastery).</i><br>\n‹hp› ‹attack› ‹armor› ‹piercearmor› ‹range›",
   "120150": "Foot Archer civilization<br>\n<br>\n• Town Centers cost -50% wood starting in the Castle Age<br>\n• Foot archers (except skirmishers) +1 range in Castle and Imperial Age (+2 total)<br>\n• Shepherds work 25% faster<br>\n<br>\n<b>Unique Unit:</b> <br>\nLongbowman (archer)<br>\n<br>\n<b>Unique Techs:</b> <br>\n• Yeomen (+1 foot archer range<br>\n+2 tower attack)<br>\n• Warwolf (Trebuchets do blast damage)<br>\n<br>\n<b>Team Bonus:</b> <br>\nArchery Ranges work 10% faster",
-  "120151": "Cavalry civilization<br>\n<br>\n• Castles cost -25%<br>\n• Cavalry +20% hit points starting in Feudal Age<br>\n• Mill technologies free<br>\n• Foragers work 15% faster<br>\n<br>\n<b>Unique Unit:</b> <br>\nThrowing Axeman (infantry)<br>\n<br>\n<b>Unique Techs:</b> <br>\n• Bearded Axe (+1 Throwing Axemen range)<br>\n• Chivalry (Stables work 40% faster)<br>\n<br>\n<b>Team Bonus:</b> <br>\nKnights +2 line of sight",
+  "120151": "Cavalry civilization<br>\n<br>\n• Castles cost -15% in Castle, -25% in Imperial Age<br>\n• Cavalry +20% hit points starting in Feudal Age<br>\n• Mill technologies free<br>\n• Foragers work 15% faster<br>\n<br>\n<b>Unique Unit:</b> <br>\nThrowing Axeman (infantry)<br>\n<br>\n<b>Unique Techs:</b> <br>\n• Bearded Axe (+1 Throwing Axemen range)<br>\n• Chivalry (Stables work 40% faster)<br>\n<br>\n<b>Team Bonus:</b> <br>\nKnights +2 line of sight",
   "120152": "Infantry civilization<br>\n<br>\n• Infantry cost -20% in Dark, -25% in Feudal, -30% in Castle, -35% in Imperial Age<br>\n• Infantry +1 attack vs. buildings per age (starting from Feudal Age)<br>\n• Villagers +5 attack vs. wild boar; hunters carry +15 meat; hunt lasts 20% longer<br>\n• Loom can be researched instantly<br>\n• +10 population in Imperial Age<br>\n<br>\n<b>Unique Unit:</b> <br>\nHuskarl (infantry)<br>\n<br>\n<b>Unique Techs:</b> <br>\n• Anarchy (create Huskarls at Barracks)<br>\n• Perfusion (Barracks work 100% faster)<br>\n<br>\n<b>Team Bonus:</b> <br>\nBarracks work 20% faster",
   "120153": "Infantry civilization<br>\n<br>\n• Monks healing range 2x<br>\n• Towers garrison 2x units<br>\n• Murder Holes, Herbal Medicine free<br>\n• Farms cost -40%<br>\n• Town Center garrison +10<br>\n• Barracks and Stable units +1 armor in Castle and Imperial Age (+2 total)<br>\n<br>\n<b>Unique Unit:</b> <br>\nTeutonic Knight (infantry)<br>\n<br>\n<b>Unique Techs:</b> <br>\n• Ironclad (siege weapons extra melee armor)<br>\n• Crenellations (+3 range Castles<br>\ngarrisoned infantry fire arrows)<br>\n<br>\n<b>Team Bonus:</b> <br>\nUnits resist conversion",
   "120154": "Infantry civilization<br>\n<br>\n• Fishing Ships 2x hit points; +2P armor; work rate +5% Dark, +10% Feudal, +15% Castle, +20% Imperial Age<br>\n• Mill, Lumber/Mining Camps cost -50%<br>\n• Infantry attack 33% faster starting in Feudal Age<br>\n<br>\n<b>Unique Unit:</b> <br>\nSamurai (infantry)<br>\n<br>\n<b>Unique Techs:</b> <br>\n• Yasama (Towers shoot extra arrows)<br>\n• Kataparuto (Trebuchets fire, pack faster)<br>\n<br>\n<b>Team Bonus:</b> <br>\nGalleys +50% line of sight",

diff --git a/src/data/units_buildings_techs.json b/src/data/units_buildings_techs.json
@@ -5035,7 +5035,7 @@
       "language_file_help": 105109,
       "name": "MPCAV",
       "hit_points": 450,
-      "line_of_sight": 4,
+      "line_of_sight": 7,
       "garrison_capacity": 0,
       "type": 70,
       "class": 12
@@ -11566,7 +11566,7 @@
       "language_file_help": 105459,
       "name": "UMPCAV",
       "hit_points": 600,
-      "line_of_sight": 5,
+      "line_of_sight": 8,
       "garrison_capacity": 0,
       "type": 70,
       "class": 12
@@ -23261,7 +23261,7 @@
       "help_converter": 26525,
       "language_file_name": 0,
       "language_file_help": 105525,
-      "name": "Projectile Gunpowder (Secondary)",
+      "name": "Projectile Hussite Wagon (Secondary)",
       "hit_points": 1,
       "line_of_sight": -1,
       "garrison_capacity": 0,
@@ -34569,7 +34569,7 @@
     "1658": {
       "cost": {
         "wood": 0,
-        "food": 60,
+        "food": 50,
         "gold": 35,
         "stone": 0
       },
@@ -34590,7 +34590,7 @@
     "1659": {
       "cost": {
         "wood": 0,
-        "food": 60,
+        "food": 50,
         "gold": 35,
         "stone": 0
       },
@@ -34611,7 +34611,7 @@
     "1660": {
       "cost": {
         "wood": 0,
-        "food": 60,
+        "food": 50,
         "gold": 35,
         "stone": 0
       },
@@ -34632,7 +34632,7 @@
     "1661": {
       "cost": {
         "wood": 0,
-        "food": 60,
+        "food": 50,
         "gold": 35,
         "stone": 0
       },
@@ -35539,15 +35539,15 @@
         "gold": 70,
         "stone": 0
       },
-      "attack": 17,
+      "attack": 11,
       "melee_armor": 0,
       "pierce_armor": 7,
       "base_id": 1704,
       "help_converter": 26561,
       "language_file_name": 5561,
       "language_file_help": 105561,
       "name": "HUSSITEWAGON",
-      "hit_points": 200,
+      "hit_points": 180,
       "line_of_sight": 8,
       "garrison_capacity": 0,
       "type": 70,
@@ -35581,15 +35581,15 @@
         "gold": 70,
         "stone": 0
       },
-      "attack": 20,
+      "attack": 13,
       "melee_armor": 1,
       "pierce_armor": 10,
       "base_id": 1706,
       "help_converter": 26563,
       "language_file_name": 5563,
       "language_file_help": 105563,
       "name": "EHUSSITEWAGON",
-      "hit_points": 250,
+      "hit_points": 230,
       "line_of_sight": 8,
       "garrison_capacity": 0,
       "type": 70,
@@ -36375,7 +36375,7 @@
     "1744": {
       "cost": {
         "wood": 0,
-        "food": 130,
+        "food": 120,
         "gold": 95,
         "stone": 0
       },
@@ -36417,7 +36417,7 @@
     "1746": {
       "cost": {
         "wood": 0,
-        "food": 130,
+        "food": 120,
         "gold": 95,
         "stone": 0
       },
@@ -37353,7 +37353,7 @@
       "language_file_name": 5052,
       "language_file_help": 105052,
       "name": "CENTURION",
-      "hit_points": 120,
+      "hit_points": 110,
       "line_of_sight": 4,
       "garrison_capacity": 0,
       "type": 70,
@@ -41481,7 +41481,7 @@
       "help_converter": 28335,
       "language_file_name": 0,
       "language_file_help": 107335,
-      "name": "C-Bonus, Castle 1/2 Cost"
+      "name": "C-Bonus, Castle 15% cheaper"
     },
     "326": {
       "cost": {
@@ -41538,10 +41538,10 @@
         "gold": 0,
         "stone": 0
       },
-      "help_converter": -79000,
+      "help_converter": 28335,
       "language_file_name": 0,
-      "language_file_help": 0,
-      "name": "New Research"
+      "language_file_help": 107335,
+      "name": "C-Bonus, Castle 25% cheaper"
     },
     "331": {
       "cost": {

diff --git a/src/data/update.json b/src/data/update.json
@@ -0,0 +1,3 @@
+{
+  "DE": 93001
+}