phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-12-01 17:00:43 +00:00
Code Issues Releases Wiki Activity

add <2PJ tsc command

Browse source
This commit is contained in:
Alula 2021-10-11 00:17:49 +02:00
parent 3f9ad235ce
commit 01e35a09eb
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/text_script.rs
View file

@ -277,6 +277,9 @@ pub enum OpCode {
/// - if it's 1 put the player on right side of the player, otherwise put it on left
#[strum(serialize = "2MV")]
S2MV,
/// <2PJ, jump to event if in multiplayer mode.
#[strum(serialize = "2PJ")]
S2PJ,
/// <INJxxxx:yyyy:zzzz, Jumps to event zzzz if amount of item xxxx equals yyyy
INJ,
/// <I+Nxxxx:yyyy, Adds item xxxx with maximum amount of yyyy
@ -1084,6 +1087,16 @@ impl TextScriptVM {
exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32);
}
}
OpCode::S2PJ => {
let event_num = read_cur_varint(&mut cursor)? as u16;
exec_state = if game_scene.player2.cond.alive() {
TextScriptExecutionState::Running(event_num, 0)
} else {
TextScriptExecutionState::Running(event, cursor.position() as u32)
}
}
OpCode::EVE => {
let event_num = read_cur_varint(&mut cursor)? as u16;
@ -2106,6 +2119,7 @@ impl TextScript {
| OpCode::SSS
| OpCode::ACH
| OpCode::S2MV
| OpCode::S2PJ
| OpCode::PSH => {
let operand = TextScript::read_number(iter)?;
TextScript::put_varint(instr as i32, out);
@ -2286,6 +2300,7 @@ impl TextScript {
| OpCode::SSS
| OpCode::ACH
| OpCode::S2MV
| OpCode::S2PJ
| OpCode::PSH => {
let par_a = read_cur_varint(&mut cursor)?;