Skip to content

Commit 8614f63

Browse files
authored
Merge pull request #482 from ToolMan2k/master
Maniac Patch : Adding separate camera pan speeds from Maniac Patch
2 parents 4483cb4 + db07003 commit 8614f63

File tree

5 files changed

+30
-2
lines changed

5 files changed

+30
-2
lines changed

generator/csv/fields_easyrpg.csv

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ SaveEasyRpgText,letter_spacing,f,Int32,0x06,0,0,0,Additional spacing between let
3131
SaveEasyRpgText,line_spacing,f,Int32,0x07,4,0,0,Additional spacing between lines
3232
SaveEasyRpgText,flags,f,SaveEasyRpgText_Flags,0x08,3,0,0,Various text settings
3333
SaveMapEventBase,easyrpg_move_failure_count,f,Int32,0xC9,0,0,0,Tracks how often the current move operation in a move route failed
34+
SavePartyLocation,maniac_horizontal_pan_speed,f,Double,0x8D,0,0,0,horizontal speed in the scrolls of the screen
35+
SavePartyLocation,maniac_vertical_pan_speed,f,Double,0x8E,0,0,0,vertical speed in the scrolls of the screen
3436
SaveSystem,maniac_strings,f,Vector<DBString>,0x24,,0,0,rpg::Strings
3537
SaveSystem,maniac_frameskip,,Int32,0x88,0,0,0,"FatalMix Frameskip (0=None, 1=1/5, 2=1/3, 3=1/2)"
3638
SaveSystem,maniac_picture_limit,,Int32,0x89,0,0,0,FatalMix Picture Limit

src/generated/lcf/lsd/chunks.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,11 @@ namespace LSD_Reader {
441441
/** Mirrors save_count of current map. On mismatch events are not continued after load. */
442442
map_save_count = 0x83,
443443
/** ? */
444-
database_save_count = 0x84
444+
database_save_count = 0x84,
445+
/** horizontal speed in the scrolls of the screen. */
446+
maniac_horizontal_pan_speed = 0x8D,
447+
/** vertical speed in the scrolls of the screen. */
448+
maniac_vertical_pan_speed = 0x8E
445449
};
446450
};
447451
struct ChunkSaveVehicleLocation {

src/generated/lcf/rpg/savepartylocation.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ namespace rpg {
7171
bool encounter_calling = false;
7272
int32_t map_save_count = 0;
7373
int32_t database_save_count = 0;
74+
double maniac_horizontal_pan_speed = 0.0;
75+
double maniac_vertical_pan_speed = 0.0;
7476
};
7577
inline std::ostream& operator<<(std::ostream& os, SavePartyLocation::VehicleType code) {
7678
os << static_cast<std::underlying_type_t<decltype(code)>>(code);
@@ -97,7 +99,9 @@ namespace rpg {
9799
&& l.total_encounter_rate == r.total_encounter_rate
98100
&& l.encounter_calling == r.encounter_calling
99101
&& l.map_save_count == r.map_save_count
100-
&& l.database_save_count == r.database_save_count;
102+
&& l.database_save_count == r.database_save_count
103+
&& l.maniac_horizontal_pan_speed == r.maniac_horizontal_pan_speed
104+
&& l.maniac_vertical_pan_speed == r.maniac_vertical_pan_speed;
101105
}
102106

103107
inline bool operator!=(const SavePartyLocation& l, const SavePartyLocation& r) {

src/generated/lsd_savepartylocation.cpp

+16
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,20 @@ static TypedField<rpg::SavePartyLocation, int32_t> static_database_save_count(
412412
0,
413413
0
414414
);
415+
static TypedField<rpg::SavePartyLocation, double> static_maniac_horizontal_pan_speed(
416+
&rpg::SavePartyLocation::maniac_horizontal_pan_speed,
417+
LSD_Reader::ChunkSavePartyLocation::maniac_horizontal_pan_speed,
418+
"maniac_horizontal_pan_speed",
419+
0,
420+
0
421+
);
422+
static TypedField<rpg::SavePartyLocation, double> static_maniac_vertical_pan_speed(
423+
&rpg::SavePartyLocation::maniac_vertical_pan_speed,
424+
LSD_Reader::ChunkSavePartyLocation::maniac_vertical_pan_speed,
425+
"maniac_vertical_pan_speed",
426+
0,
427+
0
428+
);
415429

416430

417431
template <>
@@ -472,6 +486,8 @@ Field<rpg::SavePartyLocation> const* Struct<rpg::SavePartyLocation>::fields[] =
472486
&static_encounter_calling,
473487
&static_map_save_count,
474488
&static_database_save_count,
489+
&static_maniac_horizontal_pan_speed,
490+
&static_maniac_vertical_pan_speed,
475491
NULL
476492
};
477493

src/generated/rpg_savepartylocation.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ std::ostream& operator<<(std::ostream& os, const SavePartyLocation& obj) {
3636
os << ", encounter_calling="<< obj.encounter_calling;
3737
os << ", map_save_count="<< obj.map_save_count;
3838
os << ", database_save_count="<< obj.database_save_count;
39+
os << ", maniac_horizontal_pan_speed="<< obj.maniac_horizontal_pan_speed;
40+
os << ", maniac_vertical_pan_speed="<< obj.maniac_vertical_pan_speed;
3941
os << "}";
4042
return os;
4143
}

0 commit comments

Comments
 (0)