Skip to content

Commit 01e901f

Browse files
author
rueter37
committed
Move option "Enable stat absorbing" to skills
"Enable stat absorbing" is a per skill option now and no longer a global system option.
1 parent 513c80e commit 01e901f

8 files changed

Lines changed: 32 additions & 32 deletions

File tree

generator/csv/fields_easyrpg.csv

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Skill,easyrpg_state_hit,f,Int32,0xCB,-1,0,0,Separate accuracy value for state in
2020
Skill,easyrpg_attribute_hit,f,Int32,0xCC,-1,0,0,Separate accuracy value for attribute shifts
2121
Skill,easyrpg_ignore_restrict_skill,f,Boolean,0xCD,False,0,0,If the skill should bypass skill restrictions by states
2222
Skill,easyrpg_ignore_restrict_magic,f,Boolean,0xCE,False,0,0,If the skill should bypass magic restrictions by states
23+
Skill,easyrpg_enable_stat_absorbing,f,Boolean,0xCF,False,0,0,If the skill can absorb attack/defense/spirit/agility
2324
Item,easyrpg_using_message,f,DBString,0xC9,DBString(kDefaultMessage),0,0,Item usage message in battle
2425
Item,easyrpg_max_count,f,Int32,0xCA,-1,0,0,How many the player can carry of this item
2526
Terms,easyrpg_item_number_separator,f,DBString,0xC8,DBString(kDefaultTerm),0,0,Item number separator
@@ -49,12 +50,11 @@ System,easyrpg_max_enemy_hp,f,Int32,0xCB,-1,0,0,Absolute maximum HP value enemie
4950
System,easyrpg_max_damage,f,Int32,0xCC,-1,0,0,How much damage can an attack inflict at most
5051
System,easyrpg_max_exp,f,Int32,0xCD,-1,0,0,Absolute maximum EXP value actors can have
5152
System,easyrpg_max_level,f,Int32,0xCE,-1,0,0,Absolute maximum level actors can reach
52-
System,easyrpg_enable_stat_absorbing,f,Boolean,0xCF,False,0,0,If attack/defense/spirit/agility can be absorbed
53-
System,easyrpg_max_savefiles,f,Int32,0xD0,15,0,0,How many savegame slots should be shown in the savegame scene
54-
System,easyrpg_max_item_count,f,Int32,0xD1,-1,0,0,How many items of a kind the player can carry. Can be overridden per item with the easyrpg_max_count setting of an item
55-
System,easyrpg_variable_min_value,f,Int32,0xD2,0,0,0,Minimum value a variable can have
56-
System,easyrpg_variable_max_value,f,Int32,0xD3,0,0,0,Maximum value a variable can have
57-
System,easyrpg_max_actor_sp,f,Int32,0xD4,-1,0,0,Absolute maximum SP value actors can have
58-
System,easyrpg_max_enemy_sp,f,Int32,0xD5,-1,0,0,Absolute maximum SP value enemies can have
59-
System,easyrpg_max_stat_base_value,f,Int32,0xD6,-1,0,0,Absolute maximum value a base stat can have
60-
System,easyrpg_max_stat_battle_value,f,Int32,0xD7,-1,0,0,Absolute maximum value a battle stat can have
53+
System,easyrpg_max_savefiles,f,Int32,0xCF,15,0,0,How many savegame slots should be shown in the savegame scene
54+
System,easyrpg_max_item_count,f,Int32,0xD0,-1,0,0,How many items of a kind the player can carry. Can be overridden per item with the easyrpg_max_count setting of an item
55+
System,easyrpg_variable_min_value,f,Int32,0xD1,0,0,0,Minimum value a variable can have
56+
System,easyrpg_variable_max_value,f,Int32,0xD2,0,0,0,Maximum value a variable can have
57+
System,easyrpg_max_actor_sp,f,Int32,0xD3,-1,0,0,Absolute maximum SP value actors can have
58+
System,easyrpg_max_enemy_sp,f,Int32,0xD4,-1,0,0,Absolute maximum SP value enemies can have
59+
System,easyrpg_max_stat_base_value,f,Int32,0xD5,-1,0,0,Absolute maximum value a base stat can have
60+
System,easyrpg_max_stat_battle_value,f,Int32,0xD6,-1,0,0,Absolute maximum value a battle stat can have

