phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-11-29 15:56:53 +00:00
Code Issues Releases Wiki Activity

life refill and <INP opcode

Browse source
This commit is contained in:
Alula 2020-09-10 00:21:27 +02:00
parent ebcee73af6
commit bed2641f10
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/text_script.rs
View file

@ -10,7 +10,7 @@ use std::str::FromStr;
use byteorder::ReadBytesExt; use byteorder::ReadBytesExt;
use itertools::Itertools; use itertools::Itertools;
use num_derive::FromPrimitive; use num_derive::FromPrimitive;
use num_traits::FromPrimitive; use num_traits::{FromPrimitive, clamp};
use crate::{SharedGameState, str}; use crate::{SharedGameState, str};
use crate::bitfield; use crate::bitfield;
@ -822,7 +822,7 @@ impl TextScriptVM {
exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32); exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32);
} }
OpCode::CNP => { OpCode::CNP | OpCode::INP => {
let event_num = read_cur_varint(&mut cursor)? as u16; let event_num = read_cur_varint(&mut cursor)? as u16;
let new_type = read_cur_varint(&mut cursor)? as u16; let new_type = read_cur_varint(&mut cursor)? as u16;
let direction = read_cur_varint(&mut cursor)? as usize; let direction = read_cur_varint(&mut cursor)? as usize;
@ -840,6 +840,10 @@ impl TextScriptVM {
npc.npc_flags.set_rear_and_top_not_hurt(false); npc.npc_flags.set_rear_and_top_not_hurt(false);
npc.npc_flags.set_show_damage(false); npc.npc_flags.set_show_damage(false);
if op == OpCode::INP {
npc.npc_flags.set_event_when_touched(true);
}
npc.npc_type = new_type; npc.npc_type = new_type;
npc.display_bounds = state.npc_table.get_display_bounds(new_type); npc.display_bounds = state.npc_table.get_display_bounds(new_type);
npc.hit_bounds = state.npc_table.get_hit_bounds(new_type); npc.hit_bounds = state.npc_table.get_hit_bounds(new_type);
@ -874,10 +878,10 @@ impl TextScriptVM {
exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32); exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32);
} }
OpCode::INP => { OpCode::LIp => {
let event_num = read_cur_varint(&mut cursor)? as u16; let life = read_cur_varint(&mut cursor)? as usize;
let new_type = read_cur_varint(&mut cursor)? as u16;
let direction = read_cur_varint(&mut cursor)? as u8; game_scene.player.life = clamp(game_scene.player.life + life, 0, game_scene.player.max_life);
exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32); exec_state = TextScriptExecutionState::Running(event, cursor.position() as u32);
} }
@ -897,7 +901,7 @@ impl TextScriptVM {
OpCode::NUM | OpCode::DNA | OpCode::NUM | OpCode::DNA |
OpCode::MPp | OpCode::SKm | OpCode::SKp | OpCode::EQp | OpCode::EQm | OpCode::MPp | OpCode::SKm | OpCode::SKp | OpCode::EQp | OpCode::EQm |
OpCode::ITp | OpCode::ITm | OpCode::AMm | OpCode::UNJ | OpCode::MPJ | OpCode::ITp | OpCode::ITm | OpCode::AMm | OpCode::UNJ | OpCode::MPJ |
OpCode::XX1 | OpCode::SIL | OpCode::LIp | OpCode::SOU | OpCode::XX1 | OpCode::SIL | OpCode::SOU |
OpCode::SSS | OpCode::ACH => { OpCode::SSS | OpCode::ACH => {
let par_a = read_cur_varint(&mut cursor)?; let par_a = read_cur_varint(&mut cursor)?;