merged with master

This commit is contained in:
AngelRionCervi 2020-09-27 20:51:10 +02:00
commit 56f0bccbd2
2 changed files with 3 additions and 2 deletions

View file

@ -39,7 +39,7 @@ const InfoButton = exports.InfoButton = React.createClass({
</a>
</li>
<li>
<a href=" https://www.ensl.org/gatherre" target="_blank">
<a href="https://www.ensl.org/gatherre" target="_blank">
<i className="fa fa-legal">&nbsp;</i>&nbsp;Gather Rules
</a>
</li>

View file

@ -259,13 +259,14 @@ Gather.prototype.modifyGatherer = function (user, callback){
// 08/04/20 : 1-1-1-1-1
// 08/11/20 : 1-2-1-1-1
// 09/21/20 : 1-1-1-2-1
Gather.prototype.getPickingPattern = function () {
const pickingPattern = [
"marine",
"alien",
"alien",
"marine",
"alien",
"alien",
"marine",
"alien",
"marine",