Skip to content
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.

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

Handgold and payday rules #3847

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

Shinthoras0815
Copy link
Contributor

Rules:

  • MaxPaydaysAdvanced:
    Limits the number of paydays that can be skipped by giving hand gold outside of payday events.
  • MaxPaydaysOwed:
    Limits the number of missed paydays that creatures will attempt to claim salary for.
    0 = Disables creatures' need for paydays entirely.
  • AcceptPartialPayday:
    When true, any amount of gold is enough to count as a payday and for skipping paydays.
    When false, the amount already paid is stored, and the creature will only be satisfied once it reaches 100%.
  • PocketGold:
    When true, gold dropped on the creature is stored in their pocket.
  • TakePayFromPocket:
    When true, creatures first use the gold in their own pocket to satisfy payday.
    (can't skip payday if pocket is too small.)

Fixes:

  • Creatures now accept gold at any time to satisfy paydays.
  • Creatures now gain happiness only from gold picked up from the ground.

The interaction between these rules should be tested further, both during and outside of payday events.

@@ -3033,7 +3035,11 @@ short creature_take_salary(struct Thing *creatng)
internal_set_thing_state(creatng, CrSt_CreatureWantsSalary);
return 1;
}
GoldAmount salary = calculate_correct_creature_pay(creatng);
// Creature take salary first out of her own pocket
if(game.conf.rules.game.take_pay_from_pocket || !game.conf.rules.game.accept_partial_payday){
Copy link
Member

Choose a reason for hiding this comment

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

why is 'not partial payday' here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If allowed with accept_partial_payday,
creatures would take the full salary even if they were already partially paid

Copy link
Member

Choose a reason for hiding this comment

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

but by accepting partial paydays, you would always take 0 payday next payday on any cash right? So would it not need to be fully excluded before this point?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not about excluding accept_partial_payday, but rather about allowing !accept_partial_payday so that in this case the salary is calculated differently.

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.

2 participants