X Tutup
Skip to content

Police patrol improvement#5809

Merged
sturnclaw merged 2 commits intopioneerspacesim:masterfrom
robothauler:police_patrol
Aug 14, 2024
Merged

Police patrol improvement#5809
sturnclaw merged 2 commits intopioneerspacesim:masterfrom
robothauler:police_patrol

Conversation

@robothauler
Copy link
Contributor

Not entirely perfect. But an improvement.
Fixes #5603
It does not solve the police apathy problem described in #5202

@impaktor
Copy link
Member

impaktor commented Apr 5, 2024

If we aim to do one last "bug fix release" then this would be merged after that. So far, there's just been one bug fix merged since the 3.14 release.

Copy link
Member

@sturnclaw sturnclaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for tackling this issue! I have a few concerns / changes regarding the comms messages presented to the player, but overall I think this is a very useful change.

if ship:DistanceTo(patrol[i]) <= 4000000 then
Comms.ImportantMessage(string.interp(l_ui_core.X_CANNOT_BE_TOLERATED_HERE, { crime = l_ui_core.PIRACY }, patrol[i].label))
if ship:DistanceTo(patrol[i]) <= lawEnforcedRange then
Comms.ImportantMessage(string.interp(l_ui_core.X_CANNOT_BE_TOLERATED_HERE, { crime = l_ui_core.UNLAWFUL_WEAPONS_DISCHARGE }, patrol[i].label))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for future reference that string.interp(l.SOME_STRING, { crime = ... }) is also available via a custom operator as l.SOME_STRING % { crime = ... }. You don't need to amend this PR to prefer the use of either one however.

Copy link
Member

@sturnclaw sturnclaw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The updated code looks good to me! Provisionally approved pending playtesting from myself or another contributor.

@sturnclaw sturnclaw merged commit 4ef9b91 into pioneerspacesim:master Aug 14, 2024
@robothauler robothauler deleted the police_patrol branch August 14, 2024 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Police Issues

3 participants

X Tutup