Changes supporting falling actions #1848

mugmuggy · 2021-04-05T22:59:43Z

Fixes #476

Describe what the proposed change does

Corrects animations for Female patient (this probably doesn't work if they are a Stripped version at the time)
Fixes the must happen to be in the constructor, otherwise any setNextAction calls will remove them
Patients randomly choose a fall direction then that direction doesn't change, the random would have them fall one way, lay another and then stand up again in another
Queues the actions more correctly for falling

I didn't activate the falling code in world, so these don't actually initiate anything but can be used for testing.

Doesn't as pointed out in the discussion #1846 attempt to address the issue of interrupted actions being incorrectly requeued for example, walking to room that is destroyed at the same time the fall action starts, which would requeue the interrupted walk to that room.

I had put a has_interrupted flag on the action and detected it as not to requeue, but not all interruptions are driven through setNextAction (interrupt_head in queue for example) and I think the other issue was actions like the walk which starts and does something, sets the interrupt handler, which means the action starts, rather than a todo_interrupt being detected to basically skip the action in the action start (seek_toilets_action_start for example and this is same issue with teleporting the drinks machine or jumping to/from bench when queue actions are interrupted as use_object also must start)

lewri · 2021-04-06T10:12:29Z

Iirc patients can't fall inside rooms. So think you should be fine unless females are stripping around the hospital

lewri

Maybe out of scope a little but falling's line 28 should be a colon and not a full stop (I think)

i.e. this line needs correcting

self.setMustHappen(true)

mugmuggy · 2021-04-06T21:15:35Z

Forgot to copy that one across. The Stripped Female Patients won't get the updated on_ground animation in the afterload, so once they become normal ones, they will be restored with the old one, also if they transition from Standard to Stripped then back to Standard. Obviously not a problem on new saves.

lewri · 2021-05-09T09:59:42Z

@mugmuggy May need to be it's own issue but it looks like some recent update means triggering falls in earthquakes is causing the adviser to repeatedly saying the "These people are ill" "How would you like it" etc. when the falling is on.

lewri · 2021-08-10T20:59:47Z

I think we lost the GitHub logs on this one, if you wanted to try and regenerate them.

CorsixTH/Lua/entities/humanoids/patient.lua

Alberth289346 · 2022-01-02T07:49:15Z

Looks good to me, except for the problem spotted by Lewri. My suggestion is just further improvement of the code while you are at it.

CorsixTH/Lua/entities/humanoids/patient.lua

lewri · 2022-06-07T21:24:19Z

Patients randomly choose a fall direction then that direction doesn't change, the random would have them fall one way, lay another and then stand up again in another

Unfortunately I don't think this one is true. I'm still see this even with your changes.

mugmuggy · 2022-06-08T22:24:07Z

Patients randomly choose a fall direction then that direction doesn't change, the random would have them fall one way, lay another and then stand up again in another

Unfortunately I don't think this one is true. I'm still see this even with your changes.
Specifically this is the on_ground/get_up where it could change direction whilst on the ground. They still fall in a random direction, but don't flop around on the ground.

lewri · 2022-06-09T20:10:08Z

Patients randomly choose a fall direction then that direction doesn't change, the random would have them fall one way, lay another and then stand up again in another

Unfortunately I don't think this one is true. I'm still see this even with your changes.
Specifically this is the on_ground/get_up where it could change direction whilst on the ground. They still fall in a random direction, but don't flop around on the ground.

Hmm. I've attached a webm here showing what's happening still.

screen-recording.3.mp4

CorsixTH/Lua/entities/humanoids/patient.lua

Alberth289346 · 2024-05-26T12:15:37Z

CorsixTH/Lua/entities/humanoids/patient.lua

  else
    return


Invert the condition so the return can be done immediately after deciding it's not happening.

if not self.falling_anim or not self:canPeeOrPuke(current) or not self.has_fallen == 1 then return end?

Since the function ends there as well, just delete the "else return" instead?

Instead of your long condition, you can break it into 3 parts, and bail out as soon as one fails.

An unsure why it needs a "pee or puke" function. Probably it was re-used without adapting the name.

I think there's 3 options listed now. Which one is the preferred one here? 😅

An unsure why it needs a "pee or puke" function. Probably it was re-used without adapting the name.

Very old code :) df84d21

