@@ -4,39 +4,39 @@ |
||
4 | 4 | 'modules' => [ |
5 | 5 | "4-4-2" => [ |
6 | 6 | 'roles'=>[1,1,2,1,1,2,1,0,2,0], |
7 | - 'character' => 2 |
|
7 | + 'character' => 2 |
|
8 | 8 | ], |
9 | 9 | "4-3-3" => [ |
10 | 10 | 'roles'=>[1,1,2,1,0,3,0,1,1,1], |
11 | - 'character' => 1 |
|
11 | + 'character' => 1 |
|
12 | 12 | ], |
13 | 13 | "4-5-1" => [ |
14 | 14 | 'roles'=>[1,1,2,1,1,3,1,0,1,0], |
15 | - 'character' => 4 |
|
15 | + 'character' => 4 |
|
16 | 16 | ], |
17 | 17 | "4-2-4" => [ |
18 | 18 | 'roles'=>[1,1,2,1,0,2,0,1,2,1], |
19 | - 'character' => 1 |
|
19 | + 'character' => 1 |
|
20 | 20 | ], |
21 | 21 | "3-5-2" => [ |
22 | 22 | 'roles'=>[1,0,3,0,1,3,1,0,2,0], |
23 | - 'character' => 2 |
|
23 | + 'character' => 2 |
|
24 | 24 | ], |
25 | 25 | "3-4-3" => [ |
26 | 26 | 'roles'=>[1,0,3,0,1,2,1,1,1,1], |
27 | - 'character' => 1 |
|
27 | + 'character' => 1 |
|
28 | 28 | ], |
29 | 29 | "3-3-4" => [ |
30 | 30 | 'roles'=>[1,0,3,0,0,3,0,1,2,1], |
31 | - 'character' => 1 |
|
31 | + 'character' => 1 |
|
32 | 32 | ], |
33 | 33 | "5-4-1" => [ |
34 | 34 | 'roles'=>[1,1,3,1,1,2,1,0,1,0], |
35 | - 'character' => 4 |
|
35 | + 'character' => 4 |
|
36 | 36 | ], |
37 | 37 | "5-3-2" => [ |
38 | 38 | 'roles'=>[1,1,3,1,0,3,0,0,2,0], |
39 | - 'character' => 4 |
|
39 | + 'character' => 4 |
|
40 | 40 | ] |
41 | 41 | ], |
42 | 42 | 'roles' => [ |
@@ -3,39 +3,39 @@ |
||
3 | 3 | return [ |
4 | 4 | 'modules' => [ |
5 | 5 | "4-4-2" => [ |
6 | - 'roles'=>[1,1,2,1,1,2,1,0,2,0], |
|
6 | + 'roles'=>[1, 1, 2, 1, 1, 2, 1, 0, 2, 0], |
|
7 | 7 | 'character' => 2 |
8 | 8 | ], |
9 | 9 | "4-3-3" => [ |
10 | - 'roles'=>[1,1,2,1,0,3,0,1,1,1], |
|
10 | + 'roles'=>[1, 1, 2, 1, 0, 3, 0, 1, 1, 1], |
|
11 | 11 | 'character' => 1 |
12 | 12 | ], |
13 | 13 | "4-5-1" => [ |
14 | - 'roles'=>[1,1,2,1,1,3,1,0,1,0], |
|
14 | + 'roles'=>[1, 1, 2, 1, 1, 3, 1, 0, 1, 0], |
|
15 | 15 | 'character' => 4 |
16 | 16 | ], |
17 | 17 | "4-2-4" => [ |
18 | - 'roles'=>[1,1,2,1,0,2,0,1,2,1], |
|
18 | + 'roles'=>[1, 1, 2, 1, 0, 2, 0, 1, 2, 1], |
|
19 | 19 | 'character' => 1 |
20 | 20 | ], |
21 | 21 | "3-5-2" => [ |
22 | - 'roles'=>[1,0,3,0,1,3,1,0,2,0], |
|
22 | + 'roles'=>[1, 0, 3, 0, 1, 3, 1, 0, 2, 0], |
|
23 | 23 | 'character' => 2 |
24 | 24 | ], |
25 | 25 | "3-4-3" => [ |
26 | - 'roles'=>[1,0,3,0,1,2,1,1,1,1], |
|
26 | + 'roles'=>[1, 0, 3, 0, 1, 2, 1, 1, 1, 1], |
|
27 | 27 | 'character' => 1 |
28 | 28 | ], |
29 | 29 | "3-3-4" => [ |
30 | - 'roles'=>[1,0,3,0,0,3,0,1,2,1], |
|
30 | + 'roles'=>[1, 0, 3, 0, 0, 3, 0, 1, 2, 1], |
|
31 | 31 | 'character' => 1 |
32 | 32 | ], |
33 | 33 | "5-4-1" => [ |
34 | - 'roles'=>[1,1,3,1,1,2,1,0,1,0], |
|
34 | + 'roles'=>[1, 1, 3, 1, 1, 2, 1, 0, 1, 0], |
|
35 | 35 | 'character' => 4 |
36 | 36 | ], |
37 | 37 | "5-3-2" => [ |
38 | - 'roles'=>[1,1,3,1,0,3,0,0,2,0], |
|
38 | + 'roles'=>[1, 1, 3, 1, 0, 3, 0, 0, 2, 0], |
|
39 | 39 | 'character' => 4 |
40 | 40 | ] |
41 | 41 | ], |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - //Stuff |
|
5 | - 'stuff' => 1, |
|
4 | + //Stuff |
|
5 | + 'stuff' => 1, |
|
6 | 6 | ]; |
7 | 7 | \ No newline at end of file |
@@ -15,21 +15,21 @@ |
||
15 | 15 | */ |
16 | 16 | class Config |
17 | 17 | { |
18 | - /** |
|
19 | - * @param $key |
|
20 | - * @param null $directory |
|
21 | - * @return null |
|
22 | - */ |
|
23 | - public static function get($key, $directory = null) |
|
24 | - { |
|
25 | - $fileName = $directory . "config/"; |
|
26 | - $exp = explode(".", $key); |
|
27 | - if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName . $exp[0] . ".php")) { |
|
28 | - $conf = include($fileName . $exp[0] . ".php"); |
|
29 | - $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null; |
|
30 | - return $val; |
|
31 | - } |
|
32 | - return null; |
|
33 | - } |
|
18 | + /** |
|
19 | + * @param $key |
|
20 | + * @param null $directory |
|
21 | + * @return null |
|
22 | + */ |
|
23 | + public static function get($key, $directory = null) |
|
24 | + { |
|
25 | + $fileName = $directory . "config/"; |
|
26 | + $exp = explode(".", $key); |
|
27 | + if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName . $exp[0] . ".php")) { |
|
28 | + $conf = include($fileName . $exp[0] . ".php"); |
|
29 | + $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null; |
|
30 | + return $val; |
|
31 | + } |
|
32 | + return null; |
|
33 | + } |
|
34 | 34 | |
35 | 35 | } |
36 | 36 | \ No newline at end of file |
@@ -22,10 +22,10 @@ |
||
22 | 22 | */ |
23 | 23 | public static function get($key, $directory = null) |
24 | 24 | { |
25 | - $fileName = $directory . "config/"; |
|
25 | + $fileName = $directory."config/"; |
|
26 | 26 | $exp = explode(".", $key); |
27 | - if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName . $exp[0] . ".php")) { |
|
28 | - $conf = include($fileName . $exp[0] . ".php"); |
|
27 | + if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName.$exp[0].".php")) { |
|
28 | + $conf = include($fileName.$exp[0].".php"); |
|
29 | 29 | $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null; |
30 | 30 | return $val; |
31 | 31 | } |
@@ -10,11 +10,11 @@ |
||
10 | 10 | class TextFormatter |
11 | 11 | { |
12 | 12 | |
13 | - /** |
|
14 | - * @param $currencyString |
|
15 | - * @return float |
|
16 | - */ |
|
17 | - public static function currencyStringToFloat($currencyString){ |
|
13 | + /** |
|
14 | + * @param $currencyString |
|
15 | + * @return float |
|
16 | + */ |
|
17 | + public static function currencyStringToFloat($currencyString){ |
|
18 | 18 | //currency is always in this format € 550 |
19 | 19 | |
20 | 20 | return floatval( |
@@ -14,7 +14,7 @@ |
||
14 | 14 | * @param $currencyString |
15 | 15 | * @return float |
16 | 16 | */ |
17 | - public static function currencyStringToFloat($currencyString){ |
|
17 | + public static function currencyStringToFloat($currencyString) { |
|
18 | 18 | //currency is always in this format € 550 |
19 | 19 | |
20 | 20 | return floatval( |
@@ -9,11 +9,11 @@ |
||
9 | 9 | */ |
10 | 10 | class Dom |
11 | 11 | { |
12 | - /** |
|
13 | - * @param $node |
|
14 | - * @return string |
|
15 | - */ |
|
16 | - public static function getHtml($node) { |
|
12 | + /** |
|
13 | + * @param $node |
|
14 | + * @return string |
|
15 | + */ |
|
16 | + public static function getHtml($node) { |
|
17 | 17 | $innerHTML= ''; |
18 | 18 | $children = $node->childNodes; |
19 | 19 | foreach ($children as $child) { |
@@ -14,10 +14,10 @@ |
||
14 | 14 | * @return string |
15 | 15 | */ |
16 | 16 | public static function getHtml($node) { |
17 | - $innerHTML= ''; |
|
17 | + $innerHTML = ''; |
|
18 | 18 | $children = $node->childNodes; |
19 | 19 | foreach ($children as $child) { |
20 | - $innerHTML .= $child->ownerDocument->saveXML( $child ); |
|
20 | + $innerHTML .= $child->ownerDocument->saveXML($child); |
|
21 | 21 | } |
22 | 22 | return $innerHTML; |
23 | 23 | } |
@@ -9,24 +9,24 @@ |
||
9 | 9 | */ |
10 | 10 | class RegExp |
11 | 11 | { |
12 | - /** |
|
13 | - * @param $regexp |
|
14 | - * @param $target |
|
15 | - * @return null |
|
16 | - */ |
|
17 | - public static function getFirstMatch($regexp, $target) |
|
12 | + /** |
|
13 | + * @param $regexp |
|
14 | + * @param $target |
|
15 | + * @return null |
|
16 | + */ |
|
17 | + public static function getFirstMatch($regexp, $target) |
|
18 | 18 | { |
19 | 19 | preg_match_all($regexp, $target, $matches); |
20 | 20 | $match = array_key_exists(0,$matches[1]) ? $matches[1][0] : null; |
21 | 21 | return $match; |
22 | 22 | } |
23 | 23 | |
24 | - /** |
|
25 | - * @param $regexp |
|
26 | - * @param $target |
|
27 | - * @return null |
|
28 | - */ |
|
29 | - public static function getAllMatch($regexp, $target) |
|
24 | + /** |
|
25 | + * @param $regexp |
|
26 | + * @param $target |
|
27 | + * @return null |
|
28 | + */ |
|
29 | + public static function getAllMatch($regexp, $target) |
|
30 | 30 | { |
31 | 31 | $matches = null; |
32 | 32 | preg_match_all($regexp, $target, $matches); |
@@ -17,7 +17,7 @@ |
||
17 | 17 | public static function getFirstMatch($regexp, $target) |
18 | 18 | { |
19 | 19 | preg_match_all($regexp, $target, $matches); |
20 | - $match = array_key_exists(0,$matches[1]) ? $matches[1][0] : null; |
|
20 | + $match = array_key_exists(0, $matches[1]) ? $matches[1][0] : null; |
|
21 | 21 | return $match; |
22 | 22 | } |
23 | 23 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | |
48 | 48 | /** |
49 | - * @param null $forcedRole |
|
49 | + * @param string|null $forcedRole |
|
50 | 50 | * @param null $locale |
51 | 51 | * @return Player |
52 | 52 | */ |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
151 | - * @param $locale |
|
151 | + * @param string $locale |
|
152 | 152 | * @return mixed |
153 | 153 | */ |
154 | 154 | private function nationalityFromLocale($locale) |
@@ -4,9 +4,9 @@ |
||
4 | 4 | namespace App\Lib\DsManager\Helpers; |
5 | 5 | |
6 | 6 | |
7 | -use App\Lib\DsManager\Models\Coach; |
|
8 | -use App\Lib\DsManager\Models\Player; |
|
9 | -use App\Lib\DsManager\Models\Team; |
|
7 | +use App\Lib\DsManager\Models\Coach; |
|
8 | +use App\Lib\DsManager\Models\Player; |
|
9 | +use App\Lib\DsManager\Models\Team; |
|
10 | 10 | use App\Lib\Helpers\Config; |
11 | 11 | |
12 | 12 | /** |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function testIlluminateConnection() |
14 | 14 | { |
15 | - Illuminate\Database\Capsule\Manager::schema()->create('test', function ($table) { |
|
15 | + Illuminate\Database\Capsule\Manager::schema()->create('test', function($table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('email')->unique(); |
18 | 18 | $table->timestamps(); |
@@ -44,7 +44,9 @@ discard block |
||
44 | 44 | $val -= rand(1, 3); |
45 | 45 | $val += $this->onRoleModifier(); |
46 | 46 | $val += $this->spareChange(); |
47 | - if ($val < 0) $val = $val * -1; |
|
47 | + if ($val < 0) { |
|
48 | + $val = $val * -1; |
|
49 | + } |
|
48 | 50 | $val = round($val, 2); |
49 | 51 | return $val; |
50 | 52 | } |
@@ -57,7 +59,9 @@ discard block |
||
57 | 59 | if ($this->wageReq == null) { |
58 | 60 | $wage = round($this->getVal() / 10.0, 2); |
59 | 61 | $wage += $this->spareChange(); |
60 | - if ($wage < 0) $wage = $wage * -1; |
|
62 | + if ($wage < 0) { |
|
63 | + $wage = $wage * -1; |
|
64 | + } |
|
61 | 65 | $this->wageReq = round($wage, 2); |
62 | 66 | } |
63 | 67 | return $this->wageReq; |
@@ -80,13 +84,27 @@ discard block |
||
80 | 84 | */ |
81 | 85 | private function priceOnSkill() |
82 | 86 | { |
83 | - if ($this->skillAvg > 98) return 130.0; |
|
84 | - if ($this->skillAvg > 90) return 80.0; |
|
85 | - if ($this->skillAvg > 80) return 50.0; |
|
86 | - if ($this->skillAvg > 76) return 20.0; |
|
87 | - if ($this->skillAvg > 70) return 10.0; |
|
88 | - if ($this->skillAvg > 60) return 5.0; |
|
89 | - if ($this->skillAvg > 50) return 2.0; |
|
87 | + if ($this->skillAvg > 98) { |
|
88 | + return 130.0; |
|
89 | + } |
|
90 | + if ($this->skillAvg > 90) { |
|
91 | + return 80.0; |
|
92 | + } |
|
93 | + if ($this->skillAvg > 80) { |
|
94 | + return 50.0; |
|
95 | + } |
|
96 | + if ($this->skillAvg > 76) { |
|
97 | + return 20.0; |
|
98 | + } |
|
99 | + if ($this->skillAvg > 70) { |
|
100 | + return 10.0; |
|
101 | + } |
|
102 | + if ($this->skillAvg > 60) { |
|
103 | + return 5.0; |
|
104 | + } |
|
105 | + if ($this->skillAvg > 50) { |
|
106 | + return 2.0; |
|
107 | + } |
|
90 | 108 | return 0.5; |
91 | 109 | |
92 | 110 | } |
@@ -96,12 +114,24 @@ discard block |
||
96 | 114 | */ |
97 | 115 | private function onAgeModifier() |
98 | 116 | { |
99 | - if ($this->age > 32) return -0.5; |
|
100 | - if ($this->age > 30) return -0.2; |
|
101 | - if ($this->age > 28) return -0.1; |
|
102 | - if ($this->age > 26) return 0.1; |
|
103 | - if ($this->age > 22) return 0.2; |
|
104 | - if ($this->age > 20) return 0.3; |
|
117 | + if ($this->age > 32) { |
|
118 | + return -0.5; |
|
119 | + } |
|
120 | + if ($this->age > 30) { |
|
121 | + return -0.2; |
|
122 | + } |
|
123 | + if ($this->age > 28) { |
|
124 | + return -0.1; |
|
125 | + } |
|
126 | + if ($this->age > 26) { |
|
127 | + return 0.1; |
|
128 | + } |
|
129 | + if ($this->age > 22) { |
|
130 | + return 0.2; |
|
131 | + } |
|
132 | + if ($this->age > 20) { |
|
133 | + return 0.3; |
|
134 | + } |
|
105 | 135 | return 0.5; |
106 | 136 | } |
107 | 137 |