Skip to content

Commit 8871856

Browse files
mateofiomateofio
committed
Use DBBitArray
1 parent 4b53a62 commit 8871856

File tree

7 files changed

+38
-35
lines changed

7 files changed

+38
-35
lines changed

‎generator/csv/fields.csv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ Skill,affect_spirit,f,Boolean,0x23,False,0,0,Flag
158158
Skill,affect_agility,f,Boolean,0x24,False,0,0,Flag
159159
Skill,absorb_damage,f,Boolean,0x25,False,0,0,Flag
160160
Skill,ignore_defense,f,Boolean,0x26,False,0,0,Flag
161-
Skill,state_effects,t,Vector<Boolean>,0x29,,0,0,Integer
162-
Skill,state_effects,f,Vector<Boolean>,0x2A,,1,0,Array - Flag
163-
Skill,attribute_effects,t,Vector<Boolean>,0x2B,,0,0,Integer
164-
Skill,attribute_effects,f,Vector<Boolean>,0x2C,,1,0,Array - Flag
161+
Skill,state_effects,t,DBBitArray,0x29,,0,0,Integer
162+
Skill,state_effects,f,DBBitArray,0x2A,,1,0,Array - Flag
163+
Skill,attribute_effects,t,DBBitArray,0x2B,,0,0,Integer
164+
Skill,attribute_effects,f,DBBitArray,0x2C,,1,0,Array - Flag
165165
Skill,affect_attr_defence,f,Boolean,0x2D,False,0,0,Flag
166166
Skill,battler_animation,f,Ref<Actor>,0x31,-1,0,1,Integer - RPG2003
167167
Skill,battler_animation_data,f,Array<BattlerAnimationData:Ref<Actor>>,0x32,,1,1,? - RPG2003
@@ -215,19 +215,19 @@ Item,skill_id,f,Ref<Skill>,0x35,1,0,0,Integer
215215
Item,switch_id,f,Ref<Switch>,0x37,1,0,0,Integer
216216
Item,occasion_field2,f,Boolean,0x39,True,0,0,Flag
217217
Item,occasion_battle,f,Boolean,0x3A,False,0,0,Flag
218-
Item,actor_set,t,Vector<Boolean>,0x3D,,0,0,Integer
219-
Item,actor_set,f,Vector<Boolean>,0x3E,,1,0,Array - Flag
220-
Item,state_set,t,Vector<Boolean>,0x3F,,0,0,Integer
221-
Item,state_set,f,Vector<Boolean>,0x40,,1,0,Array - Flag
222-
Item,attribute_set,t,Vector<Boolean>,0x41,,0,0,Integer
223-
Item,attribute_set,f,Vector<Boolean>,0x42,,1,0,Array - Flag
218+
Item,actor_set,t,DBBitArray,0x3D,,0,0,Integer
219+
Item,actor_set,f,DBBitArray,0x3E,,1,0,Array - Flag
220+
Item,state_set,t,DBBitArray,0x3F,,0,0,Integer
221+
Item,state_set,f,DBBitArray,0x40,,1,0,Array - Flag
222+
Item,attribute_set,t,DBBitArray,0x41,,0,0,Integer
223+
Item,attribute_set,f,DBBitArray,0x42,,1,0,Array - Flag
224224
Item,state_chance,f,Int32,0x43,0,0,0,Integer
225225
Item,reverse_state_effect,f,Boolean,0x44,False,0,0,Flag
226226
Item,weapon_animation,f,Ref<Actor>,0x45,-1,0,1,Integer - RPG2003
227227
Item,animation_data,f,Array<ItemAnimation:Ref<Actor>>,0x46,,1,1,Array - RPG2003
228228
Item,use_skill,f,Boolean,0x47,False,0,1,Flag - RPG2003
229-
Item,class_set,t,Vector<Boolean>,0x48,,0,1,Integer - RPG2003
230-
Item,class_set,f,Vector<Boolean>,0x49,,1,1,Array - Flag - RPG2003
229+
Item,class_set,t,DBBitArray,0x48,,0,1,Integer - RPG2003
230+
Item,class_set,f,DBBitArray,0x49,,1,1,Array - Flag - RPG2003
231231
Item,ranged_trajectory,f,Enum<Item_Trajectory>,0x4B,0,0,0,Integer
232232
Item,ranged_target,f,Enum<Item_Target>,0x4C,0,0,0,Integer
233233
EnemyAction,kind,f,Enum<EnemyAction_Kind>,0x01,0,1,0,Integer
@@ -299,8 +299,8 @@ TroopPage,event_commands,f,Vector<EventCommand>,0x0C,,1,0,Array - rpg::EventComm
299299
Troop,name,f,DBString,0x01,'',0,0,String
300300
Troop,members,f,Array<TroopMember>,0x02,,1,0,Array - rpg::TroopMember
301301
Troop,auto_alignment,f,Boolean,0x03,False,0,1,Flag
302-
Troop,terrain_set,t,Vector<Boolean>,0x04,,0,0,Integer
303-
Troop,terrain_set,f,Vector<Boolean>,0x05,,1,0,Array - Flag
302+
Troop,terrain_set,t,DBBitArray,0x04,,0,0,Integer
303+
Troop,terrain_set,f,DBBitArray,0x05,,1,0,Array - Flag
304304
Troop,appear_randomly,f,Boolean,0x06,False,0,1,Flag
305305
Troop,pages,f,Array<TroopPage>,0x0B,,1,0,Array - rpg::TroopPage
306306
Terrain,name,f,DBString,0x01,'',0,0,String

