Skip to content

Commit 513c80e

Browse files
author
rueter37
committed
Change system option 201 to "Battle options"
The system option 201 has been changed from "Enable auto battle" to "Battle options".
1 parent 3c45da9 commit 513c80e

5 files changed

Lines changed: 15 additions & 11 deletions

File tree

generator/csv/fields_easyrpg.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Terms,easyrpg_battle2k3_special_combat_back,f,DBString,0xD9,,0,1,Message for bac
4343
Terms,easyrpg_battle2k3_skill,f,DBString,0xDA,DBString(kDefaultTerm),0,1,RPG Maker 2003 battle general skill start notification
4444
Terms,easyrpg_battle2k3_item,f,DBString,0xDB,DBString(kDefaultTerm),0,1,RPG Maker 2003 battle general item start notification
4545
System,easyrpg_alternative_exp,f,Int32,0xC8,0,0,0,Which EXP formula to use: 0=Default 1=2k 2=2k3
46-
System,easyrpg_enable_auto_battle,f,Boolean,0xC9,True,0,0,If auto battling should be allowed
46+
System,easyrpg_battle_options,f,Vector<Int16>,0xC9,"[0,1,2]",0,0,Available battle options where 0=Battle 1=AutoBattle 2=Escape
4747
System,easyrpg_max_actor_hp,f,Int32,0xCA,-1,0,0,Absolute maximum HP value actors can have
4848
System,easyrpg_max_enemy_hp,f,Int32,0xCB,-1,0,0,Absolute maximum HP value enemies can have
4949
System,easyrpg_max_damage,f,Int32,0xCC,-1,0,0,How much damage can an attack inflict at most

src/generated/lcf/ldb/chunks.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,8 +1358,8 @@ namespace LDB_Reader {
13581358
show_title = 0x6F,
13591359
/** Which EXP formula to use: 0=Default 1=2k 2=2k3 */
13601360
easyrpg_alternative_exp = 0xC8,
1361-
/** If auto battling should be allowed */
1362-
easyrpg_enable_auto_battle = 0xC9,
1361+
/** Available battle options where 0=Battle 1=AutoBattle 2=Escape */
1362+
easyrpg_battle_options = 0xC9,
13631363
/** Absolute maximum HP value actors can have */
13641364
easyrpg_max_actor_hp = 0xCA,
13651365
/** Absolute maximum HP value enemies can have */

src/generated/lcf/rpg/system.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ namespace rpg {
232232
bool invert_animations = false;
233233
bool show_title = true;
234234
int32_t easyrpg_alternative_exp = 0;
235-
bool easyrpg_enable_auto_battle = true;
235+
std::vector<int16_t> easyrpg_battle_options = {0, 1, 2};
236236
int32_t easyrpg_max_actor_hp = -1;
237237
int32_t easyrpg_max_enemy_hp = -1;
238238
int32_t easyrpg_max_damage = -1;
@@ -334,7 +334,7 @@ namespace rpg {
334334
&& l.invert_animations == r.invert_animations
335335
&& l.show_title == r.show_title
336336
&& l.easyrpg_alternative_exp == r.easyrpg_alternative_exp
337-
&& l.easyrpg_enable_auto_battle == r.easyrpg_enable_auto_battle
337+
&& l.easyrpg_battle_options == r.easyrpg_battle_options
338338
&& l.easyrpg_max_actor_hp == r.easyrpg_max_actor_hp
339339
&& l.easyrpg_max_enemy_hp == r.easyrpg_max_enemy_hp
340340
&& l.easyrpg_max_damage == r.easyrpg_max_damage

src/generated/ldb_system.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,10 @@ static TypedField<rpg::System, int32_t> static_easyrpg_alternative_exp(
424424
0,
425425
0
426426
);
427-
static TypedField<rpg::System, bool> static_easyrpg_enable_auto_battle(
428-
&rpg::System::easyrpg_enable_auto_battle,
429-
LDB_Reader::ChunkSystem::easyrpg_enable_auto_battle,
430-
"easyrpg_enable_auto_battle",
427+
static TypedField<rpg::System, std::vector<int16_t>> static_easyrpg_battle_options(
428+
&rpg::System::easyrpg_battle_options,
429+
LDB_Reader::ChunkSystem::easyrpg_battle_options,
430+
"easyrpg_battle_options",
431431
0,
432432
0
433433
);
@@ -591,7 +591,7 @@ Field<rpg::System> const* Struct<rpg::System>::fields[] = {
591591
&static_invert_animations,
592592
&static_show_title,
593593
&static_easyrpg_alternative_exp,
594-
&static_easyrpg_enable_auto_battle,
594+
&static_easyrpg_battle_options,
595595
&static_easyrpg_max_actor_hp,
596596
&static_easyrpg_max_enemy_hp,
597597
&static_easyrpg_max_damage,

src/generated/rpg_system.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ std::ostream& operator<<(std::ostream& os, const System& obj) {
8585
os << ", invert_animations="<< obj.invert_animations;
8686
os << ", show_title="<< obj.show_title;
8787
os << ", easyrpg_alternative_exp="<< obj.easyrpg_alternative_exp;
88-
os << ", easyrpg_enable_auto_battle="<< obj.easyrpg_enable_auto_battle;
88+
os << ", easyrpg_battle_options=";
89+
for (size_t i = 0; i < obj.easyrpg_battle_options.size(); ++i) {
90+
os << (i == 0 ? "[" : ", ") << obj.easyrpg_battle_options[i];
91+
}
92+
os << "]";
8993
os << ", easyrpg_max_actor_hp="<< obj.easyrpg_max_actor_hp;
9094
os << ", easyrpg_max_enemy_hp="<< obj.easyrpg_max_enemy_hp;
9195
os << ", easyrpg_max_damage="<< obj.easyrpg_max_damage;

0 commit comments

Comments
 (0)