Merge pull request #365 from fmatthew5876/grid

Rename grid variables and SaveSystem::transparent

Author: carstene1ns

generator/csv/fields.csv

@@ -298,10 +298,10 @@ TroopPage,event_commands,t,EventCommand,0x0B,,1,0,Integer
 TroopPage,event_commands,f,Vector<EventCommand>,0x0C,,1,0,Array - RPG::EventCommand
 Troop,name,f,String,0x01,'',0,0,String
 Troop,members,f,Array<TroopMember>,0x02,,1,0,Array - RPG::TroopMember
-Troop,auto_alignment,f,Boolean,0x03,False,0,0,Flag
+Troop,auto_alignment,f,Boolean,0x03,False,0,1,Flag
 Troop,terrain_set,t,Boolean,0x04,,0,0,Integer
 Troop,terrain_set,f,Vector<Boolean>,0x05,,1,0,Array - Flag
-Troop,appear_randomly,f,Boolean,0x06,False,0,0,Flag
+Troop,appear_randomly,f,Boolean,0x06,False,0,1,Flag
 Troop,pages,f,Array<TroopPage>,0x0B,,1,0,Array - RPG::TroopPage
 Terrain,name,f,String,0x01,'',0,0,String
 Terrain,damage,f,Int32,0x02,0,0,0,Integer
@@ -332,9 +332,9 @@ Terrain,special_back_enemies,f,Int32,0x2A,10,0,1,Integer - RPG2003
 Terrain,special_lateral_party,f,Int32,0x2B,10,0,1,Integer - RPG2003
 Terrain,special_lateral_enemies,f,Int32,0x2C,5,0,1,Integer - RPG2003
 Terrain,grid_location,f,Int32,0x2D,0,0,1,Integer - RPG2003
-Terrain,grid_a,f,Int32,0x2E,120,0,1,Integer - RPG2003
-Terrain,grid_b,f,Int32,0x2F,392,0,1,Integer - RPG2003
-Terrain,grid_c,f,Int32,0x30,16000,0,1,Integer - RPG2003
+Terrain,grid_top_y,f,Int32,0x2E,120,0,1,Integer - RPG2003
+Terrain,grid_elongation,f,Int32,0x2F,392,0,1,Integer - RPG2003
+Terrain,grid_inclination,f,Int32,0x30,16000,0,1,Integer - RPG2003
 State,name,f,String,0x01,'',0,0,String
 State,type,f,Enum<State_Persistence>,0x02,0,1,0,Integer
 State,color,f,Int32,0x03,6,0,0,Integer
@@ -722,7 +722,7 @@ SaveSystem,face_name,f,String,0x33,'',0,0,
 SaveSystem,face_id,f,Int32,0x34,0,0,0,
 SaveSystem,face_right,f,Boolean,0x35,False,0,0,bool
 SaveSystem,face_flip,f,Boolean,0x36,False,0,0,bool
-SaveSystem,transparent,f,Boolean,0x37,False,0,0,
+SaveSystem,message_active,f,Boolean,0x37,False,0,0,A flag set by RPG_RT when messages are summoned.
 SaveSystem,music_stopping,f,Boolean,0x3D,False,0,0,Music is being faded out or had been stopped (Play music with the same music as currently playing will restart the music when this flag is set)
 SaveSystem,title_music,f,Music,0x47,,1,0,
 SaveSystem,battle_music,f,Music,0x48,,1,0,

src/generated/ldb_chunks.h

