Skip to content

Commit

Permalink
Merge pull request #23544 from BevapDin/lye
Browse files Browse the repository at this point in the history 
Change fields to use time_duration as their age
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Apr 21, 2018
2 parents 3a21a24 + b8b63d3 commit f275932
Show file tree
Hide file tree
Showing 24 changed files with 269 additions and 282 deletions.
18 changes: 9 additions & 9 deletions lua/class_definitions.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1102,14 +1102,14 @@ classes = {
attributes = {
},
functions = {
{ name = "getFieldAge", rval = "int", args = { } },
{ name = "getFieldAge", rval = "time_duration", args = { } },
{ name = "getFieldDensity", rval = "int", args = { } },
{ name = "getFieldType", rval = "field_id", args = { } },
{ name = "isAlive", rval = "bool", args = { } },
{ name = "is_dangerous", rval = "bool", args = { } },
{ name = "move_cost", rval = "int", args = { } },
{ name = "name", rval = "string", args = { } },
{ name = "setFieldAge", rval = "int", args = { "int" } },
{ name = "setFieldAge", rval = "time_duration", args = { "time_duration" } },
{ name = "setFieldDensity", rval = "int", args = { "int" } },
{ name = "setFieldType", rval = "field_id", args = { "field_id" } },
}
Expand All @@ -1120,7 +1120,7 @@ classes = {
functions = {
{ name = "addField", rval = "bool", args = { "field_id" } },
{ name = "addField", rval = "bool", args = { "field_id", "int" } },
{ name = "addField", rval = "bool", args = { "field_id", "int", "int" } },
{ name = "addField", rval = "bool", args = { "field_id", "int", "time_duration" } },
{ name = "fieldCount", rval = "int", args = { } },
{ name = "fieldSymbol", rval = "field_id", args = { } },
{ name = "findField", rval = "field_entry&", args = { "field_id" } },
Expand All @@ -1137,7 +1137,7 @@ classes = {
{ name = "accessible_items", rval = "bool", args = { "tripoint", "tripoint", "int" } },
{ name = "add_camp", rval = nil, args = { "tripoint", "string" } },
{ name = "add_corpse", rval = nil, args = { "tripoint" } },
{ name = "add_field", rval = "bool", args = { "tripoint", "field_id", "int", "int" } },
{ name = "add_field", rval = "bool", args = { "tripoint", "field_id", "int", "time_duration" } },
{ name = "add_item", rval = "item&", args = { "tripoint", "item" } },
{ name = "add_item_or_charges", rval = "item&", args = { "tripoint", "item" } },
{ name = "add_item_or_charges", rval = "item&", args = { "tripoint", "item", "bool" } },
Expand All @@ -1146,7 +1146,7 @@ classes = {
{ name = "add_spawn", rval = nil, args = { "mtype_id", "int", "int", "int", "bool", "int" } },
{ name = "add_spawn", rval = nil, args = { "mtype_id", "int", "int", "int", "bool", "int", "int" } },
{ name = "add_spawn", rval = nil, args = { "mtype_id", "int", "int", "int", "bool", "int", "int", "string" } },
{ name = "adjust_field_age", rval = "int", args = { "tripoint", "field_id", "int" } },
{ name = "adjust_field_age", rval = "time_duration", args = { "tripoint", "field_id", "time_duration" } },
{ name = "adjust_field_strength", rval = "int", args = { "tripoint", "field_id", "int" } },
{ name = "adjust_radiation", rval = nil, args = { "tripoint", "int" } },
{ name = "allow_camp", rval = "bool", args = { "tripoint", "int" } },
Expand Down Expand Up @@ -1175,7 +1175,7 @@ classes = {
{ name = "creature_on_trap", rval = nil, args = { "Creature" } },
{ name = "creature_on_trap", rval = nil, args = { "Creature", "bool" } },
{ name = "crush", rval = nil, args = { "tripoint" } },
{ name = "decay_fields_and_scent", rval = nil, args = { "int" } },
{ name = "decay_fields_and_scent", rval = nil, args = { "time_duration" } },
{ name = "delete_graffiti", rval = nil, args = { "tripoint" } },
{ name = "delete_signage", rval = nil, args = { "tripoint" } },
{ name = "destroy", rval = nil, args = { "tripoint" } },
Expand Down Expand Up @@ -1215,7 +1215,7 @@ classes = {
{ name = "furnname", rval = "string", args = { "tripoint" } },
{ name = "get_abs_sub", rval = "tripoint", args = { } },
{ name = "get_field", rval = "field_entry&", args = { "tripoint", "field_id" } },
{ name = "get_field_age", rval = "int", args = { "tripoint", "field_id" } },
{ name = "get_field_age", rval = "time_duration", args = { "tripoint", "field_id" } },
{ name = "get_field_strength", rval = "int", args = { "tripoint", "field_id" } },
{ name = "get_radiation", rval = "int", args = { "tripoint" } },
{ name = "get_signage", rval = "string", args = { "tripoint" } },
Expand Down Expand Up @@ -1290,8 +1290,8 @@ classes = {
{ name = "save", rval = nil, args = { } },
{ name = "sees", rval = "bool", args = { "tripoint", "tripoint", "int" } },
{ name = "sees_some_items", rval = "bool", args = { "tripoint", "Creature" } },
{ name = "set_field_age", rval = "int", args = { "tripoint", "field_id", "int" } },
{ name = "set_field_age", rval = "int", args = { "tripoint", "field_id", "int", "bool" } },
{ name = "set_field_age", rval = "time_duration", args = { "tripoint", "field_id", "time_duration" } },
{ name = "set_field_age", rval = "time_duration", args = { "tripoint", "field_id", "time_duration", "bool" } },
{ name = "set_field_strength", rval = "int", args = { "tripoint", "field_id", "int" } },
{ name = "set_field_strength", rval = "int", args = { "tripoint", "field_id", "int", "bool" } },
{ name = "set_graffiti", rval = nil, args = { "tripoint", "string" } },
Expand Down
2 changes: 1 addition & 1 deletion src/bionics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ bool player::activate_bionic( int b, bool eff_only )
g->refresh_all();
tripoint dirp;
if( choose_adjacent( _( "Start a fire where?" ), dirp ) &&
g->m.add_field( dirp, fd_fire, 1, 0 ) ) {
g->m.add_field( dirp, fd_fire, 1 ) ) {
mod_moves( -100 );
} else {
add_msg_if_player( m_info, _( "You can't light a fire there." ) );
Expand Down
2 changes: 1 addition & 1 deletion src/computer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ void computer::activate_function( computer_action action )
for(int j = g->u.posy() + 3; j < g->u.posy() + 12; j++)
if(!one_in(4)) {
tripoint dest( i + rng(-2, 2), j + rng(-2, 2), g->u.posz() );
g->m.add_field( dest, fd_smoke, rng(1, 9), 0 );
g->m.add_field( dest, fd_smoke, rng( 1, 9 ) );
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/editmap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ void editmap::update_view( bool update_info )
mvwprintz( w_info, off, 1, cur.color(),
_( "field: %s (%d) density %d age %d" ),
cur.name().c_str(), cur.getFieldType(),
cur.getFieldDensity(), cur.getFieldAge()
cur.getFieldDensity(), to_turns<int>( cur.getFieldAge() )
);
off++; // 5ish
}
Expand Down Expand Up @@ -1159,7 +1159,7 @@ int editmap::edit_fld()
if( t_dens != 0 ) {
g->m.set_field_strength( elem, fid, fsel_dens );
} else {
g->m.add_field( elem, fid, fsel_dens, 0 );
g->m.add_field( elem, fid, fsel_dens );
}
} else {
if( t_dens != 0 ) {
Expand Down
2 changes: 1 addition & 1 deletion src/explosion.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ void game::do_blast( const tripoint &p, const float power,
density++;
}

m.add_field( pt, fd_fire, density, 0 );
m.add_field( pt, fd_fire, density );
}

int vpart;
Expand Down
Loading

0 comments on commit f275932

Please sign in to comment.