Merge branch 'main' into 'main'

Main

See merge request dazed-translations/unholy-maiden!26

data/Armors.json

@@ -8396,7 +8396,7 @@
     {
         "id": 298,
         "atypeId": 3,
-        "description": "[Ability: Obtain black gunpowder from explosive jars without breaking them]\n\\c[6][Rarity: Super Rare]\\c[0] \\c[7][Not Stackable]\\c[0]",
+        "description": "[Ability: Obtain black powder from explosive jars without breaking them]\n\\c[6][Rarity: Super Rare]\\c[0] \\c[7][Not Stackable]\\c[0]",
         "etypeId": 7,
         "traits": [],
         "iconIndex": 318,

data/Items.json

@@ -19189,7 +19189,7 @@
         "hitType": 0,
         "iconIndex": 249,
         "itypeId": 1,
-        "name": "Black Gunpowder",
+        "name": "Black Powder",
         "note": "<DD価格:Math.floor(prev * \\V[389] / 100)>",
         "occasion": 3,
         "price": 5,

data/Map004.json

@@ -15653,7 +15653,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "I'm here to deliver the black gunpowder."
+                                "I'm here to deliver the black powder."
                             ]
                         },
                         {
@@ -15732,7 +15732,7 @@
                             "code": 401,
                             "indent": 1,
                             "parameters": [
-                                "I've confirmed receipt of 10 black gunpowder, no mistakes."
+                                "I've confirmed receipt of 10 black powder, no mistakes."
                             ]
                         },
                         {

data/Map291.json

@@ -14737,7 +14737,7 @@
                             "code": 401,
                             "indent": 0,
                             "parameters": [
-                                "I'm here to deliver the black gunpowder."
+                                "I'm here to deliver the black powder."
                             ]
                         },
                         {
@@ -14816,7 +14816,7 @@
                             "code": 401,
                             "indent": 1,
                             "parameters": [
-                                "I've confirmed receipt of 10 black gunpowder, no mistakes."
+                                "I've confirmed receipt of 10 black powder, no mistakes."
                             ]
                         },
                         {

data/Weapons.json

@@ -1404,7 +1404,7 @@
             }
         ],
         "iconIndex": 155,
-        "name": "Black Gunpowder Rifle",
+        "name": "Black Powder Rifle",
         "note": "<GunWeapon>\n<DD攻撃力:prev + (\\V[42] * 0.25)>\n<DD価格:Math.floor(prev * \\V[389] / 100)>",
         "params": [
             0,

gameupdate/vocab.txt

@@ -1115,7 +1115,7 @@ Lv162 エルダーシンボル (Lv162 Elder Symbol)
 グレートソード (Greatsword)
 巨人の剣 (Giant's Sword)
 --ライフル系/銃火器 (--Rifle Type/Firearms)
-黒色火薬ライフル (Black Gunpowder Rifle)
+黒色火薬ライフル (Black Powder Rifle)
 バヨネットライフル (Bayonet Rifle)
 水平二連ライフル (Double-Barreled Rifle)
 シモンの猟銃 (Simon's Hunting Rifle)
@@ -1416,7 +1416,7 @@ V.I.Pカード (V.I.P. Card)
 不浄の種子 (Impure Seed)
 砕けた種子殻 (Crushed Seed Shell)
 何かの骨 (Some Kind of Bone)
-黒色火薬 (Black Gunpowder)
+黒色火薬 (Black Powder)
 石灰 (Lime)
 鉄クズ (Scrap Iron)
 銀食器 (Silverware)