Merge branch sakura-gozen:main into main

This commit is contained in:
onms 2025-01-24 16:07:16 +00:00
commit 90c9e43a72
7 changed files with 30 additions and 30 deletions

View file

@ -4486,7 +4486,7 @@
"hitType": 0,
"iconIndex": 89,
"itypeId": 2,
"name": "Tea Snack Set",
"name": "Snack",
"note": "<cate:3>",
"occasion": 3,
"price": 0,
@ -6492,7 +6492,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Oiran",
"name": "Show Off",
"note": "<SG種別:2>\n<SGカテゴリ:Terms>\n<SG説明:\\wdtext[227]>",
"occasion": 3,
"price": 0,
@ -6570,7 +6570,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Bajitofu",
"name": "Indifferent",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[230]>",
"occasion": 3,
"price": 0,
@ -6700,7 +6700,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Time Reaper",
"name": "Time Leaper",
"note": "<SG種別:2>\n<SGカテゴリ:Terms>\n<SG説明:\\wdtext[235]>",
"occasion": 3,
"price": 0,
@ -6778,7 +6778,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Popoz of Submission",
"name": "Submissive Popoz",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[238]>",
"occasion": 3,
"price": 0,
@ -6804,7 +6804,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Shota Eater",
"name": "Shota-Eater",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[239]>",
"occasion": 3,
"price": 0,
@ -6830,7 +6830,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Loli Root",
"name": "Lolicon",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[240]>",
"occasion": 3,
"price": 0,
@ -6908,7 +6908,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Yurikko",
"name": "Yuri",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[243]>",
"occasion": 3,
"price": 0,
@ -6934,7 +6934,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Money Grubber",
"name": "Money-Grubber",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[244]>",
"occasion": 3,
"price": 0,
@ -7142,7 +7142,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Dark Assassination",
"name": "Assassin",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[252]>",
"occasion": 3,
"price": 0,
@ -7194,7 +7194,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Beast Path",
"name": "Beast",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[254]>",
"occasion": 3,
"price": 0,
@ -7220,7 +7220,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Fallen Female",
"name": "Fallen Samurai",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[255]>",
"occasion": 3,
"price": 0,
@ -7428,7 +7428,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Milk Sharing",
"name": "Milk",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[263]>",
"occasion": 3,
"price": 0,
@ -7454,7 +7454,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Branch Style",
"name": "Branch",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[264]>",
"occasion": 3,
"price": 0,
@ -7506,7 +7506,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Furious Pouty Face",
"name": "Stern Face",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[266]>",
"occasion": 3,
"price": 0,
@ -7610,7 +7610,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Kinta's Great Fortune",
"name": "Kintadaimankou",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[270]>",
"occasion": 3,
"price": 0,
@ -7662,7 +7662,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Fruitless Style",
"name": "Style",
"note": "<SG種別:2><SGカテゴリ:Terms>\n<SG説明:\\wdtext[272]>",
"occasion": 3,
"price": 0,
@ -8260,7 +8260,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Fellatio",
"name": "Blowjob",
"note": "<SG種別:2>\n<SG手動>\n<SGカテゴリ:Terms>\n<SG説明:\\wdtext[295]>",
"occasion": 3,
"price": 0,
@ -8312,7 +8312,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Seed Planting Press",
"name": "Breeding Press",
"note": "<SG種別:2>\n<SG手動>\n<SGカテゴリ:Terms>\n<SG説明:\\wdtext[297]>",
"occasion": 3,
"price": 0,
@ -8338,7 +8338,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Anal Sex...!",
"name": "Anal",
"note": "<SG種別:2>\n<SG手動>\n<SGカテゴリ:Terms>\n<SG説明:\\wdtext[298]>",
"occasion": 3,
"price": 0,
@ -9742,7 +9742,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Apparition",
"name": "Ghost",
"note": "<SG種別:2>\n<SGカテゴリ:Characters & Key Terms>\n<SG説明:\\sptext[352]>",
"occasion": 3,
"price": 0,
@ -9846,7 +9846,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Three Great Apparitions",
"name": "Three Great Youkai",
"note": "<SG種別:2>\n<SGカテゴリ:Characters & Key Terms>\n<SG説明:\\sptext[356]>",
"occasion": 3,
"price": 0,
@ -10314,7 +10314,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Five-Petaled Cherry Blossom",
"name": "Five-Petal Sakura",
"note": "<SG種別:2>\n<SGカテゴリ:Characters & Key Terms>\n<SG説明:\\sptext[374]>",
"occasion": 3,
"price": 0,
@ -10600,7 +10600,7 @@
"hitType": 0,
"iconIndex": 255,
"itypeId": 3,
"name": "Deceased Tachibana",
"name": "Falling Tachibana",
"note": "<SG種別:2><SG手動>\n<SGカテゴリ:Characters & Key Terms>\n<SG説明:\\sptext[385]>",
"occasion": 3,
"price": 0,

View file

@ -3340,7 +3340,7 @@
"code": 401,
"indent": 0,
"parameters": [
"...No, no, poverty dulls the sword... Once a\nmonth, six bales of rice... ...At least, just one\nbale...?"
"...No, no, desolation dulls the sword... Once a\nmonth, six bales of rice... ...At least, just one\nbale...?"
]
},
{

View file

@ -9431,7 +9431,7 @@
"code": 401,
"indent": 0,
"parameters": [
"Ohh...! Victory shout...! Shishou, you're so\ncool...!"
"Ohh...! Victory cry...! Shishou, you're so\ncool...!"
]
},
{

View file

@ -3730,7 +3730,7 @@
"code": 401,
"indent": 0,
"parameters": [
"...You're the only daughter of Narusuzu Shrine...\n...which means, no parents anymore... Anyway, it's\ndangerous for a child to be alone...!"
"...You're the only daughter of Naruzu Shrine...\n...which means, no parents anymore... Anyway, it's\ndangerous for a child to be alone...!"
]
},
{

View file

@ -254,7 +254,7 @@ and this ideology is strongly reflected.
@end
@start 352
\ac\{【Specter】\}
\ac\{【Ghost】\}
Those who primarily feed on lust.
Having transformed into strange shapes, they have rarely been seen

View file

@ -270,7 +270,7 @@ The food version is very delicious.
@end
@start 243
\ac\{【yurikko】\}
\ac\{【Yuri】\}
Refers to women who love women.
Trial and error in confirming their feelings.

View file

@ -1422,7 +1422,7 @@
this.getAllHiddenGlossaryList().forEach(
function (item) {
if (!this.hasItem(item) && this.isAutoGlossaryWord(item)) {
if (likeFlag && !text.contains(item.name)) {
if (likeFlag && !text.toLowerCase().contains(item.name.toLowerCase())) {
return;
}
if (!likeFlag && text !== item.name) {