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

give score for items removed from enemies #1173

Merged
merged 2 commits into from
May 17, 2024
Merged

Conversation

farooqkz
Copy link
Contributor

@farooqkz farooqkz commented Jul 3, 2023

This PR gives score to the players if they put an item dropped from teammate or enemy and put it in the teamchest. The item must not be stackable.

@AltZ-15
Copy link

AltZ-15 commented Jul 3, 2023

What stops players from just cashing in all the items they've collected and talking it all back from the chest as soon as they get the points?

@farooqkz
Copy link
Contributor Author

farooqkz commented Jul 3, 2023

What stops players from just cashing in all the items they've collected and talking it all back from the chest as soon as they get the points?

It's a reasonable concern. But why they would do that?

Copy link
Member

@LoneWolfHT LoneWolfHT left a comment

Choose a reason for hiding this comment

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

You could replace the meta string "dropped" with an int value. meta:get_int() returns 0 for unset values, and you could treat 1 as truthy
meta:set_int("dropped", 1), etc

mods/ctf/ctf_teams/team_chest.lua Show resolved Hide resolved
mods/ctf/ctf_teams/team_chest.lua Show resolved Hide resolved
mods/ctf/ctf_teams/team_chest.lua Outdated Show resolved Hide resolved
mods/ctf/ctf_teams/team_chest.lua Outdated Show resolved Hide resolved
mods/pvp/dropondie/init.lua Show resolved Hide resolved
@LoneWolfHT
Copy link
Member

To play it safe I would prefer to only give 1 or less score for items we reward returning, and slowly increase that as we watch things play out on the main server

@farooqkz
Copy link
Contributor Author

farooqkz commented Jul 4, 2023

To play it safe I would prefer to only give 1 or less score for items we reward returning, and slowly increase that as we watch things play out on the main server

I disagree with the reward being the same, one point, for all the items. And less than one is a bad idea IMO

@LoneWolfHT
Copy link
Member

LoneWolfHT commented Jul 6, 2023

I disagree with the reward being the same, one point, for all the items. And less than one is a bad idea IMO

Did you read the and slowly increase that as we watch things play out on the main server part? The item values can be differentiated again as we increase them

@farooqkz
Copy link
Contributor Author

farooqkz commented Jul 6, 2023

I disagree with the reward being the same, one point, for all the items. And less than one is a bad idea IMO

Did you read the and slowly increase that as we watch things play out on the main server part? The item values can be differentiated again as we increase them

Yeah I know but it doesn't make sense to me even temporary. But if you mean some stuff can be temporary non-sensible, that's your decision. I am committing to give exactly one for all items.

@LoneWolfHT
Copy link
Member

Thanks.
#1173 (comment) needs to be fixed and this will be ready for testing

@LoneWolfHT
Copy link
Member

Your rebase didn't work at all there

@LoneWolfHT
Copy link
Member

LoneWolfHT commented Jul 28, 2023

With rebasing I tend to use git rebase -i <PR branch>~<number of previous commits I want to have the option to squash> (e.g git rebase -i master~6), squash all my commits together, then git pull -r mainrepo master to rebase off of the CTF repo's master branch

I'm laying that out to show you some things you can do, I highly recommend googling/figuring out what those commands do on your own though, you can seriously mess things up otherwise

@LoneWolfHT
Copy link
Member

Items returned to team chest shouldn't give score if they're your own

@farooqkz
Copy link
Contributor Author

farooqkz commented Aug 3, 2023

@LoneWolfHT Done.

@farooqkz farooqkz added the Post-approval step ⭐ Something remains to be done before merge label Aug 3, 2023
Copy link
Member

@LoneWolfHT LoneWolfHT left a comment

Choose a reason for hiding this comment

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

Rebase conflict

@farooqkz
Copy link
Contributor Author

Rebase conflict

WDYM?

@LoneWolfHT LoneWolfHT added the 🏗️ Ranked Reset Queue Can only be merged after the next ranking reset label Aug 16, 2023
@LoneWolfHT
Copy link
Member

image

@farooqkz
Copy link
Contributor Author

@LoneWolfHT Done

@LoneWolfHT
Copy link
Member

How are you rebasing your PR? This shouldn't be showing up:
image

@farooqkz
Copy link
Contributor Author

@LoneWolfHT What was state of this? Do I need to do anything?

@LoneWolfHT LoneWolfHT merged commit 4011f69 into MT-CTF:master May 17, 2024
1 check passed
@farooqkz farooqkz deleted the drop branch May 20, 2024 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature ⭐ ⚙️ Inventory ⚙️ Scoring Post-approval step ⭐ Something remains to be done before merge 🏗️ Ranked Reset Queue Can only be merged after the next ranking reset
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants