2 Commits

Author SHA1 Message Date
65b22ccddf fix warn 2025-09-05 22:06:56 +08:00
7fc13b1619 fix scn patch bug 2025-09-05 22:05:38 +08:00

View File

@@ -443,7 +443,7 @@ impl Script for ScnScript {
return Err(anyhow::anyhow!("name is not a string or null"));
}
let has_name = text[0].is_string();
let mut has_display_name;
let has_display_name;
if text[1].is_list() {
while text[1].len() <= self.language_index {
text[1][self.language_index] = text[1][0].clone();
@@ -456,7 +456,6 @@ impl Script for ScnScript {
"display name is not a string or null"
));
}
has_display_name = text[1][self.language_index][0].is_string();
if text[1][self.language_index][1].is_string() {
let m = match cur_mes.take() {
Some(m) => m,
@@ -474,11 +473,7 @@ impl Script for ScnScript {
name = name.replace(key, value);
}
}
if has_display_name || self.language_index != 0 {
text[1][self.language_index][0].set_string(name);
} else {
text[0].set_string(name);
}
text[1][self.language_index][0].set_string(name);
} else {
return Err(anyhow::anyhow!(
"Name is missing for message. (text {j} at scene {i})"
@@ -561,7 +556,6 @@ impl Script for ScnScript {
"display name is not a string or null"
));
}
has_display_name = text[2][self.language_index][0].is_string();
if text[2][self.language_index][1].is_string() {
let m = match cur_mes.take() {
Some(m) => m,
@@ -579,16 +573,7 @@ impl Script for ScnScript {
name = name.replace(key, value);
}
}
if has_display_name || self.language_index != 0 {
text[2][self.language_index][0]
.set_string(name);
} else {
if text[1].is_string() {
text[1].set_string(name);
} else {
text[0].set_string(name);
}
}
text[2][self.language_index][0].set_string(name);
} else {
return Err(anyhow::anyhow!(
"Name is missing for message.(text {j} at scene {i})"