Misc fixes for explosions and radio activation #1326

olanti-p · 2022-02-09T13:46:33Z

Purpose of change

Fix explosions within vehicles causing segfault (fixes Crash when mininuke-ing inside of APC #175)
Fix active explosives within monsters not exploding (e.g. when technician pulls an active grenade)
Fix radio activation mod having infinite uses
Fix items with RADIO_ACTIVATION flag not actually being activated (fixes radio activation mod problem #1276)
Fix active mininuke timer getting reset to 0 on save/load
Fix resonance cascade doing nothing
Allow RC control to choose which rc car to control, instead of selecting semi-randomly
Allow RC control signal to activate items within vehicles or creatures' inventories
Allow RC control signal to activate items on all z-levels, remove max range of 30
Make radio activation mod easier to craft by allowing more battery variants as components

Describe the solution

Defer explosions, to avoid modifying data while iterating. This also makes it possible to explode items within monsters inventories. Idea from game: defer explosions CleverRaven/Cataclysm-DDA#45693
Add code for processing items within monster's inventories
Revert item type to TOOL
Invoke iuse function if item has RADIO_ACTIVATION flag, make RADIO_INVOKE_PROC flag set charges of resulting item to 0, so that the next iuse (e.g. explosion) will be invoked when item is processed on next turn.
Add arbitrary max_charges to the mininuke
Fix iterating over area. It seems that the code has not been updated since Whales wrote it, as it still assumes the reality bubble is 3x3 submaps large.
Get rid of spaghetti and instead iterate over current z-level looking for items with RADIO_CONTROLLED flag
Visit all items on map, in vehicles, in monsters and in Characters and check for relevant flags
Iterate over all tiles within all active z-levels
Add more battery variants as crafting components (cherry-picked from Radio activation mod improvements CleverRaven/Cataclysm-DDA#54213)

Testing

Mostly for the exact scenarios described in the bugreports and bug descriptions.

Additional context

Explosions seem to semi-reliably produce vehicles that have 0 as their cached mass, which results in division by zero and debugmsg informing player of "vehicle with negative drag".

Night-Pryanik · 2022-02-09T14:05:19Z

You could also look through CleverRaven/Cataclysm-DDA#54213, CleverRaven/Cataclysm-DDA#45661, CleverRaven/Cataclysm-DDA#47066, or CleverRaven/Cataclysm-DDA#47192 to see if there's anything you could salvage.

- Switch explosion_queue to use std::deque - Remove limit on radio activation range - Activate items on all z-levels - Fix GCC build - Satisfy tidy

(cherry picked from commit 581e87c190d93ccb30dc301286f84603dc7acdee)

olanti-p · 2022-02-09T16:06:46Z

You could also look through ... to see if there's anything you could salvage.

Thanks for the tip!

CleverRaven/Cataclysm-DDA#54213

Cherry-picked crafting changes, the rest I don't think applies.
Unlimited signal reach sounds fun though, I removed max range and z-level restrictions, let's see how it plays out.

CleverRaven/Cataclysm-DDA#45661

Already covered by this PR.

CleverRaven/Cataclysm-DDA#47066

Don't know what to think about this, I kinda like how technicians "swallow" items and force you to kill them.
Out of scope of this PR anyway.

CleverRaven/Cataclysm-DDA#47192

Also out of scope, but looks neat, will throw on the to-do list.

Coolthulhu · 2022-02-11T09:54:41Z

src/explosion.cpp

@@ -807,6 +859,37 @@ float blast_radius_from_legacy( int power, float distance_factor )
           ( std::log( 0.75f ) / std::log( distance_factor ) );
 }

+explosion_queue &get_explosion_queue()
+{
+    static explosion_queue singleton;


Would be nicer if it was in game or some other tracker instead of the anti-pattern thing.
Now, game is a god class, but the number of anti-patterns would remain the same instead of being +1'd.

Yeah, game would've been a better place for this, but that haven't crossed my mind back then.

Coolthulhu · 2022-02-11T10:03:32Z

src/monster.cpp

+    process_item_valptr( armor_item, *this );
+    process_item_valptr( tack_item, *this );
+    process_item_valptr( tied_item, *this );
+}


Why is it not just using visit to go through all the items?

Item processing can result in item being destroyed. visit_items does not allow erasing while visiting, and remove_items_with does not allow modifying (processing) items while visiting and optionally erasing.

It'd either require storing item references, and then erasing them in a separate pass while keeping track of erasure order (because inv is std::vector), or extending visitable with a new method and implementing it for all visitable classes, and this PR already felt overbloated.

Coolthulhu · 2022-02-11T10:05:32Z

src/explosion_queue.h

+    Flashbang,
+    ResonanceCascade,
+    Shockwave
+};


Not snake_cased

Argh, I did it again

Coolthulhu · 2022-02-11T10:07:58Z

All the issues I have with it are minor enough. It would be nice if they were fixed, but there's no rush.
Our game is a de-facto singleton, so extracting the queue into it would not help much right now, as we don't have "game-less" tests up yet.

olanti-p added 13 commits February 9, 2022 16:16

More methods for converting Creature to child classes

e1156e3

Implement visitable for monster

4d5e1a0

Process items in monsters' inventories

b16df81

Fix and expand radio activation

0af7d3f

Simplify shockwave() interface

4be7346

Move draw_explosion declaration to animation.h

256937f

Defer explosions

56d9f80

Fix resonance cascade

cdb3dd4

Fix radio activation mod not consumed when applied

cb4d4f1

Simplify warning for bombs in inventory on radio activation

9c40264

Rework how radio cars are kept track of

b87730c

Update docs

193ef73

Fix mininuke timer save/load

5fd8c7c

olanti-p and others added 2 commits February 9, 2022 19:03

Finishing touches

0978994

- Switch explosion_queue to use std::deque - Remove limit on radio activation range - Activate items on all z-levels - Fix GCC build - Satisfy tidy

Allow using batteries other than the rare ultra-light to craft radio mod

7f0ff74

(cherry picked from commit 581e87c190d93ccb30dc301286f84603dc7acdee)

Coolthulhu self-assigned this Feb 10, 2022

Coolthulhu reviewed Feb 11, 2022

View reviewed changes

Coolthulhu merged commit 7e53d01 into cataclysmbnteam:upload Feb 11, 2022

olanti-p deleted the misc-explosion-fixes branch February 13, 2022 13:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Misc fixes for explosions and radio activation #1326

Misc fixes for explosions and radio activation #1326

olanti-p commented Feb 9, 2022 •

edited

Loading

Night-Pryanik commented Feb 9, 2022

olanti-p commented Feb 9, 2022

Coolthulhu Feb 11, 2022

olanti-p Feb 13, 2022

Coolthulhu Feb 11, 2022

olanti-p Feb 13, 2022

Coolthulhu Feb 11, 2022

olanti-p Feb 13, 2022

Coolthulhu commented Feb 11, 2022

Misc fixes for explosions and radio activation #1326

Misc fixes for explosions and radio activation #1326

Conversation

olanti-p commented Feb 9, 2022 • edited Loading

Purpose of change

Describe the solution

Testing

Additional context

Night-Pryanik commented Feb 9, 2022

olanti-p commented Feb 9, 2022

Coolthulhu Feb 11, 2022

Choose a reason for hiding this comment

olanti-p Feb 13, 2022

Choose a reason for hiding this comment

Coolthulhu Feb 11, 2022

Choose a reason for hiding this comment

olanti-p Feb 13, 2022

Choose a reason for hiding this comment

Coolthulhu Feb 11, 2022

Choose a reason for hiding this comment

olanti-p Feb 13, 2022

Choose a reason for hiding this comment

Coolthulhu commented Feb 11, 2022

olanti-p commented Feb 9, 2022 •

edited

Loading