OpenXcom Forum

OpenXcom => Suggestions => Topic started by: ivandogovich on May 01, 2015, 10:47:49 pm

Title: Add melee availability to statstring conditions
Post by: ivandogovich on May 01, 2015, 10:47:49 pm

The intent is to allow XcomUtil's Custom Stat strings to assess and report the value of the soldier's melee skill as well. 

Many mods use this attribute, and it may come into play with TftD melee weapons.

Pull Request is here: https://github.com/SupSuper/OpenXcom/pull/1002

This has been compiled and works as desired.

Cheers, Ivan :D

Title: Re: Add melee availability to statstring conditions
Post by: ivandogovich on May 08, 2015, 04:02:31 am

The PR has been updated to comply with the new mod structure. :)

https://github.com/SupSuper/OpenXcom/pull/1005

Title: Re: Add melee availability to statstring conditions
Post by: myk002 on May 08, 2015, 04:33:43 am

u know, if you just updated your branch from your first pull request, it would just get added to the PR.  you didn't need to make a new PR.

Title: Re: Add melee availability to statstring conditions
Post by: ivandogovich on May 08, 2015, 04:44:08 am

By PRing the Master back into my Patch branch?  (My Git-Fu is weak.  Still have a lot to learn).

Title: Re: Add melee availability to statstring conditions
Post by: myk002 on May 08, 2015, 09:01:26 am

pretty much, except you don't have to make pull requests into your own repo.  you just fetch upstream and merge.  It's usually just:

Code: [Select]

git fetch upstream
git merge upstream/master
git push

here's the github help on the subject: https://help.github.com/articles/syncing-a-fork/