Fining Revamp - getting scanned with illegal cargo gets you a new hail panel + more #6376

quyykk · 2021-11-28T17:08:29Z

Feature Details

This PR introduces the following features:

Fines now stack.
If you're in space and a ship scanned you and found illegal cargo, you'll have several options like fleeing, paying the fine, or trying to bribe the ship.
A new attribute for governments to specify the percentage of a fine it accepts as bribe ("bribe factor")
A new attribute for custom text when a governments finds that you have illegal stuff and if they can be bribed.

UI Screenshots

Usage Examples

government Gov
    "bribe factor" <val#>       # Percentage of fine that this gov wants as bribe. Defaults to 0.
    "interdiction" <msg>        # Custom message shown when this gov find illegal stuff in space.
    "interdiction bribe" <msg>  # Custom message shown if this gov can be bribed.

Testing Done

Tested getting fined in space with various illegal outfits and cargo.

Performance Impact

Negligible.

Ferociousfeind · 2022-04-25T20:03:21Z

Quick thought(s)-
(also, poor merge conflicts)
any chance we could get the ability to surrender some of our cargo, instead of all of it? Assuming that, when prompted, you would dump only the illegal stuff. I would imagine once you click "surrender cargo" you get the extra options- dump all, dump illegal, and dump some or similar.

I'm very excited for government-specific legalities getting into the game ASAP, it would open up lots of opportunities for strict regions or apathy in law.

quyykk · 2022-04-25T20:06:21Z

any chance we could get the ability to surrender some of our cargo, instead of all of it?

You're only surrendering your illegal cargo. I don't really see a reason for the player to choose to surrender everything though.

Ferociousfeind · 2022-04-25T20:23:28Z

shrug
It may be standard practice to dump all your cargo. But, in that case, let me slightly amend my request-

Would it be possible to, when confronted by authorities, give the player the option to refuse surrender, or surrender all their illegal cargo, or surrender only a portion of their illegal cargo? A way to still make a buck, if the coppers don't realize you aren't being honest. There's a chance they didn't pick up some of that cargo, and betraying your whole hand is costly. It might be worth it to risk hostilities for a little extra profit. A game of limited information.

quyykk · 2022-04-25T20:26:28Z

It's already possible to refuse to surrender, in which case you provoke the gov and they start attacking you. For the other request, idk maybe.

petervdmeer · 2022-04-26T14:31:26Z

source/Government.cpp

@@ -116,6 +118,8 @@ void Government::Load(const DataNode &node)
 			bribe = child.Value(1);
 		else if(child.Token(0) == "fine" && child.Size() >= 2)
 			fine = child.Value(1);
+		else if(child.Token(0) == "bribe factor" && child.Size() >= 2)


I would expect to also see a "reputation hit" factor when the player flees. (Not a large factor for most governments, but fleeing should have a little bit longer-term effects.)

petervdmeer · 2022-05-01T19:43:35Z

Would it be possible to, when confronted by authorities, give the player the option to refuse surrender, or surrender all their illegal cargo, or surrender only a portion of their illegal cargo? A way to still make a buck, if the coppers don't realize you aren't being honest. There's a chance they didn't pick up some of that cargo, and betraying your whole hand is costly. It might be worth it to risk hostilities for a little extra profit. A game of limited information.

For this PR I would suggest to just focus on surrendering all illegal cargo and to keep those ideas for a possible follow-up PR. (I would assume the authorities in most cases to board the offending ship and take the illegal cargo directly btw).

petervdmeer · 2022-05-01T19:46:48Z

"Waiting on OP" due to the open merge-conflicts.

Galaucus · 2022-05-01T20:29:07Z

I prefer an all or nothing approach when it comes to surrendering cargo. It keeps things simple and straightforward.

petervdmeer · 2022-07-06T22:24:15Z

A related PR contains a nice comment about allow fines to both have a "once once discovered" and a "per item when discovered" fine part. I feel that such an approach would also be nice here.

