Fixes shops not being able to give jobs#139
Open
SouDescolado wants to merge 41 commits into
Open
Conversation
I think this is the line of code that is not loading back the OT_xp that is being saved, per rekterakathom#130
Fixes rekterakathom#136 I checked what @hirsja95 mentioned, compared with how resistance members works and checked other things that called to check support levels, and as they mentioned, it was missing the line to define which town that was
Fixes rekterakathom#135 As @hirsja95 mentioned, the logic was flawed. It was: Checking if the player dont have a base AND Checking if a player is close to a base. So if the player neither has a base nor is close to one, would return False, and since the ! is outside the parenthesis, it would make the check return True, making the button visible. Ironically, it would disable the garrisson button if the player had a base and was close to it
Fixes rekterakathom#111 The function removeWeapon only removes equipped weapons This makes a check that, if it has the weapon equipped, remove it. Otherwise uses the function removeItem (Checks Uniform -> Vest -> Backpack, in that order)
Enable Garrison button only when it should
Make the delivery jobs actually take the weapon
Fixes shops not being able to give jobs
Makes the code to initialize the XP
Author
Tested on local. Seems to work (Kore backpack shop in altis) |
Author
|
Oh, I didnt notice there was no item listed on the job. May need some additional testing. I just was happy enough to see the job screen pop up |
I just grabbed what was in the 'General' category and Surplus category. Technically, the clothing shop is the only one with a distinct item list (Because it checks the map initVars for it) so it tells you to deliver local clothing instead.
Add items to be delivered for the Shop's Jobs
Everything was borken
fixing things
Tries to guarantee an item is picked
Make it pick something
Maybe this is it, I dunno
Change the way to get the shopCategory
Update shopdelivery.sqf
Try to get the item list from somewhere else
Maybe it works? Dunno.
This didnt work before, no reason to keep
Added a sanity check for empty and also removed backpacks from being possible as a deliver thing. It works
Author
|
Yea. I tried a lot of things. Now its working fine. It removes empty and bags from the list when deciding which item you must deliver |
Re-add the fix. I had removed by accident when cleaning some mix ups
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #136
I checked what @hirsja95 mentioned, compared with how resistance members works and checked other things that called to check support levels, and as they mentioned, it was missing the line to define which town that was