fne/bga-pi - Change EDYQFPAG7JU6OJJXDMFZQOXCPXKMZNG63GJDBDUWMQTWHRHF7BMQC

Reorder material so that locations also have a name key.

Created by Fabian Neumann on January 30, 2018

EDYQFPAG7JU6OJJXDMFZQOXCPXKMZNG63GJDBDUWMQTWHRHF7BMQC

Dependencies

In channels

81b54c6735b6845b7c95ed4f70f9f353e3fad2b8

main

Change contents

Insertion in material.inc.php at line 42 [4.80305]

[2.7315]

[3.6322]

  ),
);
/**
 * THE LOCATIONS
 *
 * Backend and frontend data.
 *
 * `sid`: string id, for easier overview here
 *
 * `coords`: The (top, left, rotation) coords (in percent) of the location slot
 * (middle); the crime and suspect slot locations can be calculated from this.
 *
 * `neighbors`: ids of adjacent locations
 *
 * slots: 1 => crime, 2 => suspect
 */
if (!defined('LOC_LAKESIDE')) { // guard since this included multiple times
  define("LOC_LAKESIDE", 1);
  define("LOC_FORESTPARK", 2);
  define('LOC_LITTLEITALY', 3);
  define('LOC_TROCADERO', 4);
  define('LOC_OCEANDRIVE', 5);
  define('LOC_CHINATOWN', 6);
  define('LOC_CENTRALSTATION', 7);
  define('LOC_MAINSTREET', 8);
  define('LOC_ROADHOUSE', 9);
  define('LOC_UNIONSQUARE', 10);
  define('LOC_DOWNTOWN', 11);
  define('LOC_RICKSCAFE', 12);
  define('LOC_WATERFRONT', 13);
  define('LOC_SKIDROW', 14);
}
$this->locations = array(
  LOC_LAKESIDE => array(
    'name' => clienttranslate('Lakeside'),
    'neighbors' => array(LOC_FORESTPARK, LOC_TROCADERO, LOC_LITTLEITALY),
    'coords' => array(4.2, 27.8, 0),
  ),
  LOC_FORESTPARK => array(
    'name' => clienttranslate('Forest Park'),
    'neighbors' => array(LOC_OCEANDRIVE, LOC_TROCADERO, LOC_LAKESIDE),
    'coords' => array(3.8, 51.9, 2.5),
  ),
  LOC_LITTLEITALY => array(
    'name' => clienttranslate('Little Italy'),
    'neighbors' => array(LOC_LAKESIDE, LOC_TROCADERO, LOC_CENTRALSTATION, LOC_CHINATOWN),
    'coords' => array(23.5, 15.0, 2.0),
  ),
  LOC_TROCADERO => array(
    'name' => clienttranslate('Trocadero'),
    'neighbors' => array(LOC_LAKESIDE, LOC_FORESTPARK, LOC_OCEANDRIVE, LOC_MAINSTREET, LOC_CENTRALSTATION, LOC_LITTLEITALY),
    'coords' => array(23.2, 39.7, 0),
  ),
  LOC_OCEANDRIVE => array(
    'name' => clienttranslate('Ocean Drive'),
    'neighbors' => array(LOC_FORESTPARK, LOC_ROADHOUSE, LOC_MAINSTREET, LOC_TROCADERO),
    'coords' => array(23.9, 64.2, 1.3),
  ),
  LOC_CHINATOWN => array(
    'name' => clienttranslate('China Town'),
    'neighbors' => array(LOC_LITTLEITALY, LOC_CENTRALSTATION, LOC_UNIONSQUARE),
    'coords' => array(43.2, 2.8, 0),

Insertion in material.inc.php at line 109 [4.80305]

[3.6327]

[5.246814]

  LOC_CENTRALSTATION => array(
    'name' => clienttranslate('Central Station'),
    'neighbors' => array(LOC_LITTLEITALY, LOC_TROCADERO, LOC_MAINSTREET, LOC_DOWNTOWN, LOC_UNIONSQUARE, LOC_CHINATOWN),
    'coords' => array(43.2, 27.5, 1.15),
  ),
  LOC_MAINSTREET => array(
    'name' => clienttranslate('Main Street'),
    'neighbors' => array(LOC_TROCADERO, LOC_OCEANDRIVE, LOC_ROADHOUSE, LOC_RICKSCAFE, LOC_DOWNTOWN, LOC_CENTRALSTATION),
    'coords' => array(42.5, 51.8, 0),
  ),
  LOC_ROADHOUSE => array(
    'name' => clienttranslate('Road House'),
    'neighbors' => array(LOC_OCEANDRIVE, LOC_RICKSCAFE, LOC_MAINSTREET),
    'coords' => array(43.4, 76.2, 1.7),
  ),
  LOC_UNIONSQUARE => array(
    'name' => clienttranslate('Union Square'),
    'neighbors' => array(LOC_CHINATOWN, LOC_CENTRALSTATION, LOC_DOWNTOWN, LOC_WATERFRONT),
    'coords' => array(63.0, 15.3, -1.5),
  ),
  LOC_DOWNTOWN => array(
    'name' => clienttranslate('Downtown'),
    'neighbors' => array(LOC_CENTRALSTATION, LOC_MAINSTREET, LOC_RICKSCAFE, LOC_SKIDROW, LOC_WATERFRONT, LOC_UNIONSQUARE),
    'coords' => array(63.1, 39.4, 0),
  ),
  LOC_RICKSCAFE => array(
    'name' => clienttranslate('Rick’s Café'),
    'neighbors' => array(LOC_MAINSTREET, LOC_ROADHOUSE, LOC_SKIDROW, LOC_DOWNTOWN),
    'coords' => array(63.1, 64.1, 0),
  ),
  LOC_WATERFRONT => array(
    'name' => clienttranslate('Waterfront'),
    'neighbors' => array(LOC_UNIONSQUARE, LOC_DOWNTOWN, LOC_SKIDROW),
    'coords' => array(82.3, 27.4, 1.5),
  ),
  LOC_SKIDROW => array(
    'name' => clienttranslate('Skid Row'),
    'neighbors' => array(LOC_DOWNTOWN, LOC_RICKSCAFE, LOC_WATERFRONT),
    'coords' => array(82.5, 51.7, 0),
  ),

Insertion in material.inc.php at line 150 [4.80305]

[5.246817]

[4.80983]


// For each location create 3 slots; in the UI these will be anchors to orient
// our tiles on.
foreach ($this->locations as $loc_id => $loc) {
  $this->locations[$loc_id]['slots'] = array(
    'crime' => array('id' => $loc_id * 100 + 1),
    'location' => array('id' => $loc_id * 100 + 2),
    'suspect' => array('id' => $loc_id * 100 + 3),
  );
}

Replacement in material.inc.php at line 356 [4.80305]

B:BD[6.379581] → [6.379581:381237]

  29 => array('name' => clienttranslate('Lakeside'), 'nametr' => self::_('Lakeside'), 'tiletype' => 'location'),
  30 => array('name' => clienttranslate('Forest Park'), 'nametr' => self::_('Forest Park'), 'tiletype' => 'location'),
  31 => array('name' => clienttranslate('Little Italy'), 'nametr' => self::_('Little Italy'), 'tiletype' => 'location'),
  32 => array('name' => clienttranslate('Trocadero'), 'nametr' => self::_('Trocadero'), 'tiletype' => 'location'),
  33 => array('name' => clienttranslate('Ocean Drive'), 'nametr' => self::_('Ocean Drive'), 'tiletype' => 'location'),
  34 => array('name' => clienttranslate('China Town'), 'nametr' => self::_('China Town'), 'tiletype' => 'location'),
  35 => array('name' => clienttranslate('Central Station'), 'nametr' => self::_('Central Station'), 'tiletype' => 'location'),
  36 => array('name' => clienttranslate('Main Street'), 'nametr' => self::_('Main Street'), 'tiletype' => 'location'),
  37 => array('name' => clienttranslate('Road House'), 'nametr' => self::_('Road House'), 'tiletype' => 'location'),
  38 => array('name' => clienttranslate('Union Square'), 'nametr' => self::_('Union Square'), 'tiletype' => 'location'),
  39 => array('name' => clienttranslate('Downtown'), 'nametr' => self::_('Downtown'), 'tiletype' => 'location'),
  40 => array('name' => clienttranslate('Rick’s Café'), 'nametr' => self::_('Rick’s Café'), 'tiletype' => 'location'),
  41 => array('name' => clienttranslate('Waterfront'), 'nametr' => self::_('Waterfront'), 'tiletype' => 'location'),
  42 => array('name' => clienttranslate('Skid Row'), 'nametr' => self::_('Skid Row'), 'tiletype' => 'location'),

[6.379581]

[7.3199]

  29 => array('name' => $this->locations[LOC_LAKESIDE]['name'], 'nametr' => self::_('Lakeside'), 'tiletype' => 'location'),
  30 => array('name' => $this->locations[LOC_FORESTPARK]['name'], 'nametr' => self::_('Forest Park'), 'tiletype' => 'location'),
  31 => array('name' => $this->locations[LOC_LITTLEITALY]['name'], 'nametr' => self::_('Little Italy'), 'tiletype' => 'location'),
  32 => array('name' => $this->locations[LOC_TROCADERO]['name'], 'nametr' => self::_('Trocadero'), 'tiletype' => 'location'),
  33 => array('name' => $this->locations[LOC_OCEANDRIVE]['name'], 'nametr' => self::_('Ocean Drive'), 'tiletype' => 'location'),
  34 => array('name' => $this->locations[LOC_CHINATOWN]['name'], 'nametr' => self::_('China Town'), 'tiletype' => 'location'),
  35 => array('name' => $this->locations[LOC_CENTRALSTATION]['name'], 'nametr' => self::_('Central Station'), 'tiletype' => 'location'),
  36 => array('name' => $this->locations[LOC_MAINSTREET]['name'], 'nametr' => self::_('Main Street'), 'tiletype' => 'location'),
  37 => array('name' => $this->locations[LOC_ROADHOUSE]['name'], 'nametr' => self::_('Road House'), 'tiletype' => 'location'),
  38 => array('name' => $this->locations[LOC_UNIONSQUARE]['name'], 'nametr' => self::_('Union Square'), 'tiletype' => 'location'),
  39 => array('name' => $this->locations[LOC_DOWNTOWN]['name'], 'nametr' => self::_('Downtown'), 'tiletype' => 'location'),
  40 => array('name' => $this->locations[LOC_RICKSCAFE]['name'], 'nametr' => self::_('Rick’s Café'), 'tiletype' => 'location'),
  41 => array('name' => $this->locations[LOC_WATERFRONT]['name'], 'nametr' => self::_('Waterfront'), 'tiletype' => 'location'),
  42 => array('name' => $this->locations[LOC_SKIDROW]['name'], 'nametr' => self::_('Skid Row'), 'tiletype' => 'location'),

Deletion in material.inc.php at line 372 [4.80305]

B:BD[7.3203] → [7.3203:3555]

/**
 * THE LOCATIONS
 *
 * Backend and frontend data.
 *
 * `sid`: string id, for easier overview here
 *
 * `coords`: The (top, left, rotation) coords (in percent) of the location slot
 * (middle); the crime and suspect slot locations can be calculated from this.
 *
 * `neighbors`: ids of adjacent locations
 *
 * slots: 1 => crime, 2 => suspect
 */

Deletion in material.inc.php at line 373 [4.80305]

B:BD[6.381239] → [6.381239:381751]

B:BD[6.381752] → [6.381752:381753]

B:BD[6.381753] → [8.1282:1308]

∅:D[8.1308] → [6.381780:381906]

B:BD[6.381780] → [6.381780:381906]

B:BD[6.381906] → [8.1309:1346]

∅:D[8.1346] → [6.381944:382076]

B:BD[6.381944] → [6.381944:382076]

B:BD[6.382076] → [8.1347:1386]

∅:D[8.1386] → [6.382116:382269]

B:BD[6.382116] → [6.382116:382269]

B:BD[6.382269] → [8.1387:1427]

∅:D[8.1427] → [6.382309:382493]

B:BD[6.382309] → [6.382309:382493]

B:BD[6.382493] → [8.1428:1466]

∅:D[8.1466] → [6.382531:382680]

B:BD[6.382531] → [6.382531:382680]

B:BD[6.382680] → [8.1467:1507]

∅:D[8.1507] → [6.382720:382859]

B:BD[6.382720] → [6.382720:382859]

B:BD[6.382859] → [8.1508:1545]

∅:D[8.1545] → [6.382899:382935]

B:BD[6.382899] → [6.382899:382935]

∅:D[6.382935] → [7.3595:3628]

B:BD[7.3595] → [7.3595:3628]

B:BD[7.3628] → [6.382936:383056]

B:BD[6.383056] → [8.1546:1587]

∅:D[6.383096] → [7.3831:3836]

∅:D[8.1587] → [7.3831:3836]

B:BD[7.3831] → [7.3831:3836]

B:BD[7.3836] → [6.383097:383124]

∅:D[6.383124] → [7.3850:3879]

B:BD[7.3850] → [7.3850:3879]

B:BD[7.3879] → [6.383125:383246]

B:BD[6.383246] → [8.1588:1626]

∅:D[6.383286] → [7.4075:4080]

∅:D[8.1626] → [7.4075:4080]

B:BD[7.4075] → [7.4075:4080]

B:BD[7.4080] → [6.383287:383414]

B:BD[6.383414] → [8.1627:1667]

∅:D[8.1667] → [6.383454:383608]

B:BD[6.383454] → [6.383454:383608]

B:BD[6.383608] → [8.1668:1709]

∅:D[8.1709] → [6.383648:383828]

B:BD[6.383648] → [6.383648:383828]

B:BD[6.383828] → [8.1710:1748]

∅:D[8.1748] → [6.383866:383897]

B:BD[6.383866] → [6.383866:383897]

∅:D[6.383897] → [7.4094:4122]

B:BD[7.4094] → [7.4094:4122]

B:BD[7.4122] → [6.383898:383982]

B:BD[6.383982] → [8.1749:1787]

∅:D[8.1787] → [6.384022:384153]

B:BD[6.384022] → [6.384022:384153]

B:BD[6.384153] → [8.1788:1828]

∅:D[6.384193] → [7.4330:4335]

∅:D[8.1828] → [7.4330:4335]

B:BD[7.4330] → [7.4330:4335]

B:BD[7.4335] → [6.384194:384315]

B:BD[6.384315] → [8.1829:1867]

∅:D[6.384355] → [7.4588:4597]

∅:D[8.1867] → [7.4588:4597]

B:BD[7.4588] → [7.4588:4597]

B:BD[7.4597] → [8.1868:1964]

∅:D[8.1964] → [7.4597:4645]

B:BD[7.4597] → [7.4597:4645]

B:BD[7.4691] → [7.4691:4737]

B:BD[7.4737] → [8.1965:2233]

∅:D[8.2233] → [7.5433:5440]

∅:D[9.421728] → [7.5433:5440]

B:BD[7.5433] → [7.5433:5440]

B:BD[7.5440] → [2.7316:7317]

if (!defined('LOC_LAKESIDE')) { // guard since this included multiple times
  define("LOC_LAKESIDE", 1);
  define("LOC_FORESTPARK", 2);
  define('LOC_LITTLEITALY', 3);
  define('LOC_TROCADERO', 4);
  define('LOC_OCEANDRIVE', 5);
  define('LOC_CHINATOWN', 6);
  define('LOC_CENTRALSTATION', 7);
  define('LOC_MAINSTREET', 8);
  define('LOC_ROADHOUSE', 9);
  define('LOC_UNIONSQUARE', 10);
  define('LOC_DOWNTOWN', 11);
  define('LOC_RICKSCAFE', 12);
  define('LOC_WATERFRONT', 13);
  define('LOC_SKIDROW', 14);
}
$this->locations = array(
  LOC_LAKESIDE => array(
    'strid' => 'lakeside',
    'neighbors' => array(LOC_FORESTPARK, LOC_TROCADERO, LOC_LITTLEITALY),
    'coords' => array(4.2, 27.8, 0),
  ),
  LOC_FORESTPARK => array(
    'strid' => 'forestpark',
    'neighbors' => array(LOC_OCEANDRIVE, LOC_TROCADERO, LOC_LAKESIDE),
    'coords' => array(3.8, 51.9, 2.5),
  ),
  LOC_LITTLEITALY => array(
    'strid' => 'littleitaly',
    'neighbors' => array(LOC_LAKESIDE, LOC_TROCADERO, LOC_CENTRALSTATION, LOC_CHINATOWN),
    'coords' => array(23.5, 15.0, 2.0),
  ),
  LOC_TROCADERO => array(
    'strid' => 'trocadero',
    'neighbors' => array(LOC_LAKESIDE, LOC_FORESTPARK, LOC_OCEANDRIVE, LOC_MAINSTREET, LOC_CENTRALSTATION, LOC_LITTLEITALY),
    'coords' => array(23.2, 39.7, 0),
  ),
  LOC_OCEANDRIVE => array(
    'strid' => 'oceandrive',
    'neighbors' => array(LOC_FORESTPARK, LOC_ROADHOUSE, LOC_MAINSTREET, LOC_TROCADERO),
    'coords' => array(23.9, 64.2, 1.3),
  ),
  LOC_CHINATOWN => array(
    'strid' => 'chinatown',
    'neighbors' => array(LOC_LITTLEITALY, LOC_CENTRALSTATION, LOC_UNIONSQUARE),
    'coords' => array(43.2, 2.8, 0),
  ),
  LOC_CENTRALSTATION => array(
    'strid' => 'centralstation',
    'neighbors' => array(LOC_LITTLEITALY, LOC_TROCADERO, LOC_MAINSTREET, LOC_DOWNTOWN, LOC_UNIONSQUARE, LOC_CHINATOWN),
    'coords' => array(43.2, 27.5, 1.15),
  ),
  LOC_MAINSTREET => array(
    'strid' => 'mainstreet',
    'neighbors' => array(LOC_TROCADERO, LOC_OCEANDRIVE, LOC_ROADHOUSE, LOC_RICKSCAFE, LOC_DOWNTOWN, LOC_CENTRALSTATION),
    'coords' => array(42.5, 51.8, 0),
  ),
  LOC_ROADHOUSE => array(
    'strid' => 'roadhouse',
    'neighbors' => array(LOC_OCEANDRIVE, LOC_RICKSCAFE, LOC_MAINSTREET),
    'coords' => array(43.4, 76.2, 1.7),
  ),
  LOC_UNIONSQUARE => array(
    'strid' => 'unionsquare',
    'neighbors' => array(LOC_CHINATOWN, LOC_CENTRALSTATION, LOC_DOWNTOWN, LOC_WATERFRONT),
    'coords' => array(63.0, 15.3, -1.5),
  ),
  LOC_DOWNTOWN => array(
    'strid' => 'downtown',
    'neighbors' => array(LOC_CENTRALSTATION, LOC_MAINSTREET, LOC_RICKSCAFE, LOC_SKIDROW, LOC_WATERFRONT, LOC_UNIONSQUARE),
    'coords' => array(63.1, 39.4, 0),
  ),
  LOC_RICKSCAFE => array(
    'strid' => 'rickscafe',
    'neighbors' => array(LOC_MAINSTREET, LOC_ROADHOUSE, LOC_SKIDROW, LOC_DOWNTOWN),
    'coords' => array(63.1, 64.1, 0),
  ),
  LOC_WATERFRONT => array(
    'strid' => 'waterfront',
    'neighbors' => array(LOC_UNIONSQUARE, LOC_DOWNTOWN, LOC_SKIDROW),
    'coords' => array(82.3, 27.4, 1.5),
  ),
  LOC_SKIDROW => array(
    'strid' => 'skidrow',
    'neighbors' => array(LOC_DOWNTOWN, LOC_RICKSCAFE, LOC_WATERFRONT),
    'coords' => array(82.5, 51.7, 0),
  ),
);
// For each location create 3 slots; in the UI these will be anchors to orient
// our tiles on.
foreach ($this->locations as $loc_id => $loc) {
  $this->locations[$loc_id]['slots'] = array(
    'crime' => array('id' => $loc_id * 100 + 1, 'strid' => $loc['strid'] . '_crime'),
    'location' => array('id' => $loc_id * 100 + 2, 'strid' => $loc['strid'] . '_location'),
    'suspect' => array('id' => $loc_id * 100 + 3, 'strid' => $loc['strid'] . '_suspect'),
  );
}