source/IllegalHailPanel.cpp

source/IllegalHailPanel.h

source/PlayerHailPanel.cpp

source/PlayerHailPanel.h

Amazinite · 2023-01-07T21:10:01Z

@quyykk Please address the conflicts and outstanding reviews on this PR, or we'll have to close it.

Co-authored-by: tibetiroka <68112292+tibetiroka@users.noreply.github.com>

Hurleveur · 2023-01-11T14:34:06Z

The illegal tests need to be changed a bit to account for the new panel, idk what changes happened to it.

edit: I think that changing line 321 of tests_illegal_atrocity.txt should do it. Not sure what should happen, but previously clicking done was all, maybe now you need to input "escape" instead?

Hurleveur

Just looked at the parsing for now

Hurleveur · 2023-01-16T07:23:43Z

source/CargoHold.cpp

@@ -602,15 +601,15 @@ int CargoHold::IllegalCargoFine(const Government *government) const
 			return -1;
 		if(fine < 0)
 			return fine;
-		totalFine = max(totalFine, fine / 2);
+		totalFine += (fine / 2) * it.second;


Ok to make the fines stack but maybe use a sqrt or smth?
Or maybe we should just rebalancr fines afterwards, but 450M caus of nerve gas is going to hurt (which is good), possibly too much

Yeah definitely

forgot about this?

source/Government.cpp

Hurleveur · 2023-01-16T07:33:33Z

Phone github... I didnt click aprove xD

Update warp-core changes for HailPanel in PlayerHailPanel (cpp and h) for endless-sky#8360 Updated changes from endless-sky#8236 across moved code for `Format::CreditString`. - IllegalHailPanel.cpp - PlayerHailPanel.cpp

Hurleveur

Some things to consider

I hope this can be the beginning of a more dynamic hail system for npcs where they can eventually give you missions and the like

anyway I didnt look at all of it but this should give you some work already, code looks good and I'll be testing this at some point to make sure all's working fine

Hurleveur · 2023-08-29T10:56:10Z

source/CargoHold.cpp

@@ -602,15 +601,15 @@ int CargoHold::IllegalCargoFine(const Government *government) const
 			return -1;
 		if(fine < 0)
 			return fine;
-		totalFine = max(totalFine, fine / 2);
+		totalFine += (fine / 2) * it.second;


forgot about this?

Hurleveur · 2023-08-29T10:56:55Z

source/Government.cpp

