Completed
Push — master ( 24e320...176aa1 )
by Vincenzo
04:45 queued 57s
created
api/database/migrations/CreateTeamTable.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -4,19 +4,19 @@
 block discarded – undo
4 4
 
5 5
 class CreateTeamTable
6 6
 {
7
-    /**
8
-     * Run the migrations.
9
-     *
10
-     * @return void
11
-     */
12
-    public function run()
13
-    {
14
-        Capsule::schema()->dropIfExists('teams');
15
-        Capsule::schema()->create('teams', function ($table) {
16
-            $table->increments('id');
17
-            $table->string('name');
18
-            $table->string('nationality',2);
19
-            $table->timestamps();
20
-        });
21
-    }
7
+	/**
8
+	 * Run the migrations.
9
+	 *
10
+	 * @return void
11
+	 */
12
+	public function run()
13
+	{
14
+		Capsule::schema()->dropIfExists('teams');
15
+		Capsule::schema()->create('teams', function ($table) {
16
+			$table->increments('id');
17
+			$table->string('name');
18
+			$table->string('nationality',2);
19
+			$table->timestamps();
20
+		});
21
+	}
22 22
 }
Please login to merge, or discard this patch.
api/database/migrations/CreateCoachesTable.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -4,35 +4,35 @@
 block discarded – undo
4 4
 
5 5
 class CreateCoachesTable
6 6
 {
7
-    /**
8
-     * Run the migrations.
9
-     *
10
-     * @return void
11
-     */
12
-    public function run()
13
-    {
14
-        Capsule::schema()->dropIfExists('coaches');
15
-        Capsule::schema()->create('coaches', function ($table) {
16
-            $table->increments('id');
17
-            $table->string('name');
18
-            $table->string('surname');
19
-            $table->tinyInteger('age');
20
-            $table->string('nationality',2);
21
-            $table->float('skillAvg');
22
-            $table->float('wageReq');
23
-            $table->string('favouriteModule',10);
24
-            $table->integer('team_id')->nullable();
25
-            $table->timestamps();
26
-        });
27
-    }
7
+	/**
8
+	 * Run the migrations.
9
+	 *
10
+	 * @return void
11
+	 */
12
+	public function run()
13
+	{
14
+		Capsule::schema()->dropIfExists('coaches');
15
+		Capsule::schema()->create('coaches', function ($table) {
16
+			$table->increments('id');
17
+			$table->string('name');
18
+			$table->string('surname');
19
+			$table->tinyInteger('age');
20
+			$table->string('nationality',2);
21
+			$table->float('skillAvg');
22
+			$table->float('wageReq');
23
+			$table->string('favouriteModule',10);
24
+			$table->integer('team_id')->nullable();
25
+			$table->timestamps();
26
+		});
27
+	}
28 28
 
29
-    /**
30
-     * Reverse the migrations.
31
-     *
32
-     * @return void
33
-     */
34
-    public function down()
35
-    {
36
-        Schema::drop('coaches');
37
-    }
29
+	/**
30
+	 * Reverse the migrations.
31
+	 *
32
+	 * @return void
33
+	 */
34
+	public function down()
35
+	{
36
+		Schema::drop('coaches');
37
+	}
38 38
 }
Please login to merge, or discard this patch.
api/database/migrations/CreatePlayersTable.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -4,26 +4,26 @@
 block discarded – undo
4 4
 
5 5
 class CreatePlayersTable
6 6
 {
7
-    /**
8
-     * Run the migrations.
9
-     *
10
-     * @return void
11
-     */
12
-    public function run()
13
-    {
14
-        Capsule::schema()->dropIfExists('players');
15
-        Capsule::schema()->create('players', function ($table) {
16
-            $table->increments('id');
17
-            $table->string('name');
18
-            $table->string('surname');
19
-            $table->tinyInteger('age');
20
-            $table->string('nationality',2);
21
-            $table->float('skillAvg');
22
-            $table->float('wageReq');
23
-            $table->float('val');
24
-            $table->string('role',2);
25
-            $table->integer('team_id')->nullable();
26
-            $table->timestamps();
27
-        });
28
-    }
7
+	/**
8
+	 * Run the migrations.
9
+	 *
10
+	 * @return void
11
+	 */
12
+	public function run()
13
+	{
14
+		Capsule::schema()->dropIfExists('players');
15
+		Capsule::schema()->create('players', function ($table) {
16
+			$table->increments('id');
17
+			$table->string('name');
18
+			$table->string('surname');
19
+			$table->tinyInteger('age');
20
+			$table->string('nationality',2);
21
+			$table->float('skillAvg');
22
+			$table->float('wageReq');
23
+			$table->float('val');
24
+			$table->string('role',2);
25
+			$table->integer('team_id')->nullable();
26
+			$table->timestamps();
27
+		});
28
+	}
29 29
 }
