Skip to content

add Zero_radius_explosions_skip_fireballs #7113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goober5000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add Zero_radius_explosions_skip_fireballs #7113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion code/asteroid/asteroid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,8 +1607,13 @@ static float asteroid_create_explosion(object *objp)
}

fireball_scale_multiplier = asteroid_get_fireball_scale_multiplier(objp->instance);
auto fireball_radius = objp->radius * fireball_scale_multiplier;

if (Zero_radius_explosions_skip_fireballs && fl_near_zero(fireball_radius))
fireball_objnum = -1;
else
fireball_objnum = fireball_create( &objp->pos, fireball_type, FIREBALL_LARGE_EXPLOSION, OBJ_INDEX(objp), fireball_radius, false, &objp->phys_info.vel );

fireball_objnum = fireball_create( &objp->pos, fireball_type, FIREBALL_LARGE_EXPLOSION, OBJ_INDEX(objp), objp->radius*fireball_scale_multiplier, false, &objp->phys_info.vel );
if ( fireball_objnum > -1 ) {
explosion_life = fireball_lifeleft(&Objects[fireball_objnum]);
} else {
Expand Down
9 changes: 9 additions & 0 deletions code/mod_table/mod_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ bool Show_locked_status_scramble_missions;
bool Disable_expensive_turret_target_check;
float Shield_percent_skips_damage;
float Min_radius_for_persistent_debris;
bool Zero_radius_explosions_skip_fireballs;


#ifdef WITH_DISCORD
Expand Down Expand Up @@ -1638,6 +1639,10 @@ void parse_mod_table(const char *filename)
stuff_float(&Min_radius_for_persistent_debris);
}

if (optional_string("$Zero-radius explosions skip fireballs:")) {
stuff_boolean(&Zero_radius_explosions_skip_fireballs);
}

// end of options ----------------------------------------

// if we've been through once already and are at the same place, force a move
Expand Down Expand Up @@ -1884,6 +1889,7 @@ void mod_table_reset()
Disable_expensive_turret_target_check = false;
Shield_percent_skips_damage = 0.1f;
Min_radius_for_persistent_debris = 50.0f;
Zero_radius_explosions_skip_fireballs = false;
}

void mod_table_set_version_flags()
Expand Down Expand Up @@ -1912,4 +1918,7 @@ void mod_table_set_version_flags()
Disable_expensive_turret_target_check = true;
Skybox_internal_depth_consistency = true;
}
if (mod_supports_version(26, 0, 0)) {
Zero_radius_explosions_skip_fireballs = true;
}
}
1 change: 1 addition & 0 deletions code/mod_table/mod_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ extern bool Show_locked_status_scramble_missions;
extern bool Disable_expensive_turret_target_check;
extern float Shield_percent_skips_damage;
extern float Min_radius_for_persistent_debris;
extern bool Zero_radius_explosions_skip_fireballs;

void mod_table_init();
void mod_table_post_process();
Expand Down
7 changes: 6 additions & 1 deletion code/ship/ship.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9802,7 +9802,12 @@ static void ship_dying_frame(object *objp, int ship_num)
if(fireball_type < 0) {
fireball_type = default_fireball_type;
}
fireball_objnum = fireball_create( &objp->pos, fireball_type, FIREBALL_LARGE_EXPLOSION, OBJ_INDEX(objp), big_rad, false, &objp->phys_info.vel );

if (Zero_radius_explosions_skip_fireballs && fl_near_zero(big_rad))
fireball_objnum = -1;
else
fireball_objnum = fireball_create( &objp->pos, fireball_type, FIREBALL_LARGE_EXPLOSION, OBJ_INDEX(objp), big_rad, false, &objp->phys_info.vel );

if ( fireball_objnum >= 0 ) {
explosion_life = fireball_lifeleft(&Objects[fireball_objnum]);
} else {
Expand Down
Loading