Which one is the preferred one here?

Hmm, you're asking such difficult questions :)
I'd probably go for deleting the else return, as it's not doing anything useful.

Very old code :)

Point is that it's being used for something else than pee or puke. The name of the function doesn't cover all it's purposes anymore. You can extend it with the new purpose, but maybe a more general name is better.? I pondered about a name and came up with atFreeTile or atOpenTile. Not sure these are good names though.

The function checks more than tiles, it has 3 steps:

Is the current action interruptible?

Does the patient have going home status?

Finally check if the current tile is buildable, owned, and in a hospital

It's likely the extend name option is going to be the easiest here; can't think of a good general name either.

I am fine with extending the name.

Good point, so perhaps this is not just 1 function, it's 2 or 3 functions mixed into one?
The first 2 steps seem related to the question "is it possible and does it make sense to insert a new action in the queue?", while the 3rd step seems about an empty tile (which probably should be abstracted into an isAtEmptyTile function, but that is out of scope here).

I am not sure about the "inHospital" check for the current usage of this function. For pee and puke it makes sense, since a handyman needs to cleanup the mess, but falling doesn't need to be cleaned. Not a serious problem though, falling patients at the middle of some road are never seen anyway.
If you want to fix things in that function, doing that in a separate patch is likely the better idea, imho.

Alberth289346 · 2024-05-26T12:21:33Z

Not sure why it needs a new section in the config file. Can't we have another setting in the "debug" settings section? May somewhat depend on the public though.

lewri · 2024-05-26T20:01:31Z

Not sure why it needs a new section in the config file. Can't we have another setting in the "debug" settings section? May somewhat depend on the public though.

As an example, for soundfont override on fluidsynth builds we don't give any indicators the setting config.soundfont exists. We could do that here too. Though I'm not keen on some magic undocumented flag either.

Alberth289346

Not sure how good it is exactly, but let's find out :)

CorsixTH/Lua/app.lua

lewri · 2024-07-20T18:58:11Z

Everything should be cleared up now and ready. I also made this a debug menu item for easier toggling,

Edit: appveyor can be ignored it can't get the lua source for some reason right now but it is accessible.

TheCycoONE · 2024-07-21T20:54:11Z

LGTM too

CorsixTH/Lua/world.lua

- Allow players to push people over when right clicking on them - Only announce a fall if the player pushed them over - Change falling to a debug setting, defaulted to false. - Fixes falling:28 - Renames canPeeOrPuke to canPeePukeOrFall - Adds falling as a debug menu item

lewri · 2024-07-28T10:05:04Z

CorsixTH/Lua/earthquake.lua

+  for _, patient in ipairs(hospital.patients) do
+    if not patient.in_room and patient.falling_anim then
+      patient:falling(false)


Should there be a probability roll here?

Hmm, "tick" function eh? Should be a very low probability if you want to notice any of a delay, I guess.

Quick falling is perhaps more useful for testing?

Looks like it's every quake tick (which different from a regular tick), which in essence is a damage cycle completed.

Potentially its fine for now. If a patient can't fall at one part of the quake they may move and be able to later on. I think if it becomes too uniform then we can adjust later

I agree :) First make it work at all before starting to fine-tune it :)

lewri reviewed Apr 6, 2021

View reviewed changes

Alberth289346 reviewed Jan 2, 2022

View reviewed changes

CorsixTH/Lua/entities/humanoids/patient.lua Outdated Show resolved Hide resolved

lewri reviewed Jun 7, 2022

View reviewed changes

CorsixTH/Lua/entities/humanoids/patient.lua Outdated Show resolved Hide resolved

lewri mentioned this pull request Jun 7, 2022

Announce fall only when player initiated #2186

Closed

lewri added the PR:need-rebase label Oct 19, 2022

lewri removed the PR:need-rebase label Jan 27, 2024

lewri force-pushed the fixfalling branch from 2b3c84e to e15d50e Compare January 29, 2024 19:31

