Merge pull request #331 from fmatthew5876/items

carstene1ns · web-flow · commit d1f3e1562446 · 2019-06-07T19:06:19.000+02:00
Change items_size -&gt; item_ids count field
diff --git a/generator/csv/fields.csv b/generator/csv/fields.csv
@@ -884,7 +884,7 @@ SaveActor,super_guard,f,Boolean,0x5F,False,0,1,bool
 SaveActor,battler_animation,f,Ref<BattlerAnimation>,0x60,0,0,1,Integer - RPG2003
 SaveInventory,party_size,f,Int32,0x01,-1,0,0,?
 SaveInventory,party,f,Vector<Int16>,0x02,,1,0,?
-SaveInventory,items_size,f,Int32,0x0B,-1,0,0,?
+SaveInventory,item_ids,t,Count<Int16>,0x0B,0,1,0,?
 SaveInventory,item_ids,f,Vector<Int16>,0x0C,,1,0,short[]: item list
 SaveInventory,item_counts,f,Vector<UInt8>,0x0D,,1,0,?
 SaveInventory,item_usage,f,Vector<UInt8>,0x0E,,1,0,?
diff --git a/generator/generate.py b/generator/generate.py
@@ -145,6 +145,11 @@ def filter_unwritten_fields(fields):
     for field in fields:
         if field.type:
             yield field