Please login to merge, or discard this patch.
api/tests/ModuleConfigurationTest.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,9 @@
 block discarded – undo
41 41
 			echo "\nto play $key\n";
42 42
 			$this->assertNotEmpty($module["roles"]);
43 43
 			foreach ($module["roles"] as $index => $playNum) {
44
-				if ($playNum != 0)
45
-					echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " ";
44
+				if ($playNum != 0) {
45
+									echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " ";
46
+				}
46 47
 			}
47 48
 		}
48 49
 	}
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Player.php 1 patch
Braces   +45 added lines, -15 removed lines patch added patch discarded remove patch
@@ -44,7 +44,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Match.php 1 patch
Indentation   +144 added lines, -144 removed lines patch added patch discarded remove patch
@@ -10,149 +10,149 @@
 block discarded – undo
10 10
  */
11 11
 class Match
12 12
 {
13
-    /**
14
-     * @var Team
15
-     */
16
-    private $homeTeam;
17
-    /**
18
-     * @var Team
19
-     */
20
-    private $awayTeam;
21
-
22
-    /**
23
-     * Match constructor.
24
-     * @param Team $home
25
-     * @param Team $away
26
-     */
27
-    public function __construct(Team $home, Team $away)
28
-    {
29
-        $this->homeTeam = $home;
30
-        $this->awayTeam = $away;
31
-    }
32
-
33
-    /**
34
-     * @return MatchResult
35
-     */
36
-    public function simulate()
37
-    {
38
-        $homePoints = $this->homeTeam->getAvgSkill();
39
-        $awayPoints = $this->awayTeam->getAvgSkill();
40
-
41
-        $homePoints += $this->malusModule(
42
-            $this->homeTeam->coach->favouriteModule,
43
-            $this->homeTeam->playersPerRoleArray()
44
-        );
45
-        $awayPoints += $this->malusModule(
46
-            $this->awayTeam->coach->favouriteModule,
47
-            $this->awayTeam->playersPerRoleArray()
48
-        );
49
-
50
-        $goalHome = 0;
51
-        $goalAway = 0;
52
-
53
-        if (Randomizer::boolOnPercentage(80)) {
54
-
55
-            if (($homePoints - $awayPoints) < 0) {
56
-                $goalAway = ($awayPoints - $homePoints) % 6;
57
-                $goalHome += $this->chance();
58
-                $goalAway += $this->chance();
59
-                $goalHome += $this->bonusHome();
60
-            } else {
61
-                $goalHome = ($homePoints - $awayPoints) % 6;
62
-                $goalAway += $this->chance();
63
-                $goalHome += $this->bonusHome();
64
-            }
65
-
66
-        } else {
67
-            $goalHome += $this->chance();
68
-            $goalAway += $this->chance();
69
-            $goalHome += $this->bonusHome();
70
-        }
71
-
72
-        $goalHome += $this->bonusAge($this->homeTeam);
73
-        $goalAway += $this->bonusAge($this->awayTeam);
74
-
75
-
76
-        //Bonus on Good GoalKeeper
77
-        $goalies = $this->homeTeam->getBestPlayerForRole("GK");
78
-        $goalAway -= $this->bonusGoalkeeper($goalies);
79
-        $goalies = $this->awayTeam->getBestPlayerForRole("GK");
80
-        $goalHome -= $this->bonusGoalkeeper($goalies);
81
-        //
82
-
83
-        $homeModule = new Module($this->homeTeam->coach->favouriteModule);
84
-        $awayModule = new Module($this->awayTeam->coach->favouriteModule);
85
-
86
-        if ($homeModule->isOffensive()) {
87
-            $goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
88
-            $goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;
89
-        }
90
-        if ($awayModule->isOffensive()) {
91
-            $goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
92
-            $goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;
93
-        }
94
-
95
-        if ($awayModule->isDefensive()) {
96
-            $goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;
97
-        }
98
-        if ($homeModule->isDefensive()) {
99
-            $goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;
100
-        }
101
-
102
-        $goalHome = $goalHome < 0 ? 0 : $goalHome;
103
-        $goalAway = $goalAway < 0 ? 0 : $goalAway;
104
-        return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);
105
-    }
106
-
107
-    private function bonusAge(Team $team)
108
-    {
109
-        if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {
110
-            return $this->chance();
111
-        }
112
-        return 0;
113
-    }
114
-
115
-    /**
116
-     * @param $goalkeeper
117
-     * @return int
118
-     */
119
-    private function bonusGoalKeeper($goalkeeper)
120
-    {
121
-
122
-        $skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;
123
-        return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);
124
-
125
-    }
126
-
127
-    /**
128
-     * @return int
129
-     */
130
-    private function chance()
131
-    {
132
-        return rand(0, 3);
133
-    }
134
-
135
-    /**
136
-     * @return int
137
-     */
138
-    private function bonusHome()
139
-    {
140
-        return Randomizer::boolOnPercentage(66) ? 1 : 0;
141
-    }
142
-
143
-    /**
144
-     * @param $moduleString
145
-     * @param $playersRoleArray
146
-     * @return int
147
-     */
148
-    private function malusModule($moduleString, $playersRoleArray)
149
-    {
150
-        $module = new Module($moduleString);
151
-        if ($module->isApplicableToArray($playersRoleArray)) {
152
-            return rand(1, 10);
153
-        } else {
154
-            return (-1) * rand(1, 10);
155
-        }
156
-    }
13
+	/**
14
+	 * @var Team
15
+	 */
16
+	private $homeTeam;
17
+	/**
18
+	 * @var Team
19
+	 */
20
+	private $awayTeam;
21
+
22
+	/**
23
+	 * Match constructor.
24
+	 * @param Team $home
25
+	 * @param Team $away
26
+	 */
27
+	public function __construct(Team $home, Team $away)
28
+	{
29
+		$this->homeTeam = $home;
30
+		$this->awayTeam = $away;
31
+	}
32
+
33
+	/**
34
+	 * @return MatchResult
35
+	 */
36
+	public function simulate()
37
+	{
38
+		$homePoints = $this->homeTeam->getAvgSkill();
39
+		$awayPoints = $this->awayTeam->getAvgSkill();
40
+
41
+		$homePoints += $this->malusModule(
42
+			$this->homeTeam->coach->favouriteModule,
43
+			$this->homeTeam->playersPerRoleArray()
44
+		);
45
+		$awayPoints += $this->malusModule(
46
+			$this->awayTeam->coach->favouriteModule,
47
+			$this->awayTeam->playersPerRoleArray()
48
+		);
49
+
50
+		$goalHome = 0;
51
+		$goalAway = 0;
52
+
53
+		if (Randomizer::boolOnPercentage(80)) {
54
+
55
+			if (($homePoints - $awayPoints) < 0) {
56
+				$goalAway = ($awayPoints - $homePoints) % 6;
57
+				$goalHome += $this->chance();
58
+				$goalAway += $this->chance();
59
+				$goalHome += $this->bonusHome();
60
+			} else {
61
+				$goalHome = ($homePoints - $awayPoints) % 6;
62
+				$goalAway += $this->chance();
63
+				$goalHome += $this->bonusHome();
64
+			}
65
+
66
+		} else {
67
+			$goalHome += $this->chance();
68
+			$goalAway += $this->chance();
69
+			$goalHome += $this->bonusHome();
70
+		}
71
+
72
+		$goalHome += $this->bonusAge($this->homeTeam);
73
+		$goalAway += $this->bonusAge($this->awayTeam);
74
+
75
+
76
+		//Bonus on Good GoalKeeper
77
+		$goalies = $this->homeTeam->getBestPlayerForRole("GK");
78
+		$goalAway -= $this->bonusGoalkeeper($goalies);
79
+		$goalies = $this->awayTeam->getBestPlayerForRole("GK");
80
+		$goalHome -= $this->bonusGoalkeeper($goalies);
81
+		//
82
+
83
+		$homeModule = new Module($this->homeTeam->coach->favouriteModule);
84
+		$awayModule = new Module($this->awayTeam->coach->favouriteModule);
85
+
86
+		if ($homeModule->isOffensive()) {
87
+			$goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
88
+			$goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;
89
+		}
90
+		if ($awayModule->isOffensive()) {
91
+			$goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
92
+			$goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;
93
+		}
94
+
95
+		if ($awayModule->isDefensive()) {
96
+			$goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;
97
+		}
98
+		if ($homeModule->isDefensive()) {
99
+			$goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;
100
+		}
101
+
102
+		$goalHome = $goalHome < 0 ? 0 : $goalHome;
103
+		$goalAway = $goalAway < 0 ? 0 : $goalAway;
104
+		return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);
105
+	}
106
+
107
+	private function bonusAge(Team $team)
108
+	{
109
+		if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {
110
+			return $this->chance();
111
+		}
112
+		return 0;
113
+	}
114
+
115
+	/**
116
+	 * @param $goalkeeper
117
+	 * @return int
118
+	 */
119
+	private function bonusGoalKeeper($goalkeeper)
120
+	{
121
+
122
+		$skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;
123
+		return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);
124
+
125
+	}
126
+
127
+	/**
128
+	 * @return int
129
+	 */
130
+	private function chance()
131
+	{
132
+		return rand(0, 3);
133
+	}
134
+
135
+	/**
136
+	 * @return int
137
+	 */
138
+	private function bonusHome()
139
+	{
140
+		return Randomizer::boolOnPercentage(66) ? 1 : 0;
141
+	}
142
+
143
+	/**
144
+	 * @param $moduleString
145
+	 * @param $playersRoleArray
146
+	 * @return int
147
+	 */
148
+	private function malusModule($moduleString, $playersRoleArray)
149
+	{
150
+		$module = new Module($moduleString);
151
+		if ($module->isApplicableToArray($playersRoleArray)) {
152
+			return rand(1, 10);
153
+		} else {
154
+			return (-1) * rand(1, 10);
155
+		}
156
+	}
157 157
 
