ATB: Use correct default depending on the engine

generator/csv/enums.csv

@@ -160,6 +160,7 @@ SaveSystem,Scene,file,5
 SaveSystem,Scene,title,6
 SaveSystem,Scene,game_over,7
 SaveSystem,Scene,debug,8
+SaveSystem,AtbMode,atb_unspecified,-1
 SaveSystem,AtbMode,atb_active,0
 SaveSystem,AtbMode,atb_wait,1
 SaveVehicleLocation,VehicleType,none,0

generator/csv/fields.csv

@@ -763,7 +763,7 @@ SaveSystem,menu_allowed,f,Boolean,0x7C,True,0,0,
 SaveSystem,background,f,String,0x7D,,0,0,string
 SaveSystem,save_count,f,Int32,0x83,0,0,0,
 SaveSystem,save_slot,f,Int32,0x84,1,0,0,
-SaveSystem,atb_mode,f,Enum<SaveSystem_AtbMode>,0x8C,0,0,1,ATB mode of RPG 2003 battle system.
+SaveSystem,atb_mode,f,Enum<SaveSystem_AtbMode>,0x8C,-1,0,1,"ATB mode of RPG 2003 battle system. 2k3e sets this to 1, otherwise 0"
 SaveScreen,tint_finish_red,f,Int32,0x01,100,0,0,int
 SaveScreen,tint_finish_green,f,Int32,0x02,100,0,0,int
 SaveScreen,tint_finish_blue,f,Int32,0x03,100,0,0,int

generator/csv/fields_easyrpg.csv

@@ -36,6 +36,7 @@ SaveMapEventBase,easyrpg_move_failure_count,f,Int32,0xC9,0,0,0,Tracks how often
 SaveMapEventBase,easyrpg_clone_map_id,f,UInt32,0xCA,0,0,0,The original map id of a cloned event
 SaveMapEventBase,easyrpg_clone_event_id,f,UInt32,0xCB,0,0,0,The original event id of a cloned event
 SaveMapEventBase,easyrpg_runtime_flags,f,EasyRpgEventRuntime_Flags,0xCC,0,0,0,Runtime changes to the engine config
+SaveMapEventBase,easyrpg_clone_event_name,f,DBString,0xCD,,0,0,Name of the cloned event
 SavePartyLocation,maniac_horizontal_pan_speed,f,Double,0x8D,0,0,0,horizontal speed in the scrolls of the screen
 SavePartyLocation,maniac_vertical_pan_speed,f,Double,0x8E,0,0,0,vertical speed in the scrolls of the screen
 SaveSystem,maniac_strings,f,Vector<DBString>,0x24,,0,0,rpg::Strings
@@ -55,7 +56,7 @@ SaveSystem,maniac_options,,Vector<UInt8>,0x8A,,0,0,"Various FatalMix options (XX
 SaveSystem,maniac_joypad_bindings,,Vector<UInt8>,0x8B,,0,0,"JoyLeft, JoyRight, JoyUp, JoyDown, Joy1, ... Joy12"
 SaveSystem,maniac_message_spacing_char,f,Int32,0x8E,0,0,0,Additional spacing between characters in the message window (Editor value - 1)
 SaveSystem,maniac_message_spacing_line,f,Int32,0x8F,0,0,0,Additional spacing between lines in the message window (Editor value - 1)
-BattleCommands,easyrpg_default_atb_mode,f,Enum<SaveSystem_AtbMode>,0xC8,0,0,1,Default ATB mode of RPG 2003 battle system
+BattleCommands,easyrpg_default_atb_mode,f,Enum<SaveSystem_AtbMode>,0xC8,-1,0,1,Default ATB mode of RPG 2003 battle system
 BattleCommands,easyrpg_enable_battle_row_command,f,Boolean,0xC9,True,0,1,If the row command should be enabled in RPG Maker 2003 battles
 BattleCommands,easyrpg_sequential_order,f,Boolean,0xCA,False,0,1,If alternative and gauge style battles should behave like traditional style battles
 BattleCommands,easyrpg_disable_row_feature,f,Boolean,0xCB,False,0,1,If the row feature should be disabled in RPG Maker 2003 games

src/generated/lcf/lsd/chunks.h

