From 1f14c4206afdd5e445a220a42a28f9543db5cb96 Mon Sep 17 00:00:00 2001
From: Mauro Junior <45118493+jetrotal@users.noreply.github.com>
Date: Wed, 3 Jan 2024 20:54:29 -0300
Subject: [PATCH] @easyrpg_raw - Further use kCodeTags instead of a custom tag
reader
now, our raw code also use this library.
---
src/constants.h | 161 +----------------------------------------
src/dynrpg_easyrpg.cpp | 10 ++-
2 files changed, 10 insertions(+), 161 deletions(-)
diff --git a/src/constants.h b/src/constants.h
index 6cf16083862..a0d3a5a7d7c 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -1178,170 +1178,13 @@ class Constants {
{"CONDITIONLIMITATION_ATTACKALLY", 3} // LEGACY
};
- EventCode = {
- {"END", 10},
- {"CallCommonEvent", 1005},
- {"ForceFlee", 1006},
- {"EnableCombo", 1007},
- {"ChangeClass", 1008},
- {"ChangeBattleCommands", 1009},
- {"OpenLoadMenu", 5001},
- {"ExitGame", 5002},
- {"ToggleAtbMode", 5003},
- {"ToggleFullscreen", 5004},
- {"OpenVideoOptions", 5005},
- {"ShowMessage", 10110},
- {"MessageOptions", 10120},
- {"ChangeFaceGraphic", 10130},
- {"ShowChoice", 10140},
- {"InputNumber", 10150},
- {"ControlSwitches", 10210},
- {"ControlVars", 10220},
- {"TimerOperation", 10230},
- {"ChangeGold", 10310},
- {"ChangeItems", 10320},
- {"ChangePartyMembers", 10330},
- {"ChangeExp", 10410},
- {"ChangeLevel", 10420},
- {"ChangeParameters", 10430},
- {"ChangeSkills", 10440},
- {"ChangeEquipment", 10450},
- {"ChangeHP", 10460},
- {"ChangeSP", 10470},
- {"ChangeCondition", 10480},
- {"FullHeal", 10490},
- {"SimulatedAttack", 10500},
- {"ChangeHeroName", 10610},
- {"ChangeHeroTitle", 10620},
- {"ChangeSpriteAssociation", 10630},
- {"ChangeActorFace", 10640},
- {"ChangeVehicleGraphic", 10650},
- {"ChangeSystemBGM", 10660},
- {"ChangeSystemSFX", 10670},
- {"ChangeSystemGraphics", 10680},
- {"ChangeScreenTransitions", 10690},
- {"EnemyEncounter", 10710},
- {"OpenShop", 10720},
- {"ShowInn", 10730},
- {"EnterHeroName", 10740},
- {"Teleport", 10810},
- {"MemorizeLocation", 10820},
- {"RecallToLocation", 10830},
- {"EnterExitVehicle", 10840},
- {"SetVehicleLocation", 10850},
- {"ChangeEventLocation", 10860},
- {"TradeEventLocations", 10870},
- {"StoreTerrainID", 10910},
- {"StoreEventID", 10920},
- {"EraseScreen", 11010},
- {"ShowScreen", 11020},
- {"TintScreen", 11030},
- {"FlashScreen", 11040},
- {"ShakeScreen", 11050},
- {"PanScreen", 11060},
- {"WeatherEffects", 11070},
- {"ShowPicture", 11110},
- {"MovePicture", 11120},
- {"ErasePicture", 11130},
- {"ShowBattleAnimation", 11210},
- {"PlayerVisibility", 11310},
- {"FlashSprite", 11320},
- {"MoveEvent", 11330},
- {"ProceedWithMovement", 11340},
- {"HaltAllMovement", 11350},
- {"Wait", 11410},
- {"PlayBGM", 11510},
- {"FadeOutBGM", 11520},
- {"MemorizeBGM", 11530},
- {"PlayMemorizedBGM", 11540},
- {"PlaySound", 11550},
- {"PlayMovie", 11560},
- {"KeyInputProc", 11610},
- {"ChangeMapTileset", 11710},
- {"ChangePBG", 11720},
- {"ChangeEncounterSteps", 11740},
- {"TileSubstitution", 11750},
- {"TeleportTargets", 11810},
- {"ChangeTeleportAccess", 11820},
- {"EscapeTarget", 11830},
- {"ChangeEscapeAccess", 11840},
- {"OpenSaveMenu", 11910},
- {"ChangeSaveAccess", 11930},
- {"OpenMainMenu", 11950},
- {"ChangeMainMenuAccess", 11960},
- {"ConditionalBranch", 12010},
- {"Label", 12110},
- {"JumpToLabel", 12120},
- {"Loop", 12210},
- {"BreakLoop", 12220},
- {"EndEventProcessing", 12310},
- {"EraseEvent", 12320},
- {"CallEvent", 12330},
- {"Comment", 12410},
- {"GameOver", 12420},
- {"ReturntoTitleScreen", 12510},
- {"ChangeMonsterHP", 13110},
- {"ChangeMonsterMP", 13120},
- {"ChangeMonsterCondition", 13130},
- {"ShowHiddenMonster", 13150},
- {"ChangeBattleBG", 13210},
- {"ShowBattleAnimation_B", 13260},
- {"ConditionalBranch_B", 13310},
- {"TerminateBattle", 13410},
- {"ShowMessage_2", 20110},
- {"ShowChoiceOption", 20140},
- {"ShowChoiceEnd", 20141},
- {"VictoryHandler", 20710},
- {"EscapeHandler", 20711},
- {"DefeatHandler", 20712},
- {"EndBattle", 20713},
- {"Transaction", 20720},
- {"NoTransaction", 20721},
- {"EndShop", 20722},
- {"Stay", 20730},
- {"NoStay", 20731},
- {"EndInn", 20732},
- {"ElseBranch", 22010},
- {"EndBranch", 22011},
- {"EndLoop", 22210},
- {"Comment_2", 22410},
- {"ElseBranch_B", 23310},
- {"EndBranch_B", 23311},
- {"Maniac_GetSaveInfo", 3001},
- {"Maniac_Save", 3002},
- {"Maniac_Load", 3003},
- {"Maniac_EndLoadProcess", 3004},
- {"Maniac_GetMousePosition", 3005},
- {"Maniac_SetMousePosition", 3006},
- {"Maniac_ShowStringPicture", 3007},
- {"Maniac_GetPictureInfo", 3008},
- {"Maniac_ControlBattle", 3009},
- {"Maniac_ControlAtbGauge", 3010},
- {"Maniac_ChangeBattleCommandEx", 3011},
- {"Maniac_GetBattleInfo", 3012},
- {"Maniac_ControlVarArray", 3013},
- {"Maniac_KeyInputProcEx", 3014},
- {"Maniac_RewriteMap", 3015},
- {"Maniac_ControlGlobalSave", 3016},
- {"Maniac_ChangePictureId", 3017},
- {"Maniac_SetGameOption", 3018},
- {"Maniac_CallCommand", 3019},
- {"Maniac_ControlStrings", 3020},
- {"Maniac_GetGameInfo", 3021},
- {"Maniac_EditPicture", 3025},
- {"Maniac_WritePicture", 3026},
- {"Maniac_AddMoveRoute", 3027},
- {"Maniac_EditTile", 3028},
- {"Maniac_ControlTextProcessing", 3029}
- };
};
- // Function to return contents from either DestinyScript or EventCode
+ // Function to return contents from either DestinyScript or something else
std::unordered_map<std::string, int>& MapCollection(const std::string& collectionName) {
if ( Utils::StrICmp(collectionName, "destinyscript") == 0 ) return DestinyScript;
- else if ( Utils::StrICmp(collectionName, "eventcode") == 0 ) return EventCode;
- else return EventCode;
+ else return DestinyScript;
};
// Function to retrieve a value from mapCollection ignoring case
diff --git a/src/dynrpg_easyrpg.cpp b/src/dynrpg_easyrpg.cpp
index 382bf59168b..5640c694b8f 100644
--- a/src/dynrpg_easyrpg.cpp
+++ b/src/dynrpg_easyrpg.cpp
@@ -142,8 +142,14 @@ bool DynRpg::EasyRpgPlugin::EasyRaw(dyn_arg_list args, Game_Interpreter* interpr
// Output::Debug("code ----> {}", args[i]);
- if (args[i].front() == '$')
- args[i] = constList.get("EventCode", args[i].substr(1));
+ if (args[i].front() == '$') {
+ for (const auto& pair : lcf::rpg::EventCommand::kCodeTags.tags()) {
+ if (Utils::StrICmp(pair.name, args[i].substr(1)) == 0) {
+ args[i] = std::to_string(pair.value);
+ break;
+ }
+ }
+ };
std::tie(cmd.code) = DynRpg::ParseArgs<int>(func, args.subspan(i), &okay);
}
else if (i == stringArgIndex)