158 158
 }
159 159
\ No newline at end of file
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Orm/Coach.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -9,31 +9,31 @@
 block discarded – undo
9 9
  */
10 10
 class Coach extends DsManagerOrm
11 11
 {
12
-    /**
13
-     * @var string
14
-     */
15
-    protected $table = 'coaches';
12
+	/**
13
+	 * @var string
14
+	 */
15
+	protected $table = 'coaches';
16 16
 
17
-    /**
18
-     * @var array
19
-     */
20
-    protected $fillable = [
21
-        'name',
22
-        'surname',
23
-        'age',
24
-        'nationality',
25
-        'skillAvg',
26
-        'wageReq',
27
-        'favouriteModule',
28
-        'team_id'
29
-    ];
17
+	/**
18
+	 * @var array
19
+	 */
20
+	protected $fillable = [
21
+		'name',
22
+		'surname',
23
+		'age',
24
+		'nationality',
25
+		'skillAvg',
26
+		'wageReq',
27
+		'favouriteModule',
28
+		'team_id'
29
+	];
30 30
 
31
-    /**
32
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
33
-     */
34
-    public function team()
35
-    {
36
-        return $this->belongsTo(Team::class);
37
-    }
31
+	/**
32
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
33
+	 */
34
+	public function team()
35
+	{
36
+		return $this->belongsTo(Team::class);
37
+	}
38 38
 
39 39
 } 
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Orm/DsManagerOrm.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@
 block discarded – undo
