Skip to content

Implement Maniacs Battle Common Events #3307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MakoInfused wants to merge 3 commits into
base: master
Choose a base branch
from
+36 −0
Open

Implement Maniacs Battle Common Events #3307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe3ee9d
implemented maniacs battle common event triggers
MakoInfused Nov 18, 2024
e575a1d
resolved differences after rebasing from master
MakoInfused Dec 14, 2025
4ac69ce
fixing battle parallel event calls after merge resolution
MakoInfused Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/game_interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ inline void Game_Interpreter::Push(Game_Event* ev, const lcf::rpg::EventPage* pa
template<InterpreterExecutionType type_ex>
inline void Game_Interpreter::Push(Game_CommonEvent* ev) {
static_assert(type_ex == InterpreterExecutionType::AutoStart || type_ex == InterpreterExecutionType::Parallel
|| type_ex == InterpreterExecutionType::BattleStart || type_ex == InterpreterExecutionType::BattleParallel
|| type_ex == InterpreterExecutionType::Call || type_ex == InterpreterExecutionType::DeathHandler
|| type_ex == InterpreterExecutionType::DebugCall || type_ex == InterpreterExecutionType::ManiacHook, "Unexpected ExecutionType for CommonEvent"
);
Expand Down
30 changes: 30 additions & 0 deletions src/scene_battle_rpg2k3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@
#include "game_party.h"
#include "game_enemy.h"
#include "game_enemyparty.h"
#include "game_map.h"
#include "game_message.h"
#include "game_battle.h"
#include "game_interpreter_battle.h"
#include "game_battlealgorithm.h"
#include "game_screen.h"
#include "game_switches.h"
#include <lcf/reader_util.h>
#include "scene_gameover.h"
#include "utils.h"
Expand Down Expand Up @@ -972,6 +974,16 @@ void Scene_Battle_Rpg2k3::vUpdate() {
break;
}

if (state != State_Victory && state != State_Defeat) {
parallel_interpreter.Update();
if (!parallel_interpreter.IsRunning()) {
for (auto common_event : battle_parallel_events)
{
parallel_interpreter.Push<InterpreterExecutionType::BattleParallel>(common_event);
}
}
}

// this is checked separately because we want normal events to be processed
// just not sub-events called by maniacs battle hooks.
if (state != State_Victory && state != State_Defeat && Game_Battle::ManiacProcessSubEvents()) {
Expand Down Expand Up @@ -1114,6 +1126,23 @@ Scene_Battle_Rpg2k3::SceneActionReturn Scene_Battle_Rpg2k3::ProcessSceneAction()
return SceneActionReturn::eWaitTillNextFrame;
}

void Scene_Battle_Rpg2k3::CallBattleBeginCommonEvents() {
for (auto data_common_event : lcf::Data::commonevents) {
if ((!data_common_event.switch_flag || Main_Data::game_switches->Get(data_common_event.switch_id))) {
Copy link
Contributor

@ianling ianling Dec 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: condition could be inverted to reduce indenting:

Suggested change
if ((!data_common_event.switch_flag || Main_Data::game_switches->Get(data_common_event.switch_id))) {
if (data_common_event.switch_flag && !Main_Data::game_switches->Get(data_common_event.switch_id)) continue;

if (data_common_event.trigger == data_common_event.Trigger_maniac_battle_start) {
Game_CommonEvent* common_event = lcf::ReaderUtil::GetElement(Game_Map::GetCommonEvents(), data_common_event.ID);

Game_Battle::GetInterpreterBattle().Push<InterpreterExecutionType::BattleParallel>(common_event);
}
else if (data_common_event.trigger == data_common_event.Trigger_maniac_battle_parallel) {
Game_CommonEvent* common_event = lcf::ReaderUtil::GetElement(Game_Map::GetCommonEvents(), data_common_event.ID);

battle_parallel_events.push_back(common_event);
}
}
}
}

Scene_Battle_Rpg2k3::SceneActionReturn Scene_Battle_Rpg2k3::ProcessSceneActionStart() {
enum SubState {
eStartMessage,
Expand Down Expand Up @@ -1153,6 +1182,7 @@ Scene_Battle_Rpg2k3::SceneActionReturn Scene_Battle_Rpg2k3::ProcessSceneActionSt
EndNotification();
UpdateEnemiesDirection();
UpdateActorsDirection();
CallBattleBeginCommonEvents();
SetSceneActionSubState(eUpdateEvents);
return SceneActionReturn::eContinueThisFrame;
}
Expand Down
5 changes: 5 additions & 0 deletions src/scene_battle_rpg2k3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ class Scene_Battle_Rpg2k3 : public Scene_Battle {
void SetSceneActionSubState(int substate);
void ReturnToMainBattleState();

void CallBattleBeginCommonEvents();

// SceneAction State Machine Driver
SceneActionReturn ProcessSceneAction();

Expand Down Expand Up @@ -260,6 +262,9 @@ class Scene_Battle_Rpg2k3 : public Scene_Battle {
int GetNextReadyActor();

std::vector<int> atb_order;

std::vector<Game_CommonEvent*> battle_parallel_events;
Game_Interpreter_Battle parallel_interpreter;
};

#endif
Loading