Skip to content

Commit 04ca1ba

Browse files
jetrotaljetrotal
committed
@easyrpg_raw - Further use kCodeTags instead of a custom tag reader
now, our raw code also use this library.
1 parent a97f37f commit 04ca1ba

2 files changed

Lines changed: 11 additions & 161 deletions

File tree

‎src/constants.h‎

Lines changed: 2 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,170 +1178,13 @@ class Constants {
11781178
{"CONDITIONLIMITATION_ATTACKALLY", 3} // LEGACY
11791179

11801180
};
1181-
EventCode = {
1182-
{"END", 10},
1183-
{"CallCommonEvent", 1005},
1184-
{"ForceFlee", 1006},
1185-
{"EnableCombo", 1007},
1186-
{"ChangeClass", 1008},
1187-
{"ChangeBattleCommands", 1009},
1188-
{"OpenLoadMenu", 5001},
1189-
{"ExitGame", 5002},
1190-
{"ToggleAtbMode", 5003},
1191-
{"ToggleFullscreen", 5004},
1192-
{"OpenVideoOptions", 5005},
1193-
{"ShowMessage", 10110},
1194-
{"MessageOptions", 10120},
1195-
{"ChangeFaceGraphic", 10130},
1196-
{"ShowChoice", 10140},
1197-
{"InputNumber", 10150},
1198-
{"ControlSwitches", 10210},
1199-
{"ControlVars", 10220},
1200-
{"TimerOperation", 10230},
1201-
{"ChangeGold", 10310},
1202-
{"ChangeItems", 10320},
1203-
{"ChangePartyMembers", 10330},
1204-
{"ChangeExp", 10410},
1205-
{"ChangeLevel", 10420},
1206-
{"ChangeParameters", 10430},
1207-
{"ChangeSkills", 10440},
1208-
{"ChangeEquipment", 10450},
1209-
{"ChangeHP", 10460},
1210-
{"ChangeSP", 10470},
1211-
{"ChangeCondition", 10480},
1212-
{"FullHeal", 10490},
1213-
{"SimulatedAttack", 10500},
1214-
{"ChangeHeroName", 10610},
1215-
{"ChangeHeroTitle", 10620},
1216-
{"ChangeSpriteAssociation", 10630},
1217-
{"ChangeActorFace", 10640},
1218-
{"ChangeVehicleGraphic", 10650},
1219-
{"ChangeSystemBGM", 10660},
1220-
{"ChangeSystemSFX", 10670},
1221-
{"ChangeSystemGraphics", 10680},
1222-
{"ChangeScreenTransitions", 10690},
1223-
{"EnemyEncounter", 10710},
1224-
{"OpenShop", 10720},
1225-
{"ShowInn", 10730},
1226-
{"EnterHeroName", 10740},
1227-
{"Teleport", 10810},
1228-
{"MemorizeLocation", 10820},
1229-
{"RecallToLocation", 10830},
1230-
{"EnterExitVehicle", 10840},
1231-
{"SetVehicleLocation", 10850},
1232-
{"ChangeEventLocation", 10860},
1233-
{"TradeEventLocations", 10870},
1234-
{"StoreTerrainID", 10910},
1235-
{"StoreEventID", 10920},
1236-
{"EraseScreen", 11010},
1237-
{"ShowScreen", 11020},
1238-
{"TintScreen", 11030},
1239-
{"FlashScreen", 11040},
1240-
{"ShakeScreen", 11050},
1241-
{"PanScreen", 11060},
1242-
{"WeatherEffects", 11070},
1243-
{"ShowPicture", 11110},
1244-
{"MovePicture", 11120},
1245-
{"ErasePicture", 11130},
1246-
{"ShowBattleAnimation", 11210},
1247-
{"PlayerVisibility", 11310},
1248-
{"FlashSprite", 11320},
1249-
{"MoveEvent", 11330},
1250-
{"ProceedWithMovement", 11340},
1251-
{"HaltAllMovement", 11350},
1252-
{"Wait", 11410},
1253-
{"PlayBGM", 11510},
1254-
{"FadeOutBGM", 11520},
1255-
{"MemorizeBGM", 11530},
1256-
{"PlayMemorizedBGM", 11540},
1257-
{"PlaySound", 11550},
1258-
{"PlayMovie", 11560},
1259-
{"KeyInputProc", 11610},
1260-
{"ChangeMapTileset", 11710},
1261-
{"ChangePBG", 11720},
1262-
{"ChangeEncounterSteps", 11740},
1263-
{"TileSubstitution", 11750},
1264-
{"TeleportTargets", 11810},
1265-
{"ChangeTeleportAccess", 11820},
1266-
{"EscapeTarget", 11830},
1267-
{"ChangeEscapeAccess", 11840},
1268-
{"OpenSaveMenu", 11910},
1269-
{"ChangeSaveAccess", 11930},
1270-
{"OpenMainMenu", 11950},
1271-
{"ChangeMainMenuAccess", 11960},
1272-
{"ConditionalBranch", 12010},
1273-
{"Label", 12110},
1274-
{"JumpToLabel", 12120},
1275-
{"Loop", 12210},
1276-
{"BreakLoop", 12220},
1277-
{"EndEventProcessing", 12310},
1278-
{"EraseEvent", 12320},
1279-
{"CallEvent", 12330},
1280-
{"Comment", 12410},
1281-
{"GameOver", 12420},
1282-
{"ReturntoTitleScreen", 12510},
1283-
{"ChangeMonsterHP", 13110},
1284-
{"ChangeMonsterMP", 13120},
1285-
{"ChangeMonsterCondition", 13130},
1286-
{"ShowHiddenMonster", 13150},
1287-
{"ChangeBattleBG", 13210},
1288-
{"ShowBattleAnimation_B", 13260},
1289-
{"ConditionalBranch_B", 13310},
1290-
{"TerminateBattle", 13410},
1291-
{"ShowMessage_2", 20110},
1292-
{"ShowChoiceOption", 20140},
1293-
{"ShowChoiceEnd", 20141},
1294-
{"VictoryHandler", 20710},
1295-
{"EscapeHandler", 20711},
1296-
{"DefeatHandler", 20712},
1297-
{"EndBattle", 20713},
1298-
{"Transaction", 20720},
1299-
{"NoTransaction", 20721},
1300-
{"EndShop", 20722},
1301-
{"Stay", 20730},
1302-
{"NoStay", 20731},
1303-
{"EndInn", 20732},
1304-
{"ElseBranch", 22010},
1305-
{"EndBranch", 22011},
1306-
{"EndLoop", 22210},
1307-
{"Comment_2", 22410},
1308-
{"ElseBranch_B", 23310},
1309-
{"EndBranch_B", 23311},
1310-
{"Maniac_GetSaveInfo", 3001},
1311-
{"Maniac_Save", 3002},
1312-
{"Maniac_Load", 3003},
1313-
{"Maniac_EndLoadProcess", 3004},
1314-
{"Maniac_GetMousePosition", 3005},
1315-
{"Maniac_SetMousePosition", 3006},
1316-
{"Maniac_ShowStringPicture", 3007},
1317-
{"Maniac_GetPictureInfo", 3008},
1318-
{"Maniac_ControlBattle", 3009},
1319-
{"Maniac_ControlAtbGauge", 3010},
1320-
{"Maniac_ChangeBattleCommandEx", 3011},
1321-
{"Maniac_GetBattleInfo", 3012},
1322-
{"Maniac_ControlVarArray", 3013},
1323-
{"Maniac_KeyInputProcEx", 3014},
1324-
{"Maniac_RewriteMap", 3015},
1325-
{"Maniac_ControlGlobalSave", 3016},
1326-
{"Maniac_ChangePictureId", 3017},
1327-
{"Maniac_SetGameOption", 3018},
1328-
{"Maniac_CallCommand", 3019},
1329-
{"Maniac_ControlStrings", 3020},
1330-
{"Maniac_GetGameInfo", 3021},
1331-
{"Maniac_EditPicture", 3025},
1332-
{"Maniac_WritePicture", 3026},
1333-
{"Maniac_AddMoveRoute", 3027},
1334-
{"Maniac_EditTile", 3028},
1335-
{"Maniac_ControlTextProcessing", 3029}
1336-
};
13371181
};
13381182

