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

Partially fixed coin pickup #106

Merged
merged 18 commits into from
Feb 18, 2021
Merged

Conversation

nisathnasar
Copy link
Member

@nisathnasar nisathnasar commented Feb 11, 2021

Counter is broken; it increases for all clients.
Pickup Script

@hsravat-4590 hsravat-4590 linked an issue Feb 11, 2021 that may be closed by this pull request
@hsravat-4590
Copy link
Member

Looking good so far. Just think it will be better to have team specific counts before merging

@hsravat-4590 hsravat-4590 added bug Something isn't working Critical labels Feb 14, 2021
@hsravat-4590
Copy link
Member

hsravat-4590 commented Feb 16, 2021

All that's left is that the UI needs to be updated to reflect team money

@hsravat-4590
Copy link
Member

This solution works as intended albeit there is some bad code in MoneyManager for some reason the conversion between the provided int and enum type

@hsravat-4590
Copy link
Member

@nisathnasar @Mirlle do you think this is ready for merging or should I try and properly fix the enum issue first

@nisathnasar
Copy link
Member Author

Don't merge it with derangedsenators:main yet. This could be catastrophic. How about we branch off from derangedsenators as a feature 'moneypickup' first, let us cleanse the code a bit and maybe even fix the attack script before considering merging?

@hsravat-4590
Copy link
Member

hsravat-4590 commented Feb 17, 2021

Don't merge it with derangedsenators:main yet. This could be catastrophic. How about we branch off from derangedsenators as a feature 'moneypickup' first, let us cleanse the code a bit and maybe even fix the attack script before considering merging?

The PR is already linked into main and I don't think that there is anything that conflicts with the attackscript per se. This fix is mostly independent of Attack

@nisathnasar
Copy link
Member Author

How about ParelSync? Should it be in there?

@hsravat-4590
Copy link
Member

hsravat-4590 commented Feb 17, 2021

How about ParelSync? Should it be in there?

I think it's good to keep there as we'll probably require it in the future anyway. Although @ashjaimal and @ellimanh may need to remove the parelsync folder from Assets as it would be duplicated

@nisathnasar
Copy link
Member Author

Approval from me, I think peter's already approved it.

@hsravat-4590
Copy link
Member

✔️ From me... Merging

@hsravat-4590 hsravat-4590 merged commit 60649c2 into DerangedSenators:main Feb 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Critical
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pickup Script
3 participants