‎src/generated/lcf/rpg/item.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// Headers
1616
#include <stdint.h>
1717
#include <vector>
18+
#include "lcf/dbbitarray.h"
1819
#include "lcf/dbstring.h"
1920
#include "lcf/enum_tags.h"
2021
#include "lcf/rpg/itemanimation.h"
@@ -117,15 +118,15 @@ namespace rpg {
117118
int32_t switch_id = 1;
118119
bool occasion_field2 = true;
119120
bool occasion_battle = false;
120-
std::vector<bool> actor_set;
121-
std::vector<bool> state_set;
122-
std::vector<bool> attribute_set;
121+
DBBitArray actor_set;
122+
DBBitArray state_set;
123+
DBBitArray attribute_set;
123124
int32_t state_chance = 0;
124125
bool reverse_state_effect = false;
125126
int32_t weapon_animation = -1;
126127
std::vector<ItemAnimation> animation_data;
127128
bool use_skill = false;
128-
std::vector<bool> class_set;
129+
DBBitArray class_set;
129130
int32_t ranged_trajectory = 0;
130131
int32_t ranged_target = 0;
131132
};

‎src/generated/lcf/rpg/skill.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// Headers
1616
#include <stdint.h>
1717
#include <vector>
18+
#include "lcf/dbbitarray.h"
1819
#include "lcf/dbstring.h"
1920
#include "lcf/enum_tags.h"
2021
#include "lcf/rpg/battleranimationdata.h"
@@ -96,8 +97,8 @@ namespace rpg {
9697
bool affect_agility = false;
9798
bool absorb_damage = false;
9899
bool ignore_defense = false;
99-
std::vector<bool> state_effects;
100-
std::vector<bool> attribute_effects;
100+
DBBitArray state_effects;
101+
DBBitArray attribute_effects;
101102
bool affect_attr_defence = false;
102103
int32_t battler_animation = -1;
103104
std::vector<BattlerAnimationData> battler_animation_data;

‎src/generated/lcf/rpg/troop.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
// Headers
1616
#include <vector>
17+
#include "lcf/dbbitarray.h"
1718
#include "lcf/dbstring.h"
1819
#include "lcf/rpg/troopmember.h"
1920
#include "lcf/rpg/trooppage.h"
@@ -31,7 +32,7 @@ namespace rpg {
3132
DBString name;
3233
std::vector<TroopMember> members;
3334
bool auto_alignment = false;
34-
std::vector<bool> terrain_set;
35+
DBBitArray terrain_set;
3536
bool appear_randomly = false;
3637
std::vector<TroopPage> pages;
3738
};

‎src/generated/ldb_item.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,39 +307,39 @@ static TypedField<rpg::Item, bool> static_occasion_battle(
307307
0,
308308
0
309309
);
310-
static SizeField<rpg::Item, std::vector<bool>> static_size_actor_set(
310+
static SizeField<rpg::Item, DBBitArray> static_size_actor_set(
311311
&rpg::Item::actor_set,
312312
LDB_Reader::ChunkItem::actor_set_size,
313313
0,
314314
0
315315
);
316-
static TypedField<rpg::Item, std::vector<bool>> static_actor_set(
316+
static TypedField<rpg::Item, DBBitArray> static_actor_set(
317317
&rpg::Item::actor_set,
318318
LDB_Reader::ChunkItem::actor_set,
319319
"actor_set",
320320
1,
321321
0
322322
);
323-
static SizeField<rpg::Item, std::vector<bool>> static_size_state_set(
323+
static SizeField<rpg::Item, DBBitArray> static_size_state_set(
324324
&rpg::Item::state_set,
325325
LDB_Reader::ChunkItem::state_set_size,
326326
0,
327327
0
328328
);
329-
static TypedField<rpg::Item, std::vector<bool>> static_state_set(
329+
static TypedField<rpg::Item, DBBitArray> static_state_set(
330330
&rpg::Item::state_set,
331331
LDB_Reader::ChunkItem::state_set,
332332
"state_set",
333333
1,
334334
0
335335
);
336-
static SizeField<rpg::Item, std::vector<bool>> static_size_attribute_set(
336+
static SizeField<rpg::Item, DBBitArray> static_size_attribute_set(
337337
&rpg::Item::attribute_set,
338338
LDB_Reader::ChunkItem::attribute_set_size,
339339
0,
340340
0
341341
);
342-
static TypedField<rpg::Item, std::vector<bool>> static_attribute_set(
342+
static TypedField<rpg::Item, DBBitArray> static_attribute_set(
343343
&rpg::Item::attribute_set,
344344
LDB_Reader::ChunkItem::attribute_set,
345345
"attribute_set",
@@ -381,13 +381,13 @@ static TypedField<rpg::Item, bool> static_use_skill(
381381
0,
382382
1
383383
);
384-
static SizeField<rpg::Item, std::vector<bool>> static_size_class_set(
384+
static SizeField<rpg::Item, DBBitArray> static_size_class_set(
385385
&rpg::Item::class_set,
386386
LDB_Reader::ChunkItem::class_set_size,
387387
0,
388388
1
389389
);
390-
static TypedField<rpg::Item, std::vector<bool>> static_class_set(
390+
static TypedField<rpg::Item, DBBitArray> static_class_set(
391391
&rpg::Item::class_set,
392392
LDB_Reader::ChunkItem::class_set,
393393
"class_set",

‎src/generated/ldb_skill.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,26 +223,26 @@ static TypedField<rpg::Skill, bool> static_ignore_defense(
223223
0,
224224
0
225225
);
226-
static SizeField<rpg::Skill, std::vector<bool>> static_size_state_effects(
226+
static SizeField<rpg::Skill, DBBitArray> static_size_state_effects(
227227
&rpg::Skill::state_effects,
228228
LDB_Reader::ChunkSkill::state_effects_size,
229229
0,
230230
0
231231
);
232-
static TypedField<rpg::Skill, std::vector<bool>> static_state_effects(
232+
static TypedField<rpg::Skill, DBBitArray> static_state_effects(
233233
&rpg::Skill::state_effects,
234234
LDB_Reader::ChunkSkill::state_effects,
235235
"state_effects",
236236
1,
237237
0
238238
);
239-
static SizeField<rpg::Skill, std::vector<bool>> static_size_attribute_effects(
239+
static SizeField<rpg::Skill, DBBitArray> static_size_attribute_effects(
240240
&rpg::Skill::attribute_effects,
241241
LDB_Reader::ChunkSkill::attribute_effects_size,
242242
0,
243243
0
244244
);
245-
static TypedField<rpg::Skill, std::vector<bool>> static_attribute_effects(
245+
static TypedField<rpg::Skill, DBBitArray> static_attribute_effects(
246246
&rpg::Skill::attribute_effects,
247247
LDB_Reader::ChunkSkill::attribute_effects,
248248
"attribute_effects",

‎src/generated/ldb_troop.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ static TypedField<rpg::Troop, bool> static_auto_alignment(
4141
0,
4242
1
4343
);
44-
static SizeField<rpg::Troop, std::vector<bool>> static_size_terrain_set(
44+
static SizeField<rpg::Troop, DBBitArray> static_size_terrain_set(
4545
&rpg::Troop::terrain_set,
4646
LDB_Reader::ChunkTroop::terrain_set_size,
4747
0,
4848
0
4949
);
50-
static TypedField<rpg::Troop, std::vector<bool>> static_terrain_set(
50+
static TypedField<rpg::Troop, DBBitArray> static_terrain_set(
5151
&rpg::Troop::terrain_set,
5252
LDB_Reader::ChunkTroop::terrain_set,
5353
"terrain_set",

0 commit comments

Comments
 (0)