+
+def filter_size_fields(fields):
+    for field in fields:
+        if not field.size:
+            yield field
 # End of Jinja 2 functions
 
 int_types = {
@@ -425,6 +430,7 @@ def main(argv):
     env.filters["struct_has_code"] = filter_structs_without_codes
     env.filters["field_is_used"] = filter_unused_fields
     env.filters["field_is_written"] = filter_unwritten_fields
+    env.filters["field_is_not_size"] = filter_size_fields
     env.filters["num_flags"] = num_flags
     env.filters["flag_size"] = flag_size
     env.filters["flag_set"] = flag_set
diff --git a/generator/templates/rpg_header.tmpl b/generator/templates/rpg_header.tmpl
@@ -107,7 +107,7 @@ namespace RPG {
 	{%- endfor %}
 
 	inline bool operator==(const {{ struct_name }}& l, const {{ struct_name }}& r) {
-	{%- for field in fields[struct_name]|field_is_used -%}
+	{%- for field in fields[struct_name]|field_is_used|field_is_not_size -%}
 		{% if loop.first %}
 		return
 		{%- else %}
diff --git a/src/generated/lsd_chunks.h b/src/generated/lsd_chunks.h
@@ -585,7 +585,7 @@ namespace LSD_Reader {
 			/** ? */
 			party = 0x02,
 			/** ? */
-			items_size = 0x0B,
+			item_ids_size = 0x0B,
 			/** short[]: item list */
 			item_ids = 0x0C,
 			/** ? */
diff --git a/src/generated/lsd_saveinventory.cpp b/src/generated/lsd_saveinventory.cpp
@@ -35,11 +35,10 @@ Field<RPG::SaveInventory> const* Struct<RPG::SaveInventory>::fields[] = {
 		1,
 		0
 	),
-	new TypedField<RPG::SaveInventory, int32_t>(
-		&RPG::SaveInventory::items_size,
-		LSD_Reader::ChunkSaveInventory::items_size,
-		"items_size",
-		0,
+	new CountField<RPG::SaveInventory, int16_t>(
+		&RPG::SaveInventory::item_ids,
+		LSD_Reader::ChunkSaveInventory::item_ids_size,
+		1,
 		0
 	),
 	new TypedField<RPG::SaveInventory, std::vector<int16_t>>(
diff --git a/src/generated/rpg_actor.h b/src/generated/rpg_actor.h
@@ -91,8 +91,6 @@ namespace RPG {
 		&& l.rename_skill == r.rename_skill
 		&& l.skill_name == r.skill_name
 		&& l.state_ranks == r.state_ranks
-		&& l.state_ranks == r.state_ranks
-		&& l.attribute_ranks == r.attribute_ranks
 		&& l.attribute_ranks == r.attribute_ranks
 		&& l.battle_commands == r.battle_commands;
 	}
diff --git a/src/generated/rpg_class.h b/src/generated/rpg_class.h
@@ -55,8 +55,6 @@ namespace RPG {
 		&& l.battler_animation == r.battler_animation
 		&& l.skills == r.skills
 		&& l.state_ranks == r.state_ranks
-		&& l.state_ranks == r.state_ranks
-		&& l.attribute_ranks == r.attribute_ranks
 		&& l.attribute_ranks == r.attribute_ranks
 		&& l.battle_commands == r.battle_commands;
 	}
diff --git a/src/generated/rpg_commonevent.h b/src/generated/rpg_commonevent.h
@@ -43,7 +43,6 @@ namespace RPG {
 		&& l.trigger == r.trigger
 		&& l.switch_flag == r.switch_flag
 		&& l.switch_id == r.switch_id
-		&& l.event_commands == r.event_commands
 		&& l.event_commands == r.event_commands;
 	}
 
diff --git a/src/generated/rpg_enemy.h b/src/generated/rpg_enemy.h
@@ -68,8 +68,6 @@ namespace RPG {
 		&& l.miss == r.miss
 		&& l.levitate == r.levitate
 		&& l.state_ranks == r.state_ranks
-		&& l.state_ranks == r.state_ranks
-		&& l.attribute_ranks == r.attribute_ranks
 		&& l.attribute_ranks == r.attribute_ranks
 		&& l.actions == r.actions;
 	}
diff --git a/src/generated/rpg_eventpage.h b/src/generated/rpg_eventpage.h
@@ -153,7 +153,6 @@ namespace RPG {
 		&& l.animation_type == r.animation_type
 		&& l.move_speed == r.move_speed
 		&& l.move_route == r.move_route
-		&& l.event_commands == r.event_commands
 		&& l.event_commands == r.event_commands;
 	}
 
diff --git a/src/generated/rpg_item.h b/src/generated/rpg_item.h
@@ -170,18 +170,14 @@ namespace RPG {
 		&& l.occasion_field2 == r.occasion_field2
 		&& l.occasion_battle == r.occasion_battle
 		&& l.actor_set == r.actor_set
-		&& l.actor_set == r.actor_set
-		&& l.state_set == r.state_set
 		&& l.state_set == r.state_set
 		&& l.attribute_set == r.attribute_set
-		&& l.attribute_set == r.attribute_set
 		&& l.state_chance == r.state_chance
 		&& l.reverse_state_effect == r.reverse_state_effect
 		&& l.weapon_animation == r.weapon_animation
 		&& l.animation_data == r.animation_data
 		&& l.use_skill == r.use_skill
 		&& l.class_set == r.class_set
-		&& l.class_set == r.class_set
 		&& l.ranged_trajectory == r.ranged_trajectory
 		&& l.ranged_target == r.ranged_target;
 	}
diff --git a/src/generated/rpg_moveroute.h b/src/generated/rpg_moveroute.h
@@ -29,7 +29,6 @@ namespace RPG {
 
 	inline bool operator==(const MoveRoute& l, const MoveRoute& r) {
 		return l.move_commands == r.move_commands
-		&& l.move_commands == r.move_commands
 		&& l.repeat == r.repeat
 		&& l.skippable == r.skippable;
 	}
diff --git a/src/generated/rpg_saveactor.h b/src/generated/rpg_saveactor.h
@@ -92,7 +92,6 @@ namespace RPG {
 		&& l.current_sp == r.current_sp
 		&& l.battle_commands == r.battle_commands
 		&& l.status == r.status
-		&& l.status == r.status
 		&& l.changed_battle_commands == r.changed_battle_commands
 		&& l.class_id == r.class_id
 		&& l.row == r.row
diff --git a/src/generated/rpg_saveeventexecframe.h b/src/generated/rpg_saveeventexecframe.h
@@ -33,11 +33,9 @@ namespace RPG {
 
 	inline bool operator==(const SaveEventExecFrame& l, const SaveEventExecFrame& r) {
 		return l.commands == r.commands
-		&& l.commands == r.commands
 		&& l.current_command == r.current_command
 		&& l.event_id == r.event_id
 		&& l.triggered_by_decision_key == r.triggered_by_decision_key
-		&& l.subcommand_path == r.subcommand_path
 		&& l.subcommand_path == r.subcommand_path;
 	}
 
diff --git a/src/generated/rpg_saveinventory.h b/src/generated/rpg_saveinventory.h
@@ -25,7 +25,6 @@ namespace RPG {
 		void Setup();
 		int32_t party_size = -1;
 		std::vector<int16_t> party;
-		int32_t items_size = -1;
 		std::vector<int16_t> item_ids;
 		std::vector<uint8_t> item_counts;
 		std::vector<uint8_t> item_usage;
@@ -49,7 +48,6 @@ namespace RPG {
 	inline bool operator==(const SaveInventory& l, const SaveInventory& r) {
 		return l.party_size == r.party_size
 		&& l.party == r.party
-		&& l.items_size == r.items_size
 		&& l.item_ids == r.item_ids
 		&& l.item_counts == r.item_counts
 		&& l.item_usage == r.item_usage
diff --git a/src/generated/rpg_savesystem.h b/src/generated/rpg_savesystem.h
@@ -124,8 +124,6 @@ namespace RPG {
 		&& l.message_stretch == r.message_stretch
 		&& l.font_id == r.font_id
 		&& l.switches == r.switches
-		&& l.switches == r.switches
-		&& l.variables == r.variables
 		&& l.variables == r.variables
 		&& l.message_transparent == r.message_transparent
 		&& l.message_position == r.message_position
diff --git a/src/generated/rpg_skill.h b/src/generated/rpg_skill.h
@@ -131,8 +131,6 @@ namespace RPG {
 		&& l.absorb_damage == r.absorb_damage
 		&& l.ignore_defense == r.ignore_defense
 		&& l.state_effects == r.state_effects
-		&& l.state_effects == r.state_effects
-		&& l.attribute_effects == r.attribute_effects
 		&& l.attribute_effects == r.attribute_effects
 		&& l.affect_attr_defence == r.affect_attr_defence
 		&& l.battler_animation == r.battler_animation
diff --git a/src/generated/rpg_system.h b/src/generated/rpg_system.h
@@ -244,8 +244,6 @@ namespace RPG {
 		&& l.system_name == r.system_name
 		&& l.system2_name == r.system2_name
 		&& l.party == r.party
-		&& l.party == r.party
-		&& l.menu_commands == r.menu_commands
 		&& l.menu_commands == r.menu_commands
 		&& l.title_music == r.title_music
 		&& l.battle_music == r.battle_music
diff --git a/src/generated/rpg_troop.h b/src/generated/rpg_troop.h
@@ -38,7 +38,6 @@ namespace RPG {
 		&& l.members == r.members
 		&& l.auto_alignment == r.auto_alignment
 		&& l.terrain_set == r.terrain_set
-		&& l.terrain_set == r.terrain_set
 		&& l.appear_randomly == r.appear_randomly
 		&& l.pages == r.pages;
 	}
diff --git a/src/generated/rpg_trooppage.h b/src/generated/rpg_trooppage.h
@@ -30,7 +30,6 @@ namespace RPG {
 
 	inline bool operator==(const TroopPage& l, const TroopPage& r) {
 		return l.condition == r.condition
-		&& l.event_commands == r.event_commands
 		&& l.event_commands == r.event_commands;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,10 @@ Field<RPG::SaveInventory> const* Struct<RPG::SaveInventory>::fields[] = {`
`35`	`35`	`1,`
`36`	`36`	`0`
`37`	`37`	`),`
`38`		`- new TypedField<RPG::SaveInventory, int32_t>(`
`39`		`- &RPG::SaveInventory::items_size,`
`40`		`- LSD_Reader::ChunkSaveInventory::items_size,`
`41`		`- "items_size",`
`42`		`- 0,`
	`38`	`+ new CountField<RPG::SaveInventory, int16_t>(`
	`39`	`+ &RPG::SaveInventory::item_ids,`
	`40`	`+ LSD_Reader::ChunkSaveInventory::item_ids_size,`
	`41`	`+ 1,`
`43`	`42`	`0`
`44`	`43`	`),`
`45`	`44`	`new TypedField<RPG::SaveInventory, std::vector<int16_t>>(`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,6 @@ namespace RPG {`
`91`	`91`	`&& l.rename_skill == r.rename_skill`
`92`	`92`	`&& l.skill_name == r.skill_name`
`93`	`93`	`&& l.state_ranks == r.state_ranks`
`94`		`- && l.state_ranks == r.state_ranks`
`95`		`- && l.attribute_ranks == r.attribute_ranks`
`96`	`94`	`&& l.attribute_ranks == r.attribute_ranks`
`97`	`95`	`&& l.battle_commands == r.battle_commands;`
`98`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@ namespace RPG {`
`55`	`55`	`&& l.battler_animation == r.battler_animation`
`56`	`56`	`&& l.skills == r.skills`
`57`	`57`	`&& l.state_ranks == r.state_ranks`
`58`		`- && l.state_ranks == r.state_ranks`
`59`		`- && l.attribute_ranks == r.attribute_ranks`
`60`	`58`	`&& l.attribute_ranks == r.attribute_ranks`
`61`	`59`	`&& l.battle_commands == r.battle_commands;`
`62`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ namespace RPG {`
`43`	`43`	`&& l.trigger == r.trigger`
`44`	`44`	`&& l.switch_flag == r.switch_flag`
`45`	`45`	`&& l.switch_id == r.switch_id`
`46`		`- && l.event_commands == r.event_commands`
`47`	`46`	`&& l.event_commands == r.event_commands;`
`48`	`47`	`}`
`49`	`48`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ namespace RPG {`
`68`	`68`	`&& l.miss == r.miss`
`69`	`69`	`&& l.levitate == r.levitate`
`70`	`70`	`&& l.state_ranks == r.state_ranks`
`71`		`- && l.state_ranks == r.state_ranks`
`72`		`- && l.attribute_ranks == r.attribute_ranks`
`73`	`71`	`&& l.attribute_ranks == r.attribute_ranks`
`74`	`72`	`&& l.actions == r.actions;`
`75`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ namespace RPG {`
`153`	`153`	`&& l.animation_type == r.animation_type`
`154`	`154`	`&& l.move_speed == r.move_speed`
`155`	`155`	`&& l.move_route == r.move_route`
`156`		`- && l.event_commands == r.event_commands`
`157`	`156`	`&& l.event_commands == r.event_commands;`
`158`	`157`	`}`
`159`	`158`