Skip to content

Commit 01553e8

Browse files
committed
Change flag name
1 parent e604585 commit 01553e8

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

data/json/items/armor/exosuit/exosuit_mutations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"id": "exo_heavy_guns",
55
"name": { "str": "Exosuit Heavy Weapons" },
66
"points": 0,
7-
"description": "The active exosuit provides enough strength and stability to fire heavy weapons.",
7+
"description": "The active exosuit provides enough strength and stability to fire some heavy weapons.",
88
"valid": false,
99
"purifiable": false,
1010
"types": [ "Equipment" ],
11-
"flags": "ACTIVE_MECH"
11+
"flags": "ACTIVE_MECH_WEAPON"
1212
}
1313
]

src/flag.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const flag_id flag_ACID_IMMUNE( "ACID_IMMUNE" );
1515
const flag_id flag_ACTIVATE_ON_PLACE( "ACTIVATE_ON_PLACE" );
1616
const flag_id flag_ACTIVE_CLOAKING( "ACTIVE_CLOAKING" );
1717
const flag_id flag_ACTIVE_GENERATOR( "ACTIVE_GENERATOR" );
18-
const flag_id flag_ACTIVE_MECH( "ACTIVE_MECH" );
18+
const flag_id flag_ACTIVE_MECH( "ACTIVE_MECH_WEAPON" );
1919
const flag_id flag_ACT_IN_FIRE( "ACT_IN_FIRE" );
2020
const flag_id flag_ACT_ON_RANGED_HIT( "ACT_ON_RANGED_HIT" );
2121
const flag_id flag_ALARMCLOCK( "ALARMCLOCK" );

src/flag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern const flag_id flag_ACID_IMMUNE;
2222
extern const flag_id flag_ACTIVATE_ON_PLACE;
2323
extern const flag_id flag_ACTIVE_CLOAKING;
2424
extern const flag_id flag_ACTIVE_GENERATOR;
25-
extern const flag_id flag_ACTIVE_MECH;
25+
extern const flag_id flag_ACTIVE_MECH_WEAPON;
2626
extern const flag_id flag_ACT_IN_FIRE;
2727
extern const flag_id flag_ACT_ON_RANGED_HIT;
2828
extern const flag_id flag_ALARMCLOCK;

src/ranged.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4258,7 +4258,7 @@ bool gunmode_checks_weapon( avatar &you, const map &m, std::vector<std::string>
42584258
const bool v_mountable = static_cast<bool>( m.veh_at(
42594259
you.pos_bub() ).part_with_feature( "MOUNTABLE",
42604260
true ) &&
4261-
!u.has_trait("ACTIVE_MECH") );
4261+
!u.has_trait("ACTIVE_MECH_WEAPON") );
42624262
bool t_mountable = m.has_flag_ter_or_furn( ter_furn_flag::TFLAG_MOUNTABLE, you.pos_bub() );
42634263
if( !t_mountable && !v_mountable ) {
42644264
messages.push_back( string_format(
@@ -4270,3 +4270,4 @@ bool gunmode_checks_weapon( avatar &you, const map &m, std::vector<std::string>
42704270

42714271
return result;
42724272
}
4273+
F

0 commit comments

Comments
 (0)