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

Manually place enemy zones #26

Merged
merged 5 commits into from Jan 29, 2015
Merged

Conversation

bolbies
Copy link
Contributor

@bolbies bolbies commented Jan 26, 2015

Issue

Fixes #33

Summary

First commit. I hope I'm doing this right!

First commits. I hope I'm doing this right!
I accidentally deleted _zones_array from locatorzonesV2 so I fixed it.
@fritogotlayed
Copy link
Contributor

@bolbies You're doing just fine. What issue number where you trying to resolve with this or was there another issue? If it was another issue I can create an issue and we can go from there. From this side it looks like you created the PR just fine 👍

colorBackground[] = {1, 0, 0,0.5};
tooltip = "Manually generate the zones, then start the campaign"; //--- ToDo: Localize;
action = "_nul = [] execvm ""dialog\startup\startup_start2.sqf""";
};
Copy link
Contributor

Choose a reason for hiding this comment

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

@bolbies I know this is really nit-picky but can we please change the tab characters here to spaces? This appears to be the only block in this file that came across with tabs and not spaces. :-)

@fritogotlayed
Copy link
Contributor

👀 Looking at this now.

commandpointsblu1 = 1000
};

case index_amount_cp_600:
Copy link
Contributor

Choose a reason for hiding this comment

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

There's a tab here, need spaces :-)

@fritogotlayed
Copy link
Contributor

@bolbies Done with my first pass review. I have to head out right now... dang wife...
Also, thanks a ton for the contribution! The purpose of the code review is not to attack you or your code but rather to make a higher quality mission for everyone :-).

@naitp @phr0gz Feel free to review as well. I only spent about 10 minutes on the first pass. I'll review again later when I get back home.

Verdict - 🙅

@bolbies
Copy link
Contributor Author

bolbies commented Jan 26, 2015

I think I fixed the tabs. I'll make sure of that next time I post something. And the issue was from my own commit, not any of yours.

@bolbies bolbies closed this Jan 26, 2015
@bolbies bolbies reopened this Jan 26, 2015
@fritogotlayed
Copy link
Contributor

@bolbies I checked out your manual-zones branch and built the pbo to play local. When the game launched I manually placed my HQ. When I got to the zone screen I clicked the "START-M" button but nothing happens. Am I missing something here?

@bolbies
Copy link
Contributor Author

bolbies commented Jan 27, 2015

I used the find/replace word tool to quickly turn the tabs into spaces and one of the variables at the bottom of startup_start2 got messed up. Sorry. Try it now.

@fritogotlayed
Copy link
Contributor

@bolbies Ha. Not a problem. Have you tried an IDE like IntelliJ or SQF Editor? Both have an option to convert whitespace to spaces. It'll safely change tabs to spaces. I use both interchangeably.

blufor_ap = 170;
};

case index_ blufor_ap_200:
Copy link
Contributor

Choose a reason for hiding this comment

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

I think these are messed up :-) case index_ blufor_ap_...

@bolbies
Copy link
Contributor Author

bolbies commented Jan 27, 2015

Guess who's never using the replace tool ever again? Fixes are up. Hopefully it works now!

@fritogotlayed
Copy link
Contributor

Haha, it happens to all of us. I've been on the phone most of the evening and probably wont get to this until Wednesday. Thanks for making the edits! I strongly suggest using something like Squint, SQF Editor or IntelliJ with the SQF Plugin. All of the have an option to automatically convert tabs (\t) to spaces.

@bolbies
Copy link
Contributor Author

bolbies commented Jan 27, 2015

Yeah I downloaded Squint so I'll see how that works out later when I start something else. I'll see if I can knock out a few of the posted issues next. This is fun :)

@fritogotlayed
Copy link
Contributor

@bolbies All looked good to me from a code standpoint. Thanks for the addition. One area for improvement I'd like to see is that sometimes when I click nothing registers so I don't know if the script is analyzing to make sure the location I clicked is valid or if it's an invalid location. I'll create a new issue for this and we can address it in another PR.

Also, I'm going to make some edits to get your PR into the format I'm planning to use going forward. This isn't a code edit; It's strictly just on this PR.

fritogotlayed added a commit that referenced this pull request Jan 29, 2015
👍 Merging #26 since the edits look good.
@fritogotlayed fritogotlayed merged commit 5808a82 into DUWS-R-Team:master Jan 29, 2015
@fritogotlayed
Copy link
Contributor

@bolbies You should join the @DUWS-R-Team/developers team. We would love to have you!

@bolbies bolbies deleted the manual_zones branch January 30, 2015 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow for manual placement of enemy zones
2 participants