Add missing and rename CBA chunks and structs
MODIFY
CMakeLists.txt
CMakeLists.txt
@@ -68,8 +68,9 @@ set(LCF_SOURCES
src/generated/ldb_battlecommand.cpp
src/generated/ldb_battlecommands.cpp
src/generated/ldb_battleranimation.cpp
- src/generated/ldb_battleranimationdata.cpp
- src/generated/ldb_battleranimationextension.cpp
+ src/generated/ldb_battleranimationitemskill.cpp
+ src/generated/ldb_battleranimationpose.cpp
+ src/generated/ldb_battleranimationweapon.cpp
src/generated/ldb_chipset.cpp
src/generated/ldb_class.cpp
src/generated/ldb_commonevent.cpp
@@ -77,7 +78,6 @@ set(LCF_SOURCES
src/generated/ldb_enemy.cpp
src/generated/ldb_enemyaction.cpp
src/generated/ldb_item.cpp
- src/generated/ldb_itemanimation.cpp
src/generated/ldb_learning.cpp
src/generated/ldb_music.cpp
src/generated/ldb_skill.cpp
@@ -132,8 +132,9 @@ set(LCF_SOURCES
src/generated/rpg_battlecommand.cpp
src/generated/rpg_battlecommands.cpp
src/generated/rpg_battleranimation.cpp
- src/generated/rpg_battleranimationdata.cpp
- src/generated/rpg_battleranimationextension.cpp
+ src/generated/rpg_battleranimationitemskill.cpp
+ src/generated/rpg_battleranimationpose.cpp
+ src/generated/rpg_battleranimationweapon.cpp
src/generated/rpg_chipset.cpp
src/generated/rpg_class.cpp
src/generated/rpg_commonevent.cpp
@@ -148,7 +149,6 @@ set(LCF_SOURCES
src/generated/rpg_eventpage.cpp
src/generated/rpg_eventpagecondition.cpp
src/generated/rpg_item.cpp
- src/generated/rpg_itemanimation.cpp
src/generated/rpg_learning.cpp
src/generated/rpg_map.cpp
src/generated/rpg_mapinfo.cpp
@@ -230,8 +230,9 @@ set(LCF_HEADERS
src/generated/lcf/rpg/battlecommand.h
src/generated/lcf/rpg/battlecommands.h
src/generated/lcf/rpg/battleranimation.h
- src/generated/lcf/rpg/battleranimationdata.h
- src/generated/lcf/rpg/battleranimationextension.h
+ src/generated/lcf/rpg/battleranimationitemskill.h
+ src/generated/lcf/rpg/battleranimationpose.h
+ src/generated/lcf/rpg/battleranimationweapon.h
src/generated/lcf/rpg/chipset.h
src/generated/lcf/rpg/class.h
src/generated/lcf/rpg/commonevent.h
@@ -246,7 +247,6 @@ set(LCF_HEADERS
src/generated/lcf/rpg/eventpagecondition.h
src/generated/lcf/rpg/fwd.h
src/generated/lcf/rpg/item.h
- src/generated/lcf/rpg/itemanimation.h
src/generated/lcf/rpg/learning.h
src/generated/lcf/rpg/map.h
src/generated/lcf/rpg/mapinfo.h

MODIFY
Makefile.am
Makefile.am
@@ -76,8 +76,9 @@ liblcf_la_SOURCES = \
src/generated/ldb_battlecommand.cpp \
src/generated/ldb_battlecommands.cpp \
src/generated/ldb_battleranimation.cpp \
- src/generated/ldb_battleranimationdata.cpp \
- src/generated/ldb_battleranimationextension.cpp \
+ src/generated/ldb_battleranimationitemskill.cpp \
+ src/generated/ldb_battleranimationpose.cpp \
+ src/generated/ldb_battleranimationweapon.cpp \
src/generated/ldb_chipset.cpp \
src/generated/ldb_class.cpp \
src/generated/ldb_commonevent.cpp \
@@ -85,7 +86,6 @@ liblcf_la_SOURCES = \
src/generated/ldb_enemy.cpp \
src/generated/ldb_enemyaction.cpp \
src/generated/ldb_item.cpp \
- src/generated/ldb_itemanimation.cpp \
src/generated/ldb_learning.cpp \
src/generated/ldb_music.cpp \
src/generated/ldb_skill.cpp \
@@ -140,8 +140,9 @@ liblcf_la_SOURCES = \
src/generated/rpg_battlecommand.cpp \
src/generated/rpg_battlecommands.cpp \
src/generated/rpg_battleranimation.cpp \
- src/generated/rpg_battleranimationdata.cpp \
- src/generated/rpg_battleranimationextension.cpp \
+ src/generated/rpg_battleranimationitemskill.cpp \
+ src/generated/rpg_battleranimationpose.cpp \
+ src/generated/rpg_battleranimationweapon.cpp \
src/generated/rpg_chipset.cpp \
src/generated/rpg_class.cpp \
src/generated/rpg_commonevent.cpp \
@@ -156,7 +157,6 @@ liblcf_la_SOURCES = \
src/generated/rpg_eventpage.cpp \
src/generated/rpg_eventpagecondition.cpp \
src/generated/rpg_item.cpp \
- src/generated/rpg_itemanimation.cpp \
src/generated/rpg_learning.cpp \
src/generated/rpg_map.cpp \
src/generated/rpg_mapinfo.cpp \
@@ -247,8 +247,9 @@ lcfrpginclude_HEADERS = \
src/generated/lcf/rpg/battlecommand.h \
src/generated/lcf/rpg/battlecommands.h \
src/generated/lcf/rpg/battleranimation.h \
- src/generated/lcf/rpg/battleranimationdata.h \
- src/generated/lcf/rpg/battleranimationextension.h \
+ src/generated/lcf/rpg/battleranimationitemskill.h \
+ src/generated/lcf/rpg/battleranimationpose.h \
+ src/generated/lcf/rpg/battleranimationweapon.h \
src/generated/lcf/rpg/chipset.h \
src/generated/lcf/rpg/class.h \
src/generated/lcf/rpg/commonevent.h \
@@ -263,7 +264,6 @@ lcfrpginclude_HEADERS = \
src/generated/lcf/rpg/eventpagecondition.h \
src/generated/lcf/rpg/fwd.h \
src/generated/lcf/rpg/item.h \
- src/generated/lcf/rpg/itemanimation.h \
src/generated/lcf/rpg/learning.h \
src/generated/lcf/rpg/map.h \
src/generated/lcf/rpg/mapinfo.h \

MODIFY
generator/csv/enums.csv
generator/csv/enums.csv
@@ -35,17 +35,34 @@ BattleCommands,Facing,up,1
BattleCommands,Facing,right,2
BattleCommands,Facing,down,3
BattleCommands,Facing,left,4
-BattlerAnimationExtension,AnimType,graphic,0
-BattlerAnimationExtension,AnimType,animation,1
BattlerAnimation,Speed,slow,0
BattlerAnimation,Speed,normal,8
BattlerAnimation,Speed,fast,14
-BattlerAnimationData,Movement,none,0
-BattlerAnimationData,Movement,step,1
-BattlerAnimationData,Movement,jump,2
-BattlerAnimationData,Movement,move,3
-BattlerAnimationData,AfterImage,none,0
-BattlerAnimationData,AfterImage,add,1
+BattlerAnimation,Pose,Idle,0
+BattlerAnimation,Pose,AttackRight,1
+BattlerAnimation,Pose,AttackLeft,2
+BattlerAnimation,Pose,Skill,3
+BattlerAnimation,Pose,Dead,4
+BattlerAnimation,Pose,Damage,5
+BattlerAnimation,Pose,Dazed,6
+BattlerAnimation,Pose,Defend,7
+BattlerAnimation,Pose,WalkLeft,8
+BattlerAnimation,Pose,WalkRight,9
+BattlerAnimation,Pose,Victory,10
+BattlerAnimation,Pose,Item,11
+BattlerAnimationItemSkill,Speed,fast,0
+BattlerAnimationItemSkill,Speed,medium,1
+BattlerAnimationItemSkill,Speed,slow,2
+BattlerAnimationItemSkill,AnimType,weapon,0
+BattlerAnimationItemSkill,AnimType,battle,1
+BattlerAnimationItemSkill,Movement,none,0
+BattlerAnimationItemSkill,Movement,step,1
+BattlerAnimationItemSkill,Movement,jump,2
+BattlerAnimationItemSkill,Movement,move,3
+BattlerAnimationItemSkill,AfterImage,none,0
+BattlerAnimationItemSkill,AfterImage,add,1
+BattlerAnimationPose,AnimType,character,0
+BattlerAnimationPose,AnimType,battle,1
Chipset,AnimType,reciprocating,0
Chipset,AnimType,cyclic,1
CommonEvent,Trigger,automatic,3
@@ -63,15 +80,6 @@ Skill,Scope,enemies,1
Skill,Scope,self,2
Skill,Scope,ally,3
Skill,Scope,party,4
-ItemAnimation,Movement,none,0
-ItemAnimation,Movement,step,1
-ItemAnimation,Movement,jump,2
-ItemAnimation,Movement,move,3
-ItemAnimation,AfterImage,none,0
-ItemAnimation,AfterImage,add,1
-ItemAnimation,Speed,fast,0
-ItemAnimation,Speed,medium,1
-ItemAnimation,Speed,slow,2
Item,Type,normal,0
Item,Type,weapon,1
Item,Type,shield,2

MODIFY
generator/csv/fields.csv
generator/csv/fields.csv
@@ -88,18 +88,29 @@ BattleCommands,death_teleport_id,f,Ref<Map>,0x1A,1,0,0,Integer
BattleCommands,death_teleport_x,f,Int32,0x1B,0,0,0,Integer
BattleCommands,death_teleport_y,f,Int32,0x1C,0,0,0,Integer
BattleCommands,death_teleport_face,f,Enum<BattleCommands_Facing>,0x1D,0,0,0,Integer
-BattlerAnimationExtension,name,f,DBString,0x01,,0,0,String
-BattlerAnimationExtension,battler_name,f,DBString,0x02,,0,0,String
-BattlerAnimationExtension,battler_index,f,Int32,0x03,0,0,0,Integer
-BattlerAnimationExtension,animation_type,f,Enum<BattlerAnimationExtension_AnimType>,0x04,0,0,0,Integer
-BattlerAnimationExtension,animation_id,f,Ref<Animation>,0x05,1,0,0,Integer
-BattlerAnimation,name,f,DBString,0x01,,0,0,String
-BattlerAnimation,speed,f,Enum<BattlerAnimation_Speed>,0x02,0,0,0,Integer
-BattlerAnimation,base_data,f,Array<BattlerAnimationExtension>,0x0A,,1,0,Array - rpg::BattlerAnimationExtension
-BattlerAnimation,weapon_data,f,Array<BattlerAnimationExtension>,0x0B,,1,0,Array - rpg::BattlerAnimationExtension
-BattlerAnimationData,move,f,Enum<BattlerAnimationData_Movement>,0x05,0,0,0,Integer
-BattlerAnimationData,after_image,f,Enum<BattlerAnimationData_AfterImage>,0x06,0,0,0,Integer
-BattlerAnimationData,pose,f,Int32,0x0E,-1,0,0,Integer
+BattlerAnimation,name,f,DBString,0x01,,0,1,String
+BattlerAnimation,speed,f,Enum<BattlerAnimation_Speed>,0x02,20,0,1,Integer
+BattlerAnimation,poses,f,Array<BattlerAnimationPose>,0x0A,,1,1,Array - rpg::BattlerAnimationPose
+BattlerAnimation,weapons,f,Array<BattlerAnimationWeapon>,0x0B,,1,1,Array - rpg::BattlerAnimationWeapon
+BattlerAnimationItemSkill,unknown02,f,Int32,0x02,0,0,1,
+BattlerAnimationItemSkill,type,f,Enum<BattlerAnimationItemSkill_AnimType>,0x03,0,0,1,
+BattlerAnimationItemSkill,weapon_animation_id,f,Ref<BattlerAnimationWeapon>,0x04,0,0,1,
+BattlerAnimationItemSkill,movement,f,Enum<BattlerAnimationItemSkill_Movement>,0x05,0,0,1,
+BattlerAnimationItemSkill,after_image,f,Enum<BattlerAnimationItemSkill_AfterImage>,0x06,0,0,1,
+BattlerAnimationItemSkill,attacks,f,Int32,0x07,0,0,1,
+BattlerAnimationItemSkill,ranged,f,Boolean,0x08,False,0,1,
+BattlerAnimationItemSkill,ranged_animation_id,f,Ref<BattlerAnimationWeapon>,0x09,0,0,1,
+BattlerAnimationItemSkill,ranged_speed,f,Enum<BattlerAnimationItemSkill_Speed>,0x0C,0,0,1,
+BattlerAnimationItemSkill,battle_animation_id,f,Ref<Animation>,0x0D,1,0,1,
+BattlerAnimationItemSkill,pose,f,Ref<BattlerAnimationPose>,0x0E,3,0,1,
+BattlerAnimationPose,name,f,DBString,0x01,,0,1,String
+BattlerAnimationPose,battler_name,f,DBString,0x02,,0,1,String
+BattlerAnimationPose,battler_index,f,Int32,0x03,0,0,1,Integer
+BattlerAnimationPose,animation_type,f,Enum<BattlerAnimationPose_AnimType>,0x04,0,0,1,Integer
+BattlerAnimationPose,battle_animation_id,f,Ref<Animation>,0x05,1,0,1,Integer
+BattlerAnimationWeapon,name,f,DBString,0x01,,0,1,String
+BattlerAnimationWeapon,weapon_name,f,DBString,0x02,,0,1,String
+BattlerAnimationWeapon,weapon_index,f,Int32,0x03,0,0,1,Integer
Chipset,name,f,DBString,0x01,,0,0,String
Chipset,chipset_name,f,DBString,0x02,,0,0,String
Chipset,terrain_data,f,Vector<Int16>,0x03,[1]*162,0,0,Array - Short x 162
@@ -164,16 +175,7 @@ Skill,attribute_effects,t,DBBitArray,0x2B,,0,0,Integer
Skill,attribute_effects,f,DBBitArray,0x2C,,1,0,Array - Flag
Skill,affect_attr_defence,f,Boolean,0x2D,False,0,0,Flag
Skill,battler_animation,f,Ref<Actor>,0x31,-1,0,1,Integer - RPG2003
-Skill,battler_animation_data,f,Array<BattlerAnimationData:Ref<Actor>>,0x32,,1,1,? - RPG2003
-ItemAnimation,type,f,Int32,0x03,0,0,0,
-ItemAnimation,weapon_anim,f,Int32,0x04,0,0,0,
-ItemAnimation,movement,f,Enum<ItemAnimation_Movement>,0x05,0,0,0,
-ItemAnimation,after_image,f,Enum<ItemAnimation_AfterImage>,0x06,0,0,0,
-ItemAnimation,attacks,f,Int32,0x07,0,0,0,
-ItemAnimation,ranged,f,Boolean,0x08,False,0,0,
-ItemAnimation,ranged_anim,f,Int32,0x09,0,0,0,
-ItemAnimation,ranged_speed,f,Enum<ItemAnimation_Speed>,0x0C,0,0,0,
-ItemAnimation,battle_anim,f,Ref<Animation>,0x0D,0,0,0,
+Skill,battler_animation_data,f,Array<BattlerAnimationItemSkill:Ref<Actor>>,0x32,,1,1,? - RPG2003
Item,name,f,DBString,0x01,,0,0,String
Item,description,f,DBString,0x02,,0,0,String
Item,type,f,Enum<Item_Type>,0x03,0,1,0,Integer
@@ -224,7 +226,7 @@ Item,attribute_set,f,DBBitArray,0x42,,1,0,Array - Flag
Item,state_chance,f,Int32,0x43,0,0,0,Integer
Item,reverse_state_effect,f,Boolean,0x44,False,0,0,Flag
Item,weapon_animation,f,Ref<Actor>,0x45,-1,0,1,Integer - RPG2003
-Item,animation_data,f,Array<ItemAnimation:Ref<Actor>>,0x46,,1,1,Array - RPG2003
+Item,animation_data,f,Array<BattlerAnimationItemSkill:Ref<Actor>>,0x46,,1,1,Array - RPG2003
Item,use_skill,f,Boolean,0x47,False,0,1,Flag - RPG2003
Item,class_set,t,DBBitArray,0x48,,0,1,Integer - RPG2003
Item,class_set,f,DBBitArray,0x49,,1,1,Array - Flag - RPG2003

MODIFY
generator/csv/structs.csv
generator/csv/structs.csv
@@ -13,14 +13,14 @@ ldb,Animation,,1
ldb,Attribute,,1
ldb,BattleCommand,,1
ldb,BattleCommands,,0
-ldb,BattlerAnimationExtension,,1
ldb,BattlerAnimation,,1
-ldb,BattlerAnimationData,,1
+ldb,BattlerAnimationItemSkill,,1
+ldb,BattlerAnimationPose,,1
+ldb,BattlerAnimationWeapon,,1
ldb,Chipset,,1
ldb,Class,,1
ldb,CommonEvent,,1
ldb,Skill,,1
-ldb,ItemAnimation,,1
ldb,Item,,1
ldb,EnemyAction,,1
ldb,Enemy,,1

MODIFY
src/lcf/ldb/reader.h
src/lcf/ldb/reader.h
#include "lcf/rpg/class.h"
#include "lcf/rpg/battlecommand.h"
#include "lcf/rpg/battleranimation.h"
-#include "lcf/rpg/battleranimationdata.h"
-#include "lcf/rpg/itemanimation.h"
#include "lcf/rpg/parameters.h"
#include "lcf/rpg/equipment.h"
#include "lcf/rpg/database.h"

Add missing and rename CBA chunks and structs