1339-
// Function to return contents from either DestinyScript or EventCode
1183+
// Function to return contents from either DestinyScript or something else
13401184
std::unordered_map<std::string, int>& MapCollection(const std::string& collectionName) {
13411185
if ( Utils::StrICmp(collectionName, "destinyscript") == 0 ) return DestinyScript;
1342-
else if ( Utils::StrICmp(collectionName, "eventcode") == 0 ) return EventCode;
13431186

1344-
else return EventCode;
1187+
else return DestinyScript;
13451188
};
13461189

13471190
// Function to retrieve a value from mapCollection ignoring case

‎src/dynrpg_easyrpg.cpp‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,15 @@ bool DynRpg::EasyRpgPlugin::EasyRaw(dyn_arg_list args, Game_Interpreter* interpr
142142

143143
// Output::Debug("code ----> {}", args[i]);
144144

145-
if (args[i].front() == '$')
146-
args[i] = constList.get("EventCode", args[i].substr(1));
145+
if (args[i].front() == '$') {
146+
args[i] = args[i].substr(1);
147+
for (const auto& pair : lcf::rpg::EventCommand::kCodeTags.tags()) {
148+
if (Utils::StrICmp(pair.name, args[i]) == 0) {
149+
args[i] = std::to_string(pair.value);
150+
break;
151+
}
152+
}
153+
};
147154
std::tie(cmd.code) = DynRpg::ParseArgs<int>(func, args.subspan(i), &okay);
148155
}
149156
else if (i == stringArgIndex)

0 commit comments

Comments
 (0)