mirror of
https://github.com/JeroenED/libpairtwo.git
synced 2024-12-01 18:51:32 +01:00
Renamed Sex to Gender
This commit is contained in:
parent
4db54e8f41
commit
0adad0fd91
@ -10,9 +10,9 @@ namespace JeroenED\Libpairtwo\Enums;
|
|||||||
|
|
||||||
use MyCLabs\Enum\Enum;
|
use MyCLabs\Enum\Enum;
|
||||||
|
|
||||||
class Sex extends Enum
|
class Gender extends Enum
|
||||||
{
|
{
|
||||||
const Neutral = 0; // Unforturnately, Incompatible with Pairtwo (Dinos)
|
const Neutral = 'X'; // Unforturnately, Incompatible with Pairtwo (Dinos)
|
||||||
const Male = 1;
|
const Male = 'M';
|
||||||
const Female = 2;
|
const Female = 'F';
|
||||||
}
|
}
|
@ -9,7 +9,7 @@
|
|||||||
namespace JeroenED\Libpairtwo\Models;
|
namespace JeroenED\Libpairtwo\Models;
|
||||||
|
|
||||||
use JeroenED\Libpairtwo\Enums\Title;
|
use JeroenED\Libpairtwo\Enums\Title;
|
||||||
use JeroenED\Libpairtwo\Enums\Sex;
|
use JeroenED\Libpairtwo\Enums\Gender;
|
||||||
use DateTime;
|
use DateTime;
|
||||||
|
|
||||||
class Player
|
class Player
|
||||||
@ -29,7 +29,7 @@ class Player
|
|||||||
private $Nation;
|
private $Nation;
|
||||||
private $Category;
|
private $Category;
|
||||||
private $Title;
|
private $Title;
|
||||||
private $Sex;
|
private $Gender;
|
||||||
private $NumberOfTies;
|
private $NumberOfTies;
|
||||||
private $Absent;
|
private $Absent;
|
||||||
|
|
||||||
@ -276,19 +276,19 @@ class Player
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Sex
|
* @return Gender
|
||||||
*/
|
*/
|
||||||
public function getSex(): Sex
|
public function getGender(): Gender
|
||||||
{
|
{
|
||||||
return $this->Sex;
|
return $this->Gender;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Sex $Sex
|
* @param Gender $Gender
|
||||||
*/
|
*/
|
||||||
public function setSex(Sex $Sex): void
|
public function setGender(Gender $Gender): void
|
||||||
{
|
{
|
||||||
$this->Sex = $Sex;
|
$this->Gender = $Gender;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
15
src/Sws.php
15
src/Sws.php
@ -27,7 +27,7 @@
|
|||||||
namespace JeroenED\Libpairtwo;
|
namespace JeroenED\Libpairtwo;
|
||||||
|
|
||||||
use JeroenED\Libpairtwo\Enums\Title;
|
use JeroenED\Libpairtwo\Enums\Title;
|
||||||
use JeroenED\Libpairtwo\Enums\Sex;
|
use JeroenED\Libpairtwo\Enums\Gender;
|
||||||
use JeroenED\Libpairtwo\Enums\Color;
|
use JeroenED\Libpairtwo\Enums\Color;
|
||||||
use JeroenED\Libpairtwo\Enums\Result;
|
use JeroenED\Libpairtwo\Enums\Result;
|
||||||
use JeroenED\Libpairtwo\Models\Sws as SwsModel;
|
use JeroenED\Libpairtwo\Models\Sws as SwsModel;
|
||||||
@ -304,7 +304,18 @@ class Sws extends SwsModel
|
|||||||
$offset += $length;
|
$offset += $length;
|
||||||
|
|
||||||
$length = 1;
|
$length = 1;
|
||||||
$player->setSex(new Sex(self::ReadData('Int', substr($swscontents, $offset, $length))));
|
switch (self::ReadData('Int', substr($swscontents, $offset, $length))) {
|
||||||
|
case 1:
|
||||||
|
$gender = 'M';
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
$gender = "F";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
$gender = "X";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
$player->setGender(new Gender($gender));
|
||||||
$offset += $length;
|
$offset += $length;
|
||||||
|
|
||||||
$length = 1;
|
$length = 1;
|
||||||
|
@ -53,6 +53,9 @@ echo "KBSB Elo P3: " . $sws->getTournament()->getPlayerById(2)->getKbsbElo() .
|
|||||||
echo "Name P1: " . $sws->getTournament()->getPlayerById(0)->getName() . PHP_EOL;
|
echo "Name P1: " . $sws->getTournament()->getPlayerById(0)->getName() . PHP_EOL;
|
||||||
echo "Name P2: " . $sws->getTournament()->getPlayerById(1)->getName() . PHP_EOL;
|
echo "Name P2: " . $sws->getTournament()->getPlayerById(1)->getName() . PHP_EOL;
|
||||||
echo "Name P3: " . $sws->getTournament()->getPlayerById(2)->getName() . PHP_EOL;
|
echo "Name P3: " . $sws->getTournament()->getPlayerById(2)->getName() . PHP_EOL;
|
||||||
|
echo "Gender P1: " . $sws->getTournament()->getPlayerById(0)->getGender()->getKey() . PHP_EOL;
|
||||||
|
echo "Gender P2: " . $sws->getTournament()->getPlayerById(1)->getGender()->getKey() . PHP_EOL;
|
||||||
|
echo "Gender P3: " . $sws->getTournament()->getPlayerById(2)->getGender()->getKey() . PHP_EOL;
|
||||||
echo "Absent P1: " . $sws->getTournament()->getPlayerById(0)->getAbsent() . PHP_EOL;
|
echo "Absent P1: " . $sws->getTournament()->getPlayerById(0)->getAbsent() . PHP_EOL;
|
||||||
echo "Absent P2: " . $sws->getTournament()->getPlayerById(1)->getAbsent() . PHP_EOL;
|
echo "Absent P2: " . $sws->getTournament()->getPlayerById(1)->getAbsent() . PHP_EOL;
|
||||||
echo "Absent P3: " . $sws->getTournament()->getPlayerById(2)->getAbsent() . PHP_EOL;
|
echo "Absent P3: " . $sws->getTournament()->getPlayerById(2)->getAbsent() . PHP_EOL;
|
||||||
|
Loading…
Reference in New Issue
Block a user