Merge pull request #507 from Ghabry/event-chunks

More chunks

Author: Ghabry

CMakeLists.txt

@@ -379,7 +379,7 @@ if(LIBLCF_WITH_ICU)
 		set(LCF_SUPPORT_ICU 1)
 	else()
 		if(NOT WIN32)
-			message(FATAL_ERROR "ICU not found. Use LCF_SUPPORT_ICU=0 to disable ICU support (not recommended).")
+			message(FATAL_ERROR "ICU not found. Use LIBLCF_WITH_ICU=0 to disable ICU support (not recommended).")
 		endif()
 
 		message(STATUS "ICU not found. Using the system library.")

generator/csv/enums_easyrpg.csv

@@ -37,6 +37,7 @@ EventCommand,Code,Maniac_WritePicture,3026
 EventCommand,Code,Maniac_AddMoveRoute,3027
 EventCommand,Code,Maniac_EditTile,3028
 EventCommand,Code,Maniac_ControlTextProcessing,3029
+EventCommand,Code,Maniac_Zoom,3032
 EventPage,ManiacEventInfo,action,0
 EventPage,ManiacEventInfo,touched,1
 EventPage,ManiacEventInfo,collision,2
@@ -54,5 +55,6 @@ SavePicture,EasyRpgFlip,y,2
 SavePicture,EasyRpgFlip,both,3
 SavePicture,EasyRpgType,default,0
 SavePicture,EasyRpgType,window,1
+SavePicture,EasyRpgType,canvas,2
 Skill,HpType,cost,0
 Skill,HpType,percent,1

generator/csv/fields_easyrpg.csv

@@ -17,6 +17,7 @@ SavePicture,easyrpg_flip,f,Enum<EasyRpgFlip>,0xC8,0,0,1,How to flip the picture
 SavePicture,easyrpg_blend_mode,f,Int32,0xC9,0,0,1,Blend mode to use for blit. See Bitmap::BlendMode
 SavePicture,easyrpg_type,f,Enum<EasyRpgPictureType>,0xCA,0,0,1,Type of this picture
 SavePicture,maniac_current_magnify_height,f,Double,0x0A,100.0,0,0,Current zoom level of picture (y direction).
+SavePicture,maniac_image_data,f,Vector<UInt8>,0x1C,,0,0,Deflate compressed image data of a picture modified with EditPicture command
 SavePicture,maniac_finish_magnify_height,f,Int32,0x24,100,0,0,Final zoom level to animate picture to (y direction).
 SaveEasyRpgWindow,texts,f,Array<SaveEasyRpgText>,0x01,,0,0,Texts to render
 SaveEasyRpgWindow,width,f,Int32,0x02,0,0,0,Window width (px)

src/generated/lcf/lsd/chunks.h

@@ -348,6 +348,8 @@ namespace LSD_Reader {
 			easyrpg_type = 0xCA,
 			/** Current zoom level of picture (y direction). */
 			maniac_current_magnify_height = 0x0A,
+			/** Deflate compressed image data of a picture modified with EditPicture command */
+			maniac_image_data = 0x1C,
 			/** Final zoom level to animate picture to (y direction). */
 			maniac_finish_magnify_height = 0x24
 		};

src/generated/lcf/rpg/eventcommand.h

