Merge branch 'main' into 'main'

Organ indicator and other fixes

See merge request dazed-translations/lust-oni!6
This commit is contained in:
DazedAnon 2025-11-11 08:27:26 +00:00
commit 6e20be6816
4 changed files with 64 additions and 14 deletions

View file

@ -23592,6 +23592,32 @@
1
]
},
{
"code": 111,
"indent": 0,
"parameters": [
12, "$gameMap.mapId() != 27 && $gameMap.mapId() != 282"
]
},
{
"code": 121,
"indent": 1,
"parameters": [
66,
66,
1
]
},
{
"code": 0,
"indent": 1,
"parameters": []
},
{
"code": 412,
"indent": 0,
"parameters": []
},
{
"code": 0,
"indent": 0,
@ -76977,6 +77003,11 @@
0
]
},
{
"code": 222,
"indent": 1,
"parameters": []
},
{
"code": 231,
"indent": 1,

View file

@ -2637,6 +2637,15 @@
"\\c[24]Organ... left side...\\C[0]"
]
},
{
"code": 121,
"indent": 0,
"parameters": [
410,
410,
0
]
},
{
"code": 0,
"indent": 0,

View file

@ -3772,18 +3772,18 @@
"selfSwitchValid": false,
"switch1Id": 1,
"switch1Valid": false,
"switch2Id": 1,
"switch2Valid": false,
"switch2Id": 410,
"switch2Valid": true,
"variableId": 1,
"variableValid": true,
"variableValue": 62
},
"directionFix": false,
"directionFix": true,
"image": {
"characterIndex": 0,
"characterName": "",
"direction": 2,
"pattern": 0,
"characterIndex": 6,
"characterName": "!Flame",
"direction": 8,
"pattern": 1,
"tileId": 0
},
"list": [
@ -3830,7 +3830,7 @@
"indent": 0,
"parameters": [
0,
"はい"
"Yes"
]
},
{
@ -3947,7 +3947,7 @@
"indent": 0,
"parameters": [
1,
"いいえ"
"No"
]
},
{
@ -3981,7 +3981,7 @@
"moveSpeed": 3,
"moveType": 0,
"priorityType": 1,
"stepAnime": false,
"stepAnime": true,
"through": false,
"trigger": 0,
"walkAnime": true
@ -3996,8 +3996,8 @@
"selfSwitchValid": false,
"switch1Id": 149,
"switch1Valid": true,
"switch2Id": 1,
"switch2Valid": false,
"switch2Id": 410,
"switch2Valid": true,
"variableId": 1,
"variableValid": false,
"variableValue": 0

View file

@ -124,7 +124,7 @@
"Accessory",
"Accessory"
],
"gameTitle": "Colorlust Oni v1.01 | TL: DazedAnon & O&M",
"gameTitle": "Colorlust Oni v1.02 | TL: DazedAnon & O&M",
"gameoverMe": {
"name": "Gameover2",
"pan": 0,
@ -725,7 +725,17 @@
"全クリア開放",
"撫子ハート消し",
"浅葱離脱後リトライ",
""
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"Read_Note_About_Organ"
],
"terms": {
"basic": [