src/generated/lcf/ldb/chunks.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,9 @@ namespace LDB_Reader {
459459
/** If the skill should bypass skill restrictions by states */
460460
easyrpg_ignore_restrict_skill = 0xCD,
461461
/** If the skill should bypass magic restrictions by states */
462-
easyrpg_ignore_restrict_magic = 0xCE
462+
easyrpg_ignore_restrict_magic = 0xCE,
463+
/** If the skill can absorb attack/defense/spirit/agility */
464+
easyrpg_enable_stat_absorbing = 0xCF
463465
};
464466
};
465467
struct ChunkItem {
@@ -1370,24 +1372,22 @@ namespace LDB_Reader {
13701372
easyrpg_max_exp = 0xCD,
13711373
/** Absolute maximum level actors can reach */
13721374
easyrpg_max_level = 0xCE,
1373-
/** If attack/defense/spirit/agility can be absorbed */
1374-
easyrpg_enable_stat_absorbing = 0xCF,
13751375
/** How many savegame slots should be shown in the savegame scene */
1376-
easyrpg_max_savefiles = 0xD0,
1376+
easyrpg_max_savefiles = 0xCF,
13771377
/** How many items of a kind the player can carry. Can be overridden per item with the easyrpg_max_count setting of an item */
1378-
easyrpg_max_item_count = 0xD1,
1378+
easyrpg_max_item_count = 0xD0,
13791379
/** Minimum value a variable can have */
1380-
easyrpg_variable_min_value = 0xD2,
1380+
easyrpg_variable_min_value = 0xD1,
13811381
/** Maximum value a variable can have */
1382-
easyrpg_variable_max_value = 0xD3,
1382+
easyrpg_variable_max_value = 0xD2,
13831383
/** Absolute maximum SP value actors can have */
1384-
easyrpg_max_actor_sp = 0xD4,
1384+
easyrpg_max_actor_sp = 0xD3,
13851385
/** Absolute maximum SP value enemies can have */
1386-
easyrpg_max_enemy_sp = 0xD5,
1386+
easyrpg_max_enemy_sp = 0xD4,
13871387
/** Absolute maximum value a base stat can have */
1388-
easyrpg_max_stat_base_value = 0xD6,
1388+
easyrpg_max_stat_base_value = 0xD5,
13891389
/** Absolute maximum value a battle stat can have */
1390-
easyrpg_max_stat_battle_value = 0xD7
1390+
easyrpg_max_stat_battle_value = 0xD6
13911391
};
13921392
};
13931393
struct ChunkSwitch {

src/generated/lcf/rpg/skill.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ namespace rpg {
112112
int32_t easyrpg_attribute_hit = -1;
113113
bool easyrpg_ignore_restrict_skill = false;
114114
bool easyrpg_ignore_restrict_magic = false;
115+
bool easyrpg_enable_stat_absorbing = false;
115116
};
116117
inline std::ostream& operator<<(std::ostream& os, Skill::Type code) {
117118
os << static_cast<std::underlying_type_t<decltype(code)>>(code);
@@ -166,7 +167,8 @@ namespace rpg {
166167
&& l.easyrpg_state_hit == r.easyrpg_state_hit
167168
&& l.easyrpg_attribute_hit == r.easyrpg_attribute_hit
168169
&& l.easyrpg_ignore_restrict_skill == r.easyrpg_ignore_restrict_skill
169-
&& l.easyrpg_ignore_restrict_magic == r.easyrpg_ignore_restrict_magic;
170+
&& l.easyrpg_ignore_restrict_magic == r.easyrpg_ignore_restrict_magic
171+
&& l.easyrpg_enable_stat_absorbing == r.easyrpg_enable_stat_absorbing;
170172
}
171173

172174
inline bool operator!=(const Skill& l, const Skill& r) {

src/generated/lcf/rpg/system.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ namespace rpg {
238238
int32_t easyrpg_max_damage = -1;
239239
int32_t easyrpg_max_exp = -1;
240240
int32_t easyrpg_max_level = -1;
241-
bool easyrpg_enable_stat_absorbing = false;
242241
int32_t easyrpg_max_savefiles = 15;
243242
int32_t easyrpg_max_item_count = -1;
244243
int32_t easyrpg_variable_min_value = 0;
@@ -340,7 +339,6 @@ namespace rpg {
340339
&& l.easyrpg_max_damage == r.easyrpg_max_damage
341340
&& l.easyrpg_max_exp == r.easyrpg_max_exp
342341
&& l.easyrpg_max_level == r.easyrpg_max_level
343-
&& l.easyrpg_enable_stat_absorbing == r.easyrpg_enable_stat_absorbing
344342
&& l.easyrpg_max_savefiles == r.easyrpg_max_savefiles
345343
&& l.easyrpg_max_item_count == r.easyrpg_max_item_count
346344
&& l.easyrpg_variable_min_value == r.easyrpg_variable_min_value

src/generated/ldb_skill.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,13 @@ static TypedField<rpg::Skill, bool> static_easyrpg_ignore_restrict_magic(
312312
0,
313313
0
314314
);
315+
static TypedField<rpg::Skill, bool> static_easyrpg_enable_stat_absorbing(
316+
&rpg::Skill::easyrpg_enable_stat_absorbing,
317+
LDB_Reader::ChunkSkill::easyrpg_enable_stat_absorbing,
318+
"easyrpg_enable_stat_absorbing",
319+
0,
320+
0
321+
);
315322

316323

317324
template <>
@@ -358,6 +365,7 @@ Field<rpg::Skill> const* Struct<rpg::Skill>::fields[] = {
358365
&static_easyrpg_attribute_hit,
359366
&static_easyrpg_ignore_restrict_skill,
360367
&static_easyrpg_ignore_restrict_magic,
368+
&static_easyrpg_enable_stat_absorbing,
361369
NULL
362370
};
363371

src/generated/ldb_system.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -466,13 +466,6 @@ static TypedField<rpg::System, int32_t> static_easyrpg_max_level(
466466
0,
467467
0
468468
);
469-
static TypedField<rpg::System, bool> static_easyrpg_enable_stat_absorbing(
470-
&rpg::System::easyrpg_enable_stat_absorbing,
471-
LDB_Reader::ChunkSystem::easyrpg_enable_stat_absorbing,
472-
"easyrpg_enable_stat_absorbing",
473-
0,
474-
0
475-
);
476469
static TypedField<rpg::System, int32_t> static_easyrpg_max_savefiles(
477470
&rpg::System::easyrpg_max_savefiles,
478471
LDB_Reader::ChunkSystem::easyrpg_max_savefiles,
@@ -597,7 +590,6 @@ Field<rpg::System> const* Struct<rpg::System>::fields[] = {
597590
&static_easyrpg_max_damage,
598591
&static_easyrpg_max_exp,
599592
&static_easyrpg_max_level,
600-
&static_easyrpg_enable_stat_absorbing,
601593
&static_easyrpg_max_savefiles,
602594
&static_easyrpg_max_item_count,
603595
&static_easyrpg_variable_min_value,

src/generated/rpg_skill.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ std::ostream& operator<<(std::ostream& os, const Skill& obj) {
7070
os << ", easyrpg_attribute_hit="<< obj.easyrpg_attribute_hit;
7171
os << ", easyrpg_ignore_restrict_skill="<< obj.easyrpg_ignore_restrict_skill;
7272
os << ", easyrpg_ignore_restrict_magic="<< obj.easyrpg_ignore_restrict_magic;
73+
os << ", easyrpg_enable_stat_absorbing="<< obj.easyrpg_enable_stat_absorbing;
7374
os << "}";
7475
return os;
7576
}

src/generated/rpg_system.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ std::ostream& operator<<(std::ostream& os, const System& obj) {
9595
os << ", easyrpg_max_damage="<< obj.easyrpg_max_damage;
9696
os << ", easyrpg_max_exp="<< obj.easyrpg_max_exp;
9797
os << ", easyrpg_max_level="<< obj.easyrpg_max_level;
98-
os << ", easyrpg_enable_stat_absorbing="<< obj.easyrpg_enable_stat_absorbing;
9998
os << ", easyrpg_max_savefiles="<< obj.easyrpg_max_savefiles;
10099
os << ", easyrpg_max_item_count="<< obj.easyrpg_max_item_count;
101100
os << ", easyrpg_variable_min_value="<< obj.easyrpg_variable_min_value;

0 commit comments

Comments
 (0)