Merge branch 'main' into 'main'

fixed memo word wrap

See merge request dazed-translations/unholy-maiden!25
This commit is contained in:
DazedAnon 2026-01-01 00:46:53 +00:00
commit bd28386500
8 changed files with 12 additions and 12 deletions

View file

@ -8396,7 +8396,7 @@
{
"id": 298,
"atypeId": 3,
"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]",
"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]",
"etypeId": 7,
"traits": [],
"iconIndex": 318,

View file

@ -11180,7 +11180,7 @@
"iconIndex": 94,
"itypeId": 3,
"name": "Shrine Maiden's Diary 1",
"note": "<SG説明:XX Month XX Day\nI found a gem. A girl was rubbing her privates\nagainst the corner of a church pew, lost in\necstasy as she pleasured herself. She was so\npure and innocent, she didn't even know what she\nwas doing. She's greedy for pleasure, developing\nwell, and beautiful―she'll surely become a\nwoman loved by many men when she grows up.\nHer name seems to be \\n[1].\nI've decided on her.>\n\n<SGピクチャ:system_event_window16>\n<SGテキスト位置:bottom>",
"note": "<SG説明:XX Month XX Day\nI found a gem. A girl was rubbing her privates\nagainst the corner of a church pew, lost in\necstasy as she pleasured herself. So pure,\nso innocent... she didn't even know what she\nwas doing. Greedy for pleasure, developing\nwell, and beautiful―she'll surely become a\nwoman loved by many men when she grows up.\nHer name seems to be \\n[1].\nI've decided on her.>\n\n<SGピクチャ:system_event_window16>\n<SGテキスト位置:bottom>",
"occasion": 2,
"price": 2,
"repeats": 1,
@ -19189,7 +19189,7 @@
"hitType": 0,
"iconIndex": 249,
"itypeId": 1,
"name": "Black Powder",
"name": "Black Gunpowder",
"note": "<DD価格:Math.floor(prev * \\V[389] / 100)>",
"occasion": 3,
"price": 5,

View file

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

View file

@ -10423,7 +10423,7 @@
439,
0,
4,
"`Oh, it's you. Working hard, I hope?\\nhSpend your money wisely, heh eh.`"
"`Oh, it's you. Working hard, I hope?\\nSpend your money wisely, heh heh.`"
]
},
{

View file

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

View file

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

View file

@ -1115,7 +1115,7 @@ Lv162 エルダーシンボル (Lv162 Elder Symbol)
グレートソード (Greatsword)
巨人の剣 (Giant's Sword)
--ライフル系/銃火器 (--Rifle Type/Firearms)
黒色火薬ライフル (Black Powder Rifle)
黒色火薬ライフル (Black Gunpowder 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 Powder)
黒色火薬 (Black Gunpowder)
石灰 (Lime)
鉄クズ (Scrap Iron)
銀食器 (Silverware)

File diff suppressed because one or more lines are too long