+			bribeFactor = add ? bribeFactor + child.Value(valueIndex) : child.Value(valueIndex);
+		else if(key == "interdiction" || key == "interdiction bribe")
+		{
+			const bool isInterdiction = key == "interdiction";


shouldnt we check this earlier so we use it in the if just above too? mb we can even set it in the if idk

Hurleveur · 2023-08-29T10:58:30Z

source/Government.cpp

+			string &text = isInterdiction ? interdiction : interdictionBribe;
+			bool &seen = isInterdiction ? hasInterdiction : hasInterdictionBribe;
+
+			if(!seen)


small comment for what seen is?
isnt this just for a reset of it when redefined - in which case it should be above? idk I'm a bit confused by this

Hurleveur · 2023-08-29T11:00:55Z

source/IllegalHailPanel.cpp

+
+	static const std::string defaultMessage
+		= "You've been detected carrying illegal <type> and have been issued a fine of <fine>."
+			" \n\tDump your cargo immediately or we'll be forced to disable and board your ship.";


Suggested change

" \n\tDump your cargo immediately or we'll be forced to disable and board your ship.";

" \n\tDump your cargo immediately or we'll be forced to open fire.";

seems better as a default to me?

Hurleveur · 2023-08-29T11:03:31Z

source/IllegalHailPanel.cpp

+		// is automatically removed since the missions are failed.
+		for(const auto &pair : scannedShip.Cargo().Outfits())
+			if(pair.first->Get("illegal") || pair.first->Get("atrocity") > 0.)
+				scannedShip.Jettison(pair.first, pair.second, true);


say you have illegal cargo, but also atrocities, but they've only discovered one
should you be forced to dump all of it?
or is it always discover all/nothing?

Hurleveur · 2023-08-29T11:05:15Z

source/IllegalHailPanel.cpp

+
+		player.Accounts().AddCredits(-bribe);
+		Messages::Add("You bribed a " + hailingShip.GetGovernment()->GetName() + " ship "
+			+ Format::CreditString(bribe) + " to avoid paying a fine today."


I just find it weird you can bribe them to avoid the fine lol, one would just take the lowest cost option without much consequences? also more generic caus it could be to ignore the atrocity (or not?)

Suggested change

+ Format::CreditString(bribe) + " to avoid paying a fine today."

+ Format::CreditString(bribe) + " to leave you alone."

Hurleveur · 2023-08-29T11:07:46Z

source/PlayerHailPanel.cpp

+	else
+		header = ship->DisplayModelName() + " (" + gov->GetName() + "): ";
+	// Drones are always unpiloted, so they never respond to hails.
+	bool isMute = ship->GetPersonality().IsMute() || (ship->Attributes().Category() == "Drone");


now, ik you didnt write this but I think we should change it eventually given the new CanSendHail method and the possibility for aliens with unknown languages to say smth more interesting than you dont recognize stuff

Hurleveur · 2023-08-29T11:11:37Z

source/PlayerHailPanel.cpp

+	else if(gov->IsEnemy())
+	{
+		// Enemy ships always show hostile messages.
+		// They either show bribing messages,


that's on me ig but that's not the case anymore they can show normal msgs now instead of the bribing all the time

Hurleveur · 2023-08-29T11:13:02Z

source/Politics.cpp

+
+	// Do nothing if there is nothing to fine for or the target ship has already been fined today.
+	if(!punishment.HasPunishment() || fined.count(ship.GetGovernment()))
+		return {};


shouldnt we have a const static empty for this?

quyykk added 2 commits November 28, 2021 17:39

Fining revamp implementation.

49d752d

Fix oversight that made it so that fines are always 0.

9bebde7

Amazinite added the enhancement A suggestion for new content or functionality that requires code changes label Nov 29, 2021

quyykk added 2 commits November 29, 2021 11:51

Fix fine stacking calculation.

40944fb

Require "atrocity" to be positive.

3001835

Galaucus mentioned this pull request Nov 30, 2021

Smuggling/Illegal Outfits overhaul #6314

Open

6 tasks

petervdmeer reviewed Apr 26, 2022

View reviewed changes

petervdmeer added the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label May 1, 2022

petervdmeer mentioned this pull request Jul 6, 2022

Make fines scale based on the number of illegal outfits you have #2650

Closed

tibetiroka requested changes Sep 5, 2022

View reviewed changes

source/IllegalHailPanel.cpp Outdated Show resolved Hide resolved

source/IllegalHailPanel.h Outdated Show resolved Hide resolved

source/PlayerHailPanel.cpp Outdated Show resolved Hide resolved

source/PlayerHailPanel.h Outdated Show resolved Hide resolved

quyykk and others added 5 commits January 8, 2023 00:54

Apply suggestions from code review

3ca8399

Co-authored-by: tibetiroka <68112292+tibetiroka@users.noreply.github.com>

Merge remote-tracking branch 'upstream/master' into fining-revamp

be3cae1

Add missing files to CMakeLists.

11f1964

Add missing parantheses.

135860a

Fix merge issue.

4aa8e9f

quyykk removed the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label Jan 8, 2023

Fix style issues.

f98b78c

quyykk added 3 commits January 15, 2023 22:53

Merge remote-tracking branch 'upstream/master' into fining-revamp

73a5cb4

Fix style violations.

034b18c

Fix the integration tests.

ccfaefa

Hurleveur approved these changes Jan 16, 2023

View reviewed changes

Hurleveur self-requested a review January 16, 2023 07:33

Hecter94 added the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label Feb 6, 2023

Resolved conflics: Merge branch 'master'

7404f85

Update warp-core changes for HailPanel in PlayerHailPanel (cpp and h) for endless-sky#8360 Updated changes from endless-sky#8236 across moved code for `Format::CreditString`. - IllegalHailPanel.cpp - PlayerHailPanel.cpp

quyykk force-pushed the fining-revamp branch from 0c3aafd to ccfaefa Compare February 15, 2023 22:36

samrocketman and others added 4 commits February 15, 2023 18:22

Merge branch 'master' into resolve-conflicts-fining-revamp

25df723

Merge remote-tracking branch 'upstream/master' into fining-revamp

a2ae111

Fix merge conflict

407b9af

Address review comments

08da16c

quyykk removed the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label Mar 29, 2023

Saugia added the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label Jun 30, 2023

quyykk removed the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label Aug 28, 2023

quyykk added 2 commits August 28, 2023 13:55

Merge remote-tracking branch 'upstream/master' into fining-revamp

f12943c

Fix unused capture.

3212198

Hurleveur suggested changes Aug 29, 2023

View reviewed changes

bene-dictator added the waiting on OP The OP needs to provide something, e.g, making requested changes, posting assets, etc. label Oct 29, 2023

TomGoodIdea mentioned this pull request Jun 9, 2024

Request: Ignore illegal cargo/equipment on the captured ship. #10180

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fining Revamp - getting scanned with illegal cargo gets you a new hail panel + more #6376

Fining Revamp - getting scanned with illegal cargo gets you a new hail panel + more #6376

quyykk commented Nov 28, 2021

Ferociousfeind commented Apr 25, 2022

quyykk commented Apr 25, 2022 •

edited

Loading

Ferociousfeind commented Apr 25, 2022 •

edited

Loading

quyykk commented Apr 25, 2022

petervdmeer Apr 26, 2022

petervdmeer commented May 1, 2022

petervdmeer commented May 1, 2022

Galaucus commented May 1, 2022

petervdmeer commented Jul 6, 2022

Amazinite commented Jan 7, 2023

Hurleveur commented Jan 11, 2023 •

edited

Loading

Hurleveur left a comment

Hurleveur Jan 16, 2023

quyykk Jan 16, 2023

Hurleveur Aug 29, 2023

Hurleveur commented Jan 16, 2023

Hurleveur left a comment

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

Hurleveur Aug 29, 2023

	" \n\tDump your cargo immediately or we'll be forced to disable and board your ship.";
	" \n\tDump your cargo immediately or we'll be forced to open fire.";

	+ Format::CreditString(bribe) + " to avoid paying a fine today."
	+ Format::CreditString(bribe) + " to leave you alone."

Fining Revamp - getting scanned with illegal cargo gets you a new hail panel + more #6376

Are you sure you want to change the base?

Fining Revamp - getting scanned with illegal cargo gets you a new hail panel + more #6376

Conversation

quyykk commented Nov 28, 2021

Feature Details

UI Screenshots

Usage Examples

Testing Done

Performance Impact

Ferociousfeind commented Apr 25, 2022

quyykk commented Apr 25, 2022 • edited Loading

Ferociousfeind commented Apr 25, 2022 • edited Loading

quyykk commented Apr 25, 2022

Choose a reason for hiding this comment

petervdmeer commented May 1, 2022

petervdmeer commented May 1, 2022

Galaucus commented May 1, 2022

petervdmeer commented Jul 6, 2022

Amazinite commented Jan 7, 2023

Hurleveur commented Jan 11, 2023 • edited Loading

Hurleveur left a comment

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

Hurleveur commented Jan 16, 2023

Hurleveur left a comment

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

quyykk commented Apr 25, 2022 •

edited

Loading

Ferociousfeind commented Apr 25, 2022 •

edited

Loading

Hurleveur commented Jan 11, 2023 •

edited

Loading