Merge branch 'main' into 'main'

greater than or equal to

See merge request dazed-translations/unholy-maiden!21
This commit is contained in:
DazedAnon 2025-12-28 06:37:16 +00:00
commit d82076fae0
5 changed files with 55 additions and 25 deletions

View file

@ -190129,7 +190129,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},

View file

@ -13834,7 +13834,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity refused to expose herself\n\\C[27][Condition: Lewdness >25%]\\C[0]"
"text": "\\n[1]'s sense of chastity refused to expose herself\n\\C[27][Condition: Lewdness 25%]\\C[0]"
}
]
},

View file

@ -19307,7 +19307,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -20153,7 +20153,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -20975,7 +20975,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -21807,7 +21807,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -24751,7 +24751,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -25569,7 +25569,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -26385,7 +26385,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -27200,7 +27200,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -28756,7 +28756,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},
@ -36771,7 +36771,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >\\v[406]%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness \\v[406]%]"
}
]
},

View file

@ -25904,7 +25904,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >40%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness 40%]"
}
]
},
@ -26072,7 +26072,7 @@
"addLog",
"テキストをログウィンドウに追加",
{
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness >40%]"
"text": "\\n[1]'s sense of chastity rejected it\n\\C[27][Condition: Lewdness 40%]"
}
]
},

View file

@ -550,17 +550,47 @@ Imported.TMLogWindow = true;
}
};
// リフレッシュ
Window_MapLog.prototype.refresh = function () {
this.contents.clear();
let actionLog = $gameSystem.actionLog();
let lh = this.lineHeight();
let n = Math.min(logWindowLines, actionLog.length);
for (let i = 0; i < n; i++) {
// this.drawTextEx(actionLog[actionLog.length - n + i], 0, lh * i);
this.drawTextEx('\\FS[' + String(logWindowFontSize) + ']' + actionLog[actionLog.length - n + i], 0, lh * i);
}
};
// リフレッシュ (Universal dynamic spacing)
Window_MapLog.prototype.refresh = function () {
this.contents.clear();
const actionLog = $gameSystem.actionLog();
const lh = this.lineHeight();
let startIndex = actionLog.length;
let linesUsed = 0;
// 1. Determine which entries fit
for (let i = actionLog.length - 1; i >= 0; i--) {
const lineCount = actionLog[i].split(/\n/).length;
if (linesUsed + lineCount > logWindowLines) {
break;
}
linesUsed += lineCount;
startIndex = i;
}
// 2. Draw entries
let currentY = 0;
for (let i = startIndex; i < actionLog.length; i++) {
const text = actionLog[i];
const linesInThisEntry = text.split(/\n/).length;
this.drawTextEx(
'\\FS[' + logWindowFontSize + ']' + text,
0,
currentY
);
// 3. Universal Logic:
// Calculate total height (lh * lines)
// Then subtract 12 pixels for EVERY newline after the first one.
const totalHeight = lh * linesInThisEntry;
const correction = (linesInThisEntry - 1) * 12;
currentY += (totalHeight - correction);
}
};
//-----------------------------------------------------------------------------
// Window_MenuLog