search

DerangedSenators / copsandrobbers

2D Multiplayer Cops and Robbers Game made with Unity for the Aston University Team project module
https://www.copsandrobbers.co.uk
Apache License 2.0
6 stars 5 forks source link

Partially fixed coin pickup #106

Closed nisathnasar closed 3 years ago

nisathnasar commented 3 years ago

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

hsravat-4590 commented 3 years ago

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

hsravat-4590 commented 3 years ago

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

hsravat-4590 commented 3 years ago

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 commented 3 years ago

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

nisathnasar commented 3 years ago

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 commented 3 years ago

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 commented 3 years ago

How about ParelSync? Should it be in there?

hsravat-4590 commented 3 years ago

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 commented 3 years ago

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

hsravat-4590 commented 3 years ago

:heavy_check_mark: From me... Merging