lewri force-pushed the fixfalling branch 5 times, most recently from 89cae9e to 8ed9c0b Compare February 7, 2024 21:01

lewri reviewed Feb 7, 2024

View reviewed changes

CorsixTH/Lua/entities/humanoids/patient.lua Outdated Show resolved Hide resolved

lewri force-pushed the fixfalling branch 2 times, most recently from 2e5c6fe to efa9195 Compare February 28, 2024 19:19

Alberth289346 reviewed May 26, 2024

View reviewed changes

Alberth289346 approved these changes Jul 20, 2024

View reviewed changes

lewri force-pushed the fixfalling branch from efa9195 to 86a273f Compare July 20, 2024 17:04

lewri reviewed Jul 20, 2024

View reviewed changes

CorsixTH/Lua/app.lua Outdated Show resolved Hide resolved

lewri force-pushed the fixfalling branch from 86a273f to 8459b2d Compare July 20, 2024 18:52

lewri changed the title ~~[WIP] Changes supporting falling actions~~ Changes supporting falling actions Jul 20, 2024

lewri added the PR:Improvement label Jul 20, 2024

lewri reviewed Jul 26, 2024

View reviewed changes

CorsixTH/Lua/world.lua Outdated Show resolved Hide resolved

mugmuggy and others added 2 commits July 27, 2024 15:39

Changes supporting falling actions

e43569a

lewri force-pushed the fixfalling branch from 8459b2d to 39b968f Compare July 27, 2024 14:41

lewri reviewed Jul 28, 2024

View reviewed changes

lewri merged commit cc949b7 into CorsixTH:master Aug 4, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes supporting falling actions #1848

Changes supporting falling actions #1848

mugmuggy commented Apr 5, 2021 •

edited

Loading

lewri commented Apr 6, 2021

lewri left a comment •

edited

Loading

mugmuggy commented Apr 6, 2021

lewri commented May 9, 2021 •

edited

Loading

lewri commented Aug 10, 2021

Alberth289346 commented Jan 2, 2022

lewri commented Jun 7, 2022

mugmuggy commented Jun 8, 2022

lewri commented Jun 9, 2022

Alberth289346 May 26, 2024

lewri Jul 10, 2024 •

edited

Loading

Alberth289346 Jul 13, 2024

Alberth289346 Jul 13, 2024

Alberth289346 Jul 13, 2024

lewri Jul 13, 2024 •

edited

Loading

Alberth289346 Jul 13, 2024

lewri Jul 17, 2024

Alberth289346 Jul 20, 2024

Alberth289346 commented May 26, 2024

lewri commented May 26, 2024

Alberth289346 left a comment

lewri commented Jul 20, 2024 •

edited

Loading

TheCycoONE commented Jul 21, 2024

lewri Jul 28, 2024

Alberth289346 Jul 30, 2024

lewri Jul 30, 2024

Alberth289346 Jul 31, 2024

Changes supporting falling actions #1848

Changes supporting falling actions #1848

Conversation

mugmuggy commented Apr 5, 2021 • edited Loading

lewri commented Apr 6, 2021

lewri left a comment • edited Loading

Choose a reason for hiding this comment

mugmuggy commented Apr 6, 2021

lewri commented May 9, 2021 • edited Loading

lewri commented Aug 10, 2021

Alberth289346 commented Jan 2, 2022

lewri commented Jun 7, 2022

mugmuggy commented Jun 8, 2022

lewri commented Jun 9, 2022

Choose a reason for hiding this comment

lewri Jul 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lewri Jul 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Alberth289346 commented May 26, 2024

lewri commented May 26, 2024

Alberth289346 left a comment

Choose a reason for hiding this comment

lewri commented Jul 20, 2024 • edited Loading

TheCycoONE commented Jul 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mugmuggy commented Apr 5, 2021 •

edited

Loading

lewri left a comment •

edited

Loading

lewri commented May 9, 2021 •

edited

Loading

lewri Jul 10, 2024 •

edited

Loading

lewri Jul 13, 2024 •

edited

Loading

lewri commented Jul 20, 2024 •

edited

Loading