@@ -160,7 +160,7 @@ namespace LSD_Reader {
 			save_count = 0x83,
 			/**  */
 			save_slot = 0x84,
-			/** ATB mode of RPG 2003 battle system. */
+			/** ATB mode of RPG 2003 battle system. 2k3e sets this to 1, otherwise 0 */
 			atb_mode = 0x8C,
 			/** rpg::Strings */
 			maniac_strings = 0x24,
@@ -440,6 +440,8 @@ namespace LSD_Reader {
 			easyrpg_clone_event_id = 0xCB,
 			/** Runtime changes to the engine config */
 			easyrpg_runtime_flags = 0xCC,
+			/** Name of the cloned event */
+			easyrpg_clone_event_name = 0xCD,
 			/**  */
 			boarding = 0x65,
 			/**  */
@@ -566,6 +568,8 @@ namespace LSD_Reader {
 			easyrpg_clone_event_id = 0xCB,
 			/** Runtime changes to the engine config */
 			easyrpg_runtime_flags = 0xCC,
+			/** Name of the cloned event */
+			easyrpg_clone_event_name = 0xCD,
 			/** Which vehicle */
 			vehicle = 0x65,
 			/** From 0 to 255 - In flying vehicles; remaining distance to ascend */
@@ -877,7 +881,9 @@ namespace LSD_Reader {
 			/** The original event id of a cloned event */
 			easyrpg_clone_event_id = 0xCB,
 			/** Runtime changes to the engine config */
-			easyrpg_runtime_flags = 0xCC
+			easyrpg_runtime_flags = 0xCC,
+			/** Name of the cloned event */
+			easyrpg_clone_event_name = 0xCD
 		};
 	};
 	struct ChunkSaveMapEvent {
@@ -968,6 +974,8 @@ namespace LSD_Reader {
 			easyrpg_clone_event_id = 0xCB,
 			/** Runtime changes to the engine config */
 			easyrpg_runtime_flags = 0xCC,
+			/** Name of the cloned event */
+			easyrpg_clone_event_name = 0xCD,
 			/** If true; this event is waiting for foreground execution. */
 			waiting_execution = 0x65,
 			/** Index of custom move route */

src/generated/lcf/rpg/battlecommands.h

@@ -100,7 +100,7 @@ namespace rpg {
 		int32_t death_teleport_x = 0;
 		int32_t death_teleport_y = 0;
 		int32_t death_teleport_face = 0;
-		int32_t easyrpg_default_atb_mode = 0;
+		int32_t easyrpg_default_atb_mode = -1;
 		bool easyrpg_enable_battle_row_command = true;
 		bool easyrpg_sequential_order = false;
 		bool easyrpg_disable_row_feature = false;

src/generated/lcf/rpg/savemapeventbase.h

@@ -16,6 +16,7 @@
 #include <array>
 #include <stdint.h>
 #include <string>
+#include "lcf/dbstring.h"
 #include "lcf/enum_tags.h"
 #include "lcf/rpg/moveroute.h"
 #include "lcf/context.h"
@@ -81,6 +82,7 @@ namespace rpg {
 			EasyRpgEventRuntime_Flags() noexcept: reserved_1(false)
 			{}
 		} easyrpg_runtime_flags;
+		DBString easyrpg_clone_event_name;
 	};
 
 	inline bool operator==(const SaveMapEventBase::EasyRpgEventRuntime_Flags& l, const SaveMapEventBase::EasyRpgEventRuntime_Flags& r) {
@@ -136,7 +138,8 @@ namespace rpg {
 		&& l.easyrpg_move_failure_count == r.easyrpg_move_failure_count
 		&& l.easyrpg_clone_map_id == r.easyrpg_clone_map_id
 		&& l.easyrpg_clone_event_id == r.easyrpg_clone_event_id
-		&& l.easyrpg_runtime_flags == r.easyrpg_runtime_flags;
+		&& l.easyrpg_runtime_flags == r.easyrpg_runtime_flags
+		&& l.easyrpg_clone_event_name == r.easyrpg_clone_event_name;
 	}
 
 	inline bool operator!=(const SaveMapEventBase& l, const SaveMapEventBase& r) {
@@ -149,6 +152,8 @@ namespace rpg {
 	void ForEachString(SaveMapEventBase& obj, const F& f, const ParentCtx* parent_ctx = nullptr) {
 		const auto ctx16 = Context<SaveMapEventBase, ParentCtx>{ "move_route", -1, &obj, parent_ctx };
 		ForEachString(obj.move_route, f, &ctx16);
+		const auto ctx44 = Context<SaveMapEventBase, ParentCtx>{ "easyrpg_clone_event_name", -1, &obj, parent_ctx };
+		f(obj.easyrpg_clone_event_name, ctx44);
 		(void)obj;
 		(void)f;
 		(void)parent_ctx;

src/generated/lcf/rpg/savesystem.h

@@ -55,13 +55,15 @@ namespace rpg {
 			"debug"
 		);
 		enum AtbMode {
+			AtbMode_atb_unspecified = -1,
 			AtbMode_atb_active = 0,
 			AtbMode_atb_wait = 1
 		};
-		static constexpr auto kAtbModeTags = lcf::makeEnumTags<AtbMode>(
-			"atb_active",
-			"atb_wait"
-		);
+		static constexpr auto kAtbModeTags = lcf::EnumTags{
+			AtbMode_atb_unspecified, "atb_unspecified",
+			AtbMode_atb_active, "atb_active",
+			AtbMode_atb_wait, "atb_wait"
+		};
 
 		int32_t scene = 0;
 		int32_t frame_count = 0;
@@ -117,7 +119,7 @@ namespace rpg {
 		std::string background;
 		int32_t save_count = 0;
 		int32_t save_slot = 1;
-		int32_t atb_mode = 0;
+		int32_t atb_mode = -1;
 		std::vector<DBString> maniac_strings;
 		int32_t maniac_message_window_width = 0;
 		int32_t maniac_message_window_height = 0;

src/generated/lsd_savemapevent.cpp

@@ -321,6 +321,13 @@ static TypedField<rpg::SaveMapEvent, rpg::SaveMapEvent::EasyRpgEventRuntime_Flag
 	0,
 	0
 );
+static TypedField<rpg::SaveMapEvent, DBString> static_easyrpg_clone_event_name(
+	&rpg::SaveMapEvent::easyrpg_clone_event_name,
+	LSD_Reader::ChunkSaveMapEvent::easyrpg_clone_event_name,
+	"easyrpg_clone_event_name",
+	0,
+	0
+);
 static TypedField<rpg::SaveMapEvent, bool> static_waiting_execution(
 	&rpg::SaveMapEvent::waiting_execution,
 	LSD_Reader::ChunkSaveMapEvent::waiting_execution,
@@ -396,6 +403,7 @@ Field<rpg::SaveMapEvent> const* Struct<rpg::SaveMapEvent>::fields[] = {
 	&static_easyrpg_clone_map_id,
 	&static_easyrpg_clone_event_id,
 	&static_easyrpg_runtime_flags,
+	&static_easyrpg_clone_event_name,
 	&static_waiting_execution,
 	&static_original_move_route_index,
 	&static_triggered_by_decision_key,

src/generated/lsd_savemapeventbase.cpp

@@ -321,6 +321,13 @@ static TypedField<rpg::SaveMapEventBase, rpg::SaveMapEventBase::EasyRpgEventRunt
 	0,
 	0
 );
+static TypedField<rpg::SaveMapEventBase, DBString> static_easyrpg_clone_event_name(
+	&rpg::SaveMapEventBase::easyrpg_clone_event_name,
+	LSD_Reader::ChunkSaveMapEventBase::easyrpg_clone_event_name,
+	"easyrpg_clone_event_name",
+	0,
+	0
+);
 
 
 template <>
@@ -368,6 +375,7 @@ Field<rpg::SaveMapEventBase> const* Struct<rpg::SaveMapEventBase>::fields[] = {
 	&static_easyrpg_clone_map_id,
 	&static_easyrpg_clone_event_id,
 	&static_easyrpg_runtime_flags,
+	&static_easyrpg_clone_event_name,
 	NULL
 };
 

src/generated/lsd_savepartylocation.cpp

@@ -321,6 +321,13 @@ static TypedField<rpg::SavePartyLocation, rpg::SavePartyLocation::EasyRpgEventRu
 	0,
 	0
 );
+static TypedField<rpg::SavePartyLocation, DBString> static_easyrpg_clone_event_name(
+	&rpg::SavePartyLocation::easyrpg_clone_event_name,
+	LSD_Reader::ChunkSavePartyLocation::easyrpg_clone_event_name,
+	"easyrpg_clone_event_name",
+	0,
+	0
+);
 static TypedField<rpg::SavePartyLocation, bool> static_boarding(
 	&rpg::SavePartyLocation::boarding,
 	LSD_Reader::ChunkSavePartyLocation::boarding,
@@ -494,6 +501,7 @@ Field<rpg::SavePartyLocation> const* Struct<rpg::SavePartyLocation>::fields[] =
 	&static_easyrpg_clone_map_id,
 	&static_easyrpg_clone_event_id,
 	&static_easyrpg_runtime_flags,
+	&static_easyrpg_clone_event_name,
 	&static_boarding,
 	&static_aboard,
 	&static_vehicle,

src/generated/lsd_savevehiclelocation.cpp

@@ -321,6 +321,13 @@ static TypedField<rpg::SaveVehicleLocation, rpg::SaveVehicleLocation::EasyRpgEve
 	0,
 	0
 );
+static TypedField<rpg::SaveVehicleLocation, DBString> static_easyrpg_clone_event_name(
+	&rpg::SaveVehicleLocation::easyrpg_clone_event_name,
+	LSD_Reader::ChunkSaveVehicleLocation::easyrpg_clone_event_name,
+	"easyrpg_clone_event_name",
+	0,
+	0
+);
 static TypedField<rpg::SaveVehicleLocation, int32_t> static_vehicle(
 	&rpg::SaveVehicleLocation::vehicle,
 	LSD_Reader::ChunkSaveVehicleLocation::vehicle,
@@ -403,6 +410,7 @@ Field<rpg::SaveVehicleLocation> const* Struct<rpg::SaveVehicleLocation>::fields[
 	&static_easyrpg_clone_map_id,
 	&static_easyrpg_clone_event_id,
 	&static_easyrpg_runtime_flags,
+	&static_easyrpg_clone_event_name,
 	&static_vehicle,
 	&static_remaining_ascent,
 	&static_remaining_descent,

src/generated/rpg_savemapeventbase.cpp

@@ -68,6 +68,7 @@ std::ostream& operator<<(std::ostream& os, const SaveMapEventBase& obj) {
 	os << ", easyrpg_clone_map_id="<< obj.easyrpg_clone_map_id;
 	os << ", easyrpg_clone_event_id="<< obj.easyrpg_clone_event_id;
 	os << ", easyrpg_runtime_flags="<< obj.easyrpg_runtime_flags;
+	os << ", easyrpg_clone_event_name="<< obj.easyrpg_clone_event_name;
 	os << "}";
 	return os;
 }

src/lcf/lsd/reader.h

@@ -47,42 +47,42 @@ namespace LSD_Reader {
 	/**
 	 * Loads Savegame.
 	 */
-	std::unique_ptr<rpg::Save> Load(std::string_view filename, std::string_view encoding = "");
+	std::unique_ptr<rpg::Save> Load(std::string_view filename, std::string_view encoding = "", LcfOpt opt = LcfOpt::eNone);
 
 	/**
 	 * Saves Savegame.
 	 */
-	bool Save(std::string_view filename, const rpg::Save& save, EngineVersion engine, std::string_view encoding = "");
+	bool Save(std::string_view filename, const rpg::Save& save, EngineVersion engine, std::string_view encoding = "", LcfOpt opt = LcfOpt::eNone);
 
 	/*
 	 * Saves Savegame as XML.
 	 */
-	bool SaveXml(std::string_view filename, const rpg::Save& save, EngineVersion engine);
+	bool SaveXml(std::string_view filename, const rpg::Save& save, EngineVersion engine, LcfOpt opt = LcfOpt::eNone);
 
 	/**
 	 * Loads Savegame as XML.
 	 */
-	std::unique_ptr<rpg::Save> LoadXml(std::string_view filename);
+	std::unique_ptr<rpg::Save> LoadXml(std::string_view filename, LcfOpt opt = LcfOpt::eNone);
 
 	/**
 	 * Loads Savegame.
 	 */
-	std::unique_ptr<rpg::Save> Load(std::istream& filestream, std::string_view encoding = "");
+	std::unique_ptr<rpg::Save> Load(std::istream& filestream, std::string_view encoding = "", LcfOpt opt = LcfOpt::eNone);
 
 	/**
 	 * Saves Savegame.
 	 */
-	bool Save(std::ostream& filestream, const rpg::Save& save, EngineVersion engine, std::string_view encoding = "");
+	bool Save(std::ostream& filestream, const rpg::Save& save, EngineVersion engine, std::string_view encoding = "", LcfOpt opt = LcfOpt::eNone);
 
 	/*
 	 * Saves Savegame as XML.
 	 */
-	bool SaveXml(std::ostream& filestream, const rpg::Save& save, EngineVersion engine);
+	bool SaveXml(std::ostream& filestream, const rpg::Save& save, EngineVersion engine, LcfOpt opt = LcfOpt::eNone);
 
 	/**
 	 * Loads Savegame as XML.
 	 */
-	std::unique_ptr<rpg::Save> LoadXml(std::istream& filestream);
+	std::unique_ptr<rpg::Save> LoadXml(std::istream& filestream, LcfOpt opt = LcfOpt::eNone);
 }
 
 } //namespace lcf

src/lcf/saveopt.h

@@ -16,18 +16,21 @@ class Database;
 };
 
 /**
- * Options to configure how LDB file is saved
+ * Options to configure how files are saved/loaded
  */
 enum class SaveOpt {
 	eNone = 0,
-	ePreserveHeader = 1
+	ePreserveHeader = 1,
+	eEngine2k3e = 2
 };
 
 constexpr SaveOpt operator|(SaveOpt l, SaveOpt r) { return SaveOpt(int(l) | int(r)); }
 constexpr SaveOpt operator&(SaveOpt l, SaveOpt r) { return SaveOpt(int(l) & int(r)); }
 constexpr SaveOpt operator^(SaveOpt l, SaveOpt r) { return SaveOpt(int(l) ^ int(r)); }
 constexpr SaveOpt operator~(SaveOpt l) { return SaveOpt(~int(l)); }
 
+using LcfOpt = SaveOpt;
+
 /**
  * Which LCF file format to write
  */