6 6
 
7 7
 abstract class DsManagerOrm extends Eloquent{
8 8
 
9
-    protected $hidden = [
10
-        'created_at',
11
-        'updated_at'
12
-    ];
9
+	protected $hidden = [
10
+		'created_at',
11
+		'updated_at'
12
+	];
13 13
 
14 14
 } 
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Coach.php 1 patch
Braces   +24 added lines, -8 removed lines patch added patch discarded remove patch
@@ -35,7 +35,9 @@  discard block
 block discarded – undo
35 35
 		if ($this->wageReq == null) {
36 36
 			$wage = $this->wageOnSkill();
37 37
 			$wage += $this->spareChange();
38
-			if ($wage < 0) $wage = $wage * (-1);
38
+			if ($wage < 0) {
39
+				$wage = $wage * (-1);
40
+			}
39 41
 			$this->wageReq = round($wage, 2);
40 42
 		}
41 43
 		return $this->wageReq;
@@ -46,13 +48,27 @@  discard block
 block discarded – undo
46 48
 	 */
47 49
 	private function wageOnSkill()
48 50
 	{
49
-		if ($this->skillAvg > 98) return 5.0;
50
-		if ($this->skillAvg > 90) return 3.5;
51
-		if ($this->skillAvg > 80) return 2.0;
52
-		if ($this->skillAvg > 76) return 1.5;
53
-		if ($this->skillAvg > 70) return 1.0;
54
-		if ($this->skillAvg > 60) return .76;
55
-		if ($this->skillAvg > 50) return .20;
51
+		if ($this->skillAvg > 98) {
52
+			return 5.0;
53
+		}
54
+		if ($this->skillAvg > 90) {
55
+			return 3.5;
56
+		}
57
+		if ($this->skillAvg > 80) {
58
+			return 2.0;
59
+		}
60
+		if ($this->skillAvg > 76) {
61
+			return 1.5;
62
+		}
63
+		if ($this->skillAvg > 70) {
64
+			return 1.0;
65
+		}
66
+		if ($this->skillAvg > 60) {
67
+			return .76;
68
+		}
69
+		if ($this->skillAvg > 50) {
70
+			return .20;
71
+		}
56 72
 		return 0.5;
57 73
 
58 74
 	}
Please login to merge, or discard this patch.