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

teleport second player when off-screen

Browse source
This commit is contained in:
Sallai József 2022-07-18 01:57:49 +03:00
parent 7693a4ff20
commit 93e567981e
3 changed files with 184 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/bmfont_renderer.rs
View file

@ -132,12 +132,12 @@ impl BMFontRenderer {
offset_x + (glyph.xoffset as f32 * constants.font_scale), offset_x + (glyph.xoffset as f32 * constants.font_scale),
y + (glyph.yoffset as f32 * constants.font_scale), y + (glyph.yoffset as f32 * constants.font_scale),
color, color,
constants.font_scale, constants.font_scale * scale,
constants.font_scale, constants.font_scale * scale,
&Rect::new_size(glyph.x as u16, glyph.y as u16, glyph.width as u16, glyph.height as u16), &Rect::new_size(glyph.x as u16, glyph.y as u16, glyph.width as u16, glyph.height as u16),
); );
offset_x += glyph.xadvance as f32 * constants.font_scale; offset_x += glyph.xadvance as f32 * constants.font_scale * scale;
} }
} }

10
src/player/mod.rs
View file

@ -122,6 +122,7 @@ pub struct Player {
weapon_rect: Rect<u16>, weapon_rect: Rect<u16>,
dog_stack: Vec<DogStack>, dog_stack: Vec<DogStack>,
pub has_dog: bool, pub has_dog: bool,
pub teleport_counter: u16,
} }
impl Player { impl Player {
@ -176,6 +177,7 @@ impl Player {
weapon_rect: Rect::new(0, 0, 0, 0), weapon_rect: Rect::new(0, 0, 0, 0),
dog_stack: Vec::new(), dog_stack: Vec::new(),
has_dog: false, has_dog: false,
teleport_counter: 0,
} }
} }
@ -906,6 +908,14 @@ impl Player {
} }
} }
} }
pub fn update_teleport_counter(&mut self, state: &SharedGameState) {
self.teleport_counter += 1;
if self.teleport_counter == (state.settings.timing_mode.get_tps() * 4) as u16 {
self.teleport_counter = 0;
}
}
} }
impl GameEntity<&NPCList> for Player { impl GameEntity<&NPCList> for Player {

162
src/scene/game_scene.rs
View file

@ -98,8 +98,7 @@ pub enum LightingMode {
Ambient, Ambient,
} }
const P2_LEFT_TEXT: &str = "< P2"; const P2_OFFSCREEN_TEXT: &'static str = "P2";
const P2_RIGHT_TEXT: &str = "P2 >";
const CUTSCENE_SKIP_WAIT: u16 = 50; const CUTSCENE_SKIP_WAIT: u16 = 50;
impl GameScene { impl GameScene {
@ -1438,6 +1437,30 @@ impl GameScene {
self.frame.target_x = self.player1.target_x; self.frame.target_x = self.player1.target_x;
self.frame.target_y = self.player1.target_y; self.frame.target_y = self.player1.target_y;
} }
if self.player2.cond.alive() && !self.player2.cond.hidden() {
if self.player2.x + 0x1000 < self.frame.x
|| self.player2.x - 0x1000 > self.frame.x + state.canvas_size.0 as i32 * 0x200
|| self.player2.y + 0x1000 < self.frame.y
|| self.player2.y - 0x1000 > self.frame.y + state.canvas_size.1 as i32 * 0x200
{
self.player2.update_teleport_counter(state);
if self.player2.teleport_counter == 0 {
self.player2.x = self.player1.x;
self.player2.y = self.player1.y;
let mut npc = NPC::create(4, &state.npc_table);
npc.x = self.player2.x;
npc.y = self.player2.y;
npc.cond.set_alive(true);
let _ = self.npc_list.spawn(0x100, npc);
}
} else {
self.player2.teleport_counter = 0;
}
}
} }
UpdateTarget::NPC(npc_id) => { UpdateTarget::NPC(npc_id) => {
if let Some(npc) = self.npc_list.get_npc(npc_id as usize) { if let Some(npc) = self.npc_list.get_npc(npc_id as usize) {
@ -1949,50 +1972,150 @@ impl Scene for GameScene {
self.boss_life_bar.draw(state, ctx, &self.frame)?; self.boss_life_bar.draw(state, ctx, &self.frame)?;
if self.player2.cond.alive() && !self.player2.cond.hidden() { if self.player2.cond.alive() && !self.player2.cond.hidden() {
let y = interpolate_fix9_scale( if self.player2.teleport_counter < state.settings.timing_mode.get_tps() as u16 * 3
self.player2.prev_y - self.frame.prev_y, || self.player2.teleport_counter % 5 != 0
self.player2.y - self.frame.y, {
if self.player2.y + 0x1000 < self.frame.y {
let scale = 1.0 + (self.frame.y as f32 / self.player2.y as f32 / 2.0 - 0.5).clamp(0.0, 2.0);
let x = interpolate_fix9_scale(
self.player2.prev_x - self.frame.prev_x,
self.player2.x - self.frame.x,
state.frame_time, state.frame_time,
); );
let y = y.clamp(8.0, state.canvas_size.1 - 8.0 - state.font.line_height(&state.constants));
if self.player2.x + 0x1000 < self.frame.x { let x = x.clamp(
state.font.draw_colored_text( 8.0,
P2_LEFT_TEXT.chars(), state.canvas_size.0 - 8.0 * scale - state.font.line_height(&state.constants),
);
state.font.draw_colored_text_scaled(
P2_OFFSCREEN_TEXT.chars(),
x + 1.0,
9.0, 9.0,
y + 1.0, scale,
(0, 0, 130, 255), (0, 0, 130, 255),
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
)?; )?;
state.font.draw_colored_text( state.font.draw_colored_text_scaled(
P2_LEFT_TEXT.chars(), P2_OFFSCREEN_TEXT.chars(),
x,
8.0,
scale,
(96, 96, 255, 255),
&state.constants,
&mut state.texture_set,
ctx,
)?;
} else if self.player2.y - 0x1000 > self.frame.y + state.canvas_size.1 as i32 * 0x200 {
let scale = 1.0
+ (self.player2.y as f32 / (self.frame.y as f32 + state.canvas_size.1 * 0x200 as f32)
- 0.5)
.clamp(0.0, 2.0);
let x = interpolate_fix9_scale(
self.player2.prev_x - self.frame.prev_x,
self.player2.x - self.frame.x,
state.frame_time,
);
let x = x.clamp(
8.0,
state.canvas_size.0 - 8.0 * scale - state.font.line_height(&state.constants),
);
state.font.draw_colored_text_scaled(
P2_OFFSCREEN_TEXT.chars(),
x + 1.0,
state.canvas_size.1 - 8.0 * scale - state.font.line_height(&state.constants),
scale,
(0, 0, 130, 255),
&state.constants,
&mut state.texture_set,
ctx,
)?;
state.font.draw_colored_text_scaled(
P2_OFFSCREEN_TEXT.chars(),
x,
state.canvas_size.1 - 8.0 * scale - state.font.line_height(&state.constants) - 1.0,
scale,
(96, 96, 255, 255),
&state.constants,
&mut state.texture_set,
ctx,
)?;
} else if self.player2.x + 0x1000 < self.frame.x {
let scale = 1.0 + (self.frame.x as f32 / self.player2.x as f32 / 2.0 - 0.5).clamp(0.0, 2.0);
let y = interpolate_fix9_scale(
self.player2.prev_y - self.frame.prev_y,
self.player2.y - self.frame.y,
state.frame_time,
);
let y = y.clamp(
8.0,
state.canvas_size.1 - 8.0 * scale - state.font.line_height(&state.constants),
);
state.font.draw_colored_text_scaled(
P2_OFFSCREEN_TEXT.chars(),
9.0,
y + 1.0,
scale,
(0, 0, 130, 255),
&state.constants,
&mut state.texture_set,
ctx,
)?;
state.font.draw_colored_text_scaled(
P2_OFFSCREEN_TEXT.chars(),
8.0, 8.0,
y, y,
scale,
(96, 96, 255, 255), (96, 96, 255, 255),
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
)?; )?;
} else if self.player2.x - 0x1000 > self.frame.x + state.canvas_size.0 as i32 * 0x200 { } else if self.player2.x - 0x1000 > self.frame.x + state.canvas_size.0 as i32 * 0x200 {
let width = state.font.text_width(P2_RIGHT_TEXT.chars(), &state.constants); let scale = 1.0
+ (self.player2.x as f32 / (self.frame.x as f32 + state.canvas_size.0 * 0x200 as f32)
- 0.5)
.clamp(0.0, 2.0);
state.font.draw_colored_text( let y = interpolate_fix9_scale(
P2_RIGHT_TEXT.chars(), self.player2.prev_y - self.frame.prev_y,
state.canvas_size.0 - width - 8.0 + 1.0, self.player2.y - self.frame.y,
state.frame_time,
);
let y = y.clamp(
8.0,
state.canvas_size.1 - 8.0 * scale - state.font.line_height(&state.constants),
);
let width = state.font.text_width(P2_OFFSCREEN_TEXT.chars(), &state.constants);
state.font.draw_colored_text_scaled(
P2_OFFSCREEN_TEXT.chars(),
state.canvas_size.0 - width - 8.0 * scale + 1.0,
y + 1.0, y + 1.0,
scale,
(0, 0, 130, 255), (0, 0, 130, 255),
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
)?; )?;
state.font.draw_colored_text( state.font.draw_colored_text_scaled(
P2_RIGHT_TEXT.chars(), P2_OFFSCREEN_TEXT.chars(),
state.canvas_size.0 - width - 8.0, state.canvas_size.0 - width - 8.0 * scale,
y, y,
scale,
(96, 96, 255, 255), (96, 96, 255, 255),
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
@ -2001,6 +2124,7 @@ impl Scene for GameScene {
} }
} }
} }
}
ScriptMode::StageSelect => self.stage_select.draw(state, ctx, &self.frame)?, ScriptMode::StageSelect => self.stage_select.draw(state, ctx, &self.frame)?,
ScriptMode::Inventory => self.inventory_ui.draw(state, ctx, &self.frame)?, ScriptMode::Inventory => self.inventory_ui.draw(state, ctx, &self.frame)?,
_ => {} _ => {}