@@ -192,7 +192,8 @@ namespace rpg {
 			Maniac_WritePicture = 3026,
 			Maniac_AddMoveRoute = 3027,
 			Maniac_EditTile = 3028,
-			Maniac_ControlTextProcessing = 3029
+			Maniac_ControlTextProcessing = 3029,
+			Maniac_Zoom = 3032
 		};
 		static constexpr auto kCodeTags = lcf::EnumTags{
 			Code::END, "END",
@@ -358,7 +359,8 @@ namespace rpg {
 			Code::Maniac_WritePicture, "Maniac_WritePicture",
 			Code::Maniac_AddMoveRoute, "Maniac_AddMoveRoute",
 			Code::Maniac_EditTile, "Maniac_EditTile",
-			Code::Maniac_ControlTextProcessing, "Maniac_ControlTextProcessing"
+			Code::Maniac_ControlTextProcessing, "Maniac_ControlTextProcessing",
+			Code::Maniac_Zoom, "Maniac_Zoom"
 		};
 
 		int32_t code = 0;

src/generated/lcf/rpg/savepicture.h

@@ -16,6 +16,7 @@
 #include <array>
 #include <stdint.h>
 #include <string>
+#include <vector>
 #include "lcf/enum_tags.h"
 #include "lcf/context.h"
 #include <ostream>
@@ -96,11 +97,13 @@ namespace rpg {
 		);
 		enum EasyRpgType {
 			EasyRpgType_default = 0,
-			EasyRpgType_window = 1
+			EasyRpgType_window = 1,
+			EasyRpgType_canvas = 2
 		};
 		static constexpr auto kEasyRpgTypeTags = lcf::makeEnumTags<EasyRpgType>(
 			"default",
-			"window"
+			"window",
+			"canvas"
 		);
 
 		int ID = 0;
@@ -161,6 +164,7 @@ namespace rpg {
 		int32_t easyrpg_blend_mode = 0;
 		int32_t easyrpg_type = 0;
 		double maniac_current_magnify_height = 100.0;
+		std::vector<uint8_t> maniac_image_data;
 		int32_t maniac_finish_magnify_height = 100;
 	};
 	inline std::ostream& operator<<(std::ostream& os, SavePicture::Effect code) {
@@ -237,6 +241,7 @@ namespace rpg {
 		&& l.easyrpg_blend_mode == r.easyrpg_blend_mode
 		&& l.easyrpg_type == r.easyrpg_type
 		&& l.maniac_current_magnify_height == r.maniac_current_magnify_height
+		&& l.maniac_image_data == r.maniac_image_data
 		&& l.maniac_finish_magnify_height == r.maniac_finish_magnify_height;
 	}
 

src/generated/lsd_savepicture.cpp

@@ -314,6 +314,13 @@ static TypedField<rpg::SavePicture, double> static_maniac_current_magnify_height
 	0,
 	0
 );
+static TypedField<rpg::SavePicture, std::vector<uint8_t>> static_maniac_image_data(
+	&rpg::SavePicture::maniac_image_data,
+	LSD_Reader::ChunkSavePicture::maniac_image_data,
+	"maniac_image_data",
+	0,
+	0
+);
 static TypedField<rpg::SavePicture, int32_t> static_maniac_finish_magnify_height(
 	&rpg::SavePicture::maniac_finish_magnify_height,
 	LSD_Reader::ChunkSavePicture::maniac_finish_magnify_height,
@@ -367,6 +374,7 @@ Field<rpg::SavePicture> const* Struct<rpg::SavePicture>::fields[] = {
 	&static_easyrpg_blend_mode,
 	&static_easyrpg_type,
 	&static_maniac_current_magnify_height,
+	&static_maniac_image_data,
 	&static_maniac_finish_magnify_height,
 	NULL
 };

src/generated/rpg_savepicture.cpp

@@ -67,6 +67,11 @@ std::ostream& operator<<(std::ostream& os, const SavePicture& obj) {
 	os << ", easyrpg_blend_mode="<< obj.easyrpg_blend_mode;
 	os << ", easyrpg_type="<< obj.easyrpg_type;
 	os << ", maniac_current_magnify_height="<< obj.maniac_current_magnify_height;
+	os << ", maniac_image_data=";
+	for (size_t i = 0; i < obj.maniac_image_data.size(); ++i) {
+		os << (i == 0 ? "[" : ", ") << obj.maniac_image_data[i];
+	}
+	os << "]";
 	os << ", maniac_finish_magnify_height="<< obj.maniac_finish_magnify_height;
 	os << "}";
 	return os;

src/lcf/reader_lcf.h

@@ -190,11 +190,18 @@ class LcfReader {
 	 * In debug builds, dumps the content of the
 	 * skipped chunk to stderr.
 	 *
-	 * @param chunk_info chunk that will be skipped.
+	 * @param chunk_info chunk that will be skipped and dumped.
 	 * @param where name of the caller that caused the skip, for finding unknown chunks
 	 */
 	void Skip(const struct LcfReader::Chunk& chunk_info, const char* where);
 
+	/**
+	 * Like Skip but only dumps the content of the skipped chunk on stderr.
+	 *
+	 * @param length how many bytes to dump
+	 */
+	void Dump(uint32_t length);
+
 	/**
 	 * Encodes a string to UTF-8 using the set encoding
 	 * in the reader constructor.

src/reader_lcf.cpp

@@ -282,10 +282,14 @@ void LcfReader::Skip(const struct LcfReader::Chunk& chunk_info, const char* wher
 	Log::Debug("Skipped Chunk %02X (%" PRIu32 " byte) in lcf at %" PRIX32 " (%s)",
 			chunk_info.ID, chunk_info.length, Tell(), where);
 
+	Dump(chunk_info.length);
+}
+
+void LcfReader::Dump(uint32_t length) {
 	std::stringstream ss;
 	ss << std::hex;
 
-	for (uint32_t i = 0; i < chunk_info.length; ++i) {
+	for (uint32_t i = 0; i < length; ++i) {
 		uint8_t byte;
 		LcfReader::Read(byte);
 		ss << std::setfill('0') << std::setw(2) << (int)byte << " ";