@@ -785,11 +785,11 @@ namespace LDB_Reader {
 			/** Integer - RPG2003 */
 			grid_location = 0x2D,
 			/** Integer - RPG2003 */
-			grid_a = 0x2E,
+			grid_top_y = 0x2E,
 			/** Integer - RPG2003 */
-			grid_b = 0x2F,
+			grid_elongation = 0x2F,
 			/** Integer - RPG2003 */
-			grid_c = 0x30
+			grid_inclination = 0x30
 		};
 	};
 	struct ChunkState {

src/generated/ldb_terrain.cpp

@@ -221,24 +221,24 @@ static TypedField<RPG::Terrain, int32_t> static_grid_location(
 	0,
 	1
 );
-static TypedField<RPG::Terrain, int32_t> static_grid_a(
-	&RPG::Terrain::grid_a,
-	LDB_Reader::ChunkTerrain::grid_a,
-	"grid_a",
+static TypedField<RPG::Terrain, int32_t> static_grid_top_y(
+	&RPG::Terrain::grid_top_y,
+	LDB_Reader::ChunkTerrain::grid_top_y,
+	"grid_top_y",
 	0,
 	1
 );
-static TypedField<RPG::Terrain, int32_t> static_grid_b(
-	&RPG::Terrain::grid_b,
-	LDB_Reader::ChunkTerrain::grid_b,
-	"grid_b",
+static TypedField<RPG::Terrain, int32_t> static_grid_elongation(
+	&RPG::Terrain::grid_elongation,
+	LDB_Reader::ChunkTerrain::grid_elongation,
+	"grid_elongation",
 	0,
 	1
 );
-static TypedField<RPG::Terrain, int32_t> static_grid_c(
-	&RPG::Terrain::grid_c,
-	LDB_Reader::ChunkTerrain::grid_c,
-	"grid_c",
+static TypedField<RPG::Terrain, int32_t> static_grid_inclination(
+	&RPG::Terrain::grid_inclination,
+	LDB_Reader::ChunkTerrain::grid_inclination,
+	"grid_inclination",
 	0,
 	1
 );
@@ -275,9 +275,9 @@ Field<RPG::Terrain> const* Struct<RPG::Terrain>::fields[] = {
 	&static_special_lateral_party,
 	&static_special_lateral_enemies,
 	&static_grid_location,
-	&static_grid_a,
-	&static_grid_b,
-	&static_grid_c,
+	&static_grid_top_y,
+	&static_grid_elongation,
+	&static_grid_inclination,
 	NULL
 };
 

src/generated/ldb_troop.cpp

@@ -37,7 +37,7 @@ static TypedField<RPG::Troop, bool> static_auto_alignment(
 	LDB_Reader::ChunkTroop::auto_alignment,
 	"auto_alignment",
 	0,
-	0
+	1
 );
 static SizeField<RPG::Troop, bool> static_size_terrain_set(
 	&RPG::Troop::terrain_set,
@@ -57,7 +57,7 @@ static TypedField<RPG::Troop, bool> static_appear_randomly(
 	LDB_Reader::ChunkTroop::appear_randomly,
 	"appear_randomly",
 	0,
-	0
+	1
 );
 static TypedField<RPG::Troop, std::vector<RPG::TroopPage>> static_pages(
 	&RPG::Troop::pages,

src/generated/lsd_chunks.h

@@ -80,8 +80,8 @@ namespace LSD_Reader {
 			face_right = 0x35,
 			/** bool */
 			face_flip = 0x36,
-			/**  */
-			transparent = 0x37,
+			/** A flag set by RPG_RT when messages are summoned. */
+			message_active = 0x37,
 			/** Music is being faded out or had been stopped (Play music with the same music as currently playing will restart the music when this flag is set) */
 			music_stopping = 0x3D,
 			/**  */

src/generated/lsd_savesystem.cpp

@@ -135,10 +135,10 @@ static TypedField<RPG::SaveSystem, bool> static_face_flip(
 	0,
 	0
 );
-static TypedField<RPG::SaveSystem, bool> static_transparent(
-	&RPG::SaveSystem::transparent,
-	LSD_Reader::ChunkSaveSystem::transparent,
-	"transparent",
+static TypedField<RPG::SaveSystem, bool> static_message_active(
+	&RPG::SaveSystem::message_active,
+	LSD_Reader::ChunkSaveSystem::message_active,
+	"message_active",
 	0,
 	0
 );
@@ -436,7 +436,7 @@ Field<RPG::SaveSystem> const* Struct<RPG::SaveSystem>::fields[] = {
 	&static_face_id,
 	&static_face_right,
 	&static_face_flip,
-	&static_transparent,
+	&static_message_active,
 	&static_music_stopping,
 	&static_title_music,
 	&static_battle_music,

src/generated/rpg_savesystem.h

@@ -75,7 +75,7 @@ namespace RPG {
 		int32_t face_id = 0;
 		bool face_right = false;
 		bool face_flip = false;
-		bool transparent = false;
+		bool message_active = false;
 		bool music_stopping = false;
 		Music title_music;
 		Music battle_music;
@@ -133,7 +133,7 @@ namespace RPG {
 		&& l.face_id == r.face_id
 		&& l.face_right == r.face_right
 		&& l.face_flip == r.face_flip
-		&& l.transparent == r.transparent
+		&& l.message_active == r.message_active
 		&& l.music_stopping == r.music_stopping
 		&& l.title_music == r.title_music
 		&& l.battle_music == r.battle_music

src/generated/rpg_terrain.h

@@ -89,9 +89,9 @@ namespace RPG {
 		int32_t special_lateral_party = 10;
 		int32_t special_lateral_enemies = 5;
 		int32_t grid_location = 0;
-		int32_t grid_a = 120;
-		int32_t grid_b = 392;
-		int32_t grid_c = 16000;
+		int32_t grid_top_y = 120;
+		int32_t grid_elongation = 392;
+		int32_t grid_inclination = 16000;
 	};
 
 	inline bool operator==(const Terrain::Flags& l, const Terrain::Flags& r) {
@@ -132,9 +132,9 @@ namespace RPG {
 		&& l.special_lateral_party == r.special_lateral_party
 		&& l.special_lateral_enemies == r.special_lateral_enemies
 		&& l.grid_location == r.grid_location
-		&& l.grid_a == r.grid_a
-		&& l.grid_b == r.grid_b
-		&& l.grid_c == r.grid_c;
+		&& l.grid_top_y == r.grid_top_y
+		&& l.grid_elongation == r.grid_elongation
+		&& l.grid_inclination == r.grid_inclination;
 	}
 
 	inline bool operator!=(const Terrain& l, const Terrain& r) {

src/rpg_setup.cpp

@@ -95,7 +95,7 @@ void RPG::SaveSystem::Setup() {
 	face_id = -1;
 	face_right = false;
 	face_flip = false;
-	transparent = false;
+	message_active = false;
 	music_stopping = false;
 	title_music = system.title_music;
 	battle_music = system.battle_music;