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

Puu black fix and reword Vsync options

Browse source
This commit is contained in:
dawnDus 2022-04-14 22:15:25 -04:00
parent ca1d7a8642
commit 11f335acc4
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
4 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/builtin/locale/en.json
View file

@ -60,15 +60,15 @@
"vsync_mode": { "vsync_mode": {
"entry": "V-Sync:", "entry": "V-Sync:",
"uncapped": "Uncapped", "uncapped": "Uncapped",
"uncapped_desc": "No V-Sync, game runs at uncapped frame rate.", "uncapped_desc": "V-Sync Off.",
"vsync": "Enabled", "vsync": "Enabled",
"vsync_desc": "Frame rate is synchronized to V-Sync interval.", "vsync_desc": "V-Sync On.",
"vrr_1x": "Variable Refresh Rate - 1x game tick", "vrr_1x": "Variable Refresh Rate (1x)",
"vrr_1x_desc": "Synced to 1*TPS, uses (G-/Free)Sync if available.", "vrr_1x_desc": "Uses (G-/Free)Sync if available.",
"vrr_2x": "Variable Refresh Rate - 2x game tick", "vrr_2x": "Variable Refresh Rate (2x)",
"vrr_2x_desc": "Synced to 2*TPS, uses (G-/Free)Sync if available.", "vrr_2x_desc": "Uses (G-/Free)Sync if available.",
"vrr_3x": "Variable Refresh Rate - 3x game tick", "vrr_3x": "Variable Refresh Rate (3x)",
"vrr_3x_desc": "Synced to 3*TPS, uses (G-/Free)Sync if available." "vrr_3x_desc": "Uses (G-/Free)Sync if available."
} }
}, },

16
src/builtin/locale/jp.json
View file

@ -54,15 +54,15 @@
"vsync_mode": { "vsync_mode": {
"entry": "V-Sync:", "entry": "V-Sync:",
"uncapped": "Uncapped", "uncapped": "Uncapped",
"uncapped_desc": "No V-Sync, game runs at uncapped frame rate.", "uncapped_desc": "V-Sync Off.",
"vsync": "Enabled", "vsync": "Enabled",
"vsync_desc": "Frame rate is synchronized to V-Sync interval.", "vsync_desc": "V-Sync On.",
"vrr_1x": "Variable Refresh Rate - 1x game tick", "vrr_1x": "Variable Refresh Rate (1x)",
"vrr_1x_desc": "Synced to 1*TPS, uses (G-/Free)Sync if available.", "vrr_1x_desc": "Uses (G-/Free)Sync if available.",
"vrr_2x": "Variable Refresh Rate - 2x game tick", "vrr_2x": "Variable Refresh Rate (2x)",
"vrr_2x_desc": "Synced to 2*TPS, uses (G-/Free)Sync if available.", "vrr_2x_desc": "Uses (G-/Free)Sync if available.",
"vrr_3x": "Variable Refresh Rate - 3x game tick", "vrr_3x": "Variable Refresh Rate (3x)",
"vrr_3x_desc": "Synced to 3*TPS, uses (G-/Free)Sync if available." "vrr_3x_desc": "Uses (G-/Free)Sync if available."
} }
}, },
"sound": "サウンド", "sound": "サウンド",

21
src/menu/settings_menu.rs
View file

@ -283,7 +283,7 @@ impl SettingsMenu {
_ => (), _ => (),
}, },
CurrentMenu::GraphicsMenu => match self.graphics.tick(controller, state) { CurrentMenu::GraphicsMenu => match self.graphics.tick(controller, state) {
MenuSelectionResult::Selected(0, toggle) => { MenuSelectionResult::Selected(0, toggle) | MenuSelectionResult::Right(0, toggle, _) => {
if let MenuEntry::DescriptiveOptions(_, value, _, _) = toggle { if let MenuEntry::DescriptiveOptions(_, value, _, _) = toggle {
let (new_mode, new_value) = match *value { let (new_mode, new_value) = match *value {
0 => (VSyncMode::VSync, 1), 0 => (VSyncMode::VSync, 1),
@ -295,7 +295,24 @@ impl SettingsMenu {
*value = new_value; *value = new_value;
state.settings.vsync_mode = new_mode; state.settings.vsync_mode = new_mode;
graphics::set_vsync_mode(ctx, new_mode); graphics::set_vsync_mode(ctx, new_mode)?;
let _ = state.settings.save(ctx);
}
}
MenuSelectionResult::Left(0, toggle, _) => {
if let MenuEntry::DescriptiveOptions(_, value, _, _) = toggle {
let (new_mode, new_value) = match *value {
0 => (VSyncMode::VRRTickSync3x, 4),
1 => (VSyncMode::Uncapped, 0),
2 => (VSyncMode::VSync, 1),
3 => (VSyncMode::VRRTickSync1x, 2),
_ => (VSyncMode::VRRTickSync2x, 3),
};
*value = new_value;
state.settings.vsync_mode = new_mode;
graphics::set_vsync_mode(ctx, new_mode)?;
let _ = state.settings.save(ctx); let _ = state.settings.save(ctx);
} }

7
src/npc/ai/maze.rs
View file

@ -755,9 +755,7 @@ impl NPC {
} else { } else {
self.anim_num = if self.direction != Direction::Left { 1 } else { 0 }; self.anim_num = if self.direction != Direction::Left { 1 } else { 0 };
self.anim_rect.top += self.action_counter3 / 8;
self.y = ((self.action_counter3 as i32 / 8) * 0x200) + self.target_y; self.y = ((self.action_counter3 as i32 / 8) * 0x200) + self.target_y;
self.anim_rect.left -= if (self.action_counter3 & 0x02) != 0 { 1 } else { 0 };
} }
if self.action_counter3 % 3 == 2 { if self.action_counter3 % 3 == 2 {
let mut npc = NPC::create(161, &state.npc_table); let mut npc = NPC::create(161, &state.npc_table);
@ -787,6 +785,11 @@ impl NPC {
self.anim_rect = state.constants.npc.n162_puu_black_dead[self.anim_num as usize]; self.anim_rect = state.constants.npc.n162_puu_black_dead[self.anim_num as usize];
if self.action_num == 2 && self.action_counter3 <= 240 {
self.anim_rect.top += self.action_counter3 / 8;
self.anim_rect.left -= if (self.action_counter3 & 0x02) != 0 { 1 } else { 0 };
}
Ok(()) Ok(())
} }