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

Boss damage popups

Browse source
This commit is contained in:
dawnDus 2022-02-26 23:53:33 -05:00
parent ccd4030dc1
commit b29fe87e76
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/npc/boss/mod.rs
View file

@ -95,6 +95,9 @@ impl GameEntity<([&mut Player; 2], &NPCList, &mut Stage, &BulletManager, &mut Fl
if part.shock > 0 {
part.shock -= 1;
}
part.popup.x = part.x;
part.popup.y = part.y;
part.popup.tick(state, ())?;
}
Ok(())
}

26
src/scene/game_scene.rs
View file

@ -5,7 +5,7 @@ use std::rc::Rc;
use log::info;
use crate::caret::CaretType;
use crate::common::{Color, Direction, interpolate_fix9_scale, Rect};
use crate::common::{interpolate_fix9_scale, Color, Direction, Rect};
use crate::components::background::Background;
use crate::components::boss_life_bar::BossLifeBar;
use crate::components::credits::Credits;
@ -24,31 +24,31 @@ use crate::components::water_renderer::WaterRenderer;
use crate::components::whimsical_star::WhimsicalStar;
use crate::entity::GameEntity;
use crate::frame::{Frame, UpdateTarget};
use crate::framework::{filesystem, graphics};
use crate::framework::backend::SpriteBatchCommand;
use crate::framework::context::Context;
use crate::framework::error::GameResult;
use crate::framework::graphics::{BlendMode, draw_rect, FilterMode};
use crate::framework::graphics::{draw_rect, BlendMode, FilterMode};
use crate::framework::ui::Components;
use crate::framework::{filesystem, graphics};
use crate::input::touch_controls::TouchControlType;
use crate::inventory::{Inventory, TakeExperienceResult};
use crate::map::WaterParams;
use crate::menu::pause_menu::PauseMenu;
use crate::npc::{NPC, NPCLayer};
use crate::npc::boss::BossNPC;
use crate::npc::list::NPCList;
use crate::physics::{OFFSETS, PhysicalEntity};
use crate::npc::{NPCLayer, NPC};
use crate::physics::{PhysicalEntity, OFFSETS};
use crate::player::{ControlMode, Player, TargetPlayer};
use crate::rng::XorShift;
use crate::scene::Scene;
use crate::scene::title_scene::TitleScene;
use crate::scene::Scene;
use crate::scripting::tsc::credit_script::CreditScriptVM;
use crate::scripting::tsc::text_script::{ScriptMode, TextScriptExecutionState, TextScriptVM};
use crate::shared_game_state::{SharedGameState, TileSize};
use crate::stage::{BackgroundType, Stage, StageTexturePaths};
use crate::texture_set::SpriteBatch;
use crate::weapon::{Weapon, WeaponType};
use crate::weapon::bullet::BulletManager;
use crate::weapon::{Weapon, WeaponType};
pub struct GameScene {
pub tick: u32,
@ -217,6 +217,13 @@ impl GameScene {
Ok(())
}
fn draw_boss_popup(&self, state: &mut SharedGameState, ctx: &mut Context) -> GameResult {
for part in self.boss.parts.iter() {
part.popup.draw(state, ctx, &self.frame)?;
}
Ok(())
}
fn draw_bullets(&self, state: &mut SharedGameState, ctx: &mut Context) -> GameResult {
let batch = state.texture_set.get_or_load_batch(ctx, &state.constants, "Bullet")?;
let mut x: i32;
@ -1192,6 +1199,10 @@ impl GameScene {
npc.life = (npc.life as i32).saturating_sub(bullet.damage as i32).clamp(0, u16::MAX as i32) as u16;
if npc.npc_flags.show_damage() {
npc.popup.add_value(-bullet.damage);
}
if npc.life == 0 {
npc.life = npc.id;
@ -1812,6 +1823,7 @@ impl Scene for GameScene {
self.player1.popup.draw(state, ctx, &self.frame)?;
self.player2.popup.draw(state, ctx, &self.frame)?;
self.draw_npc_popup(state, ctx)?;
self.draw_boss_popup(state, ctx)?;
if !state.control_flags.credits_running()
&& state.settings.shader_effects