fne/bga-pi - Change D5XJXJK472U7GYOBKYYGEMO5B3QM2OBDM5NWMYRNCZ2A7Z2HNFVAC

WIP

Created by Fabian Neumann on January 30, 2018

D5XJXJK472U7GYOBKYYGEMO5B3QM2OBDM5NWMYRNCZ2A7Z2HNFVAC

Dependencies

In channels

main

81b54c6735b6845b7c95ed4f70f9f353e3fad2b8

Change contents

File addition: investigators.png (-rw-r--r--)
[3.81450]

Deletion in pi.css at line 107 [3.1107565]

B:BD[3.1110162] → [3.1110162:1110163]

B:BD[3.1110163] → [4.148:181]

∅:D[4.181] → [3.1110191:1110215]

B:BD[3.1110191] → [3.1110191:1110215]

B:BD[3.1110215] → [4.182:394]

∅:D[4.394] → [3.1110297:1110299]

B:BD[3.1110297] → [3.1110297:1110299]


.investigator {
    z-index:100;
    position: absolute;
    height:50px;
    width:50px;
    background-color: darkred;
    border: solid 0 rgba(0, 0, 0, 0.33);
    border-width: 0 1px 1px 0;
    border-radius: 4px;
    box-shadow: 1px 1px 1px 0px rgba(0, 0, 0, 0.5);
}

Replacement in pi.css at line 129 [3.1107565]

B:BD[5.98] → [2.73901:73960]

.loccont .agentarea .cube20,
.loccont .agentarea .disc30 {

[5.98]

[2.73960]

.loccont .agentarea .investigator {

Deletion in pi.css at line 170 [3.1107565]

∅:D[6.629] → [4.526:1044]

B:BD[4.526] → [4.526:1044]

∅:D[4.1044] → [3.1110416:1110419]

B:BD[3.1110416] → [3.1110416:1110419]

B:BD[3.1110419] → [7.783:784]

.loc_tokens {
    position: absolute;
    height:50px;
    width:272px;
    text-align: center;
    background-color: #ffffff33;
}
.loc_tokens.loc_chinatown {
    top: 394px;
    left: 30px;
}
.loc_tokens.loc_forestpark {
    top: 52px;
    left: 596px;
    transform: rotate(2.5deg);
}
.loc_tokens.loc_trocadero {
    top:220px;
    left:452px;
    transform: rotate(1deg);
}
.loc_tokens .investigator {
    position:relative;
    display:inline-block;
}
.loc_tokens .investigator:last-of-type {
    margin-right:0;
}

Replacement in pi.css at line 200 [3.1107565]
B:BD[2.74165] → [2.74165:74184]
```
.locslot .cube25 {
```
[2.74165]
[2.74184]
```
.locslot .disc30 {
```
Deletion in pi.css at line 209 [3.1107565]
B:BD[2.74326] → [2.74326:74353]
```
    outline:solid 1px red;
```

Replacement in pi.css at line 210 [3.1107565]

B:BD[2.74355] → [2.74355:74486]

.locslot .locslot_discs {
    position: absolute;
    bottom:-4px;
    right:-4px;
    height:50px;
    outline:solid 1px green;
}

[2.74355]

[2.74486]

/* Bottom left */

Insertion in pi.css at line 217 [3.1107565]

[2.74813]

/* Top right, so we can still see the image and the cubes */
.locslot .disc30 {
    top:18px;
    left:33px;
}
/* Regarding multiple discs on one locslot: Yes, there can only ever be one disc
   on a tile. If a user manually moves one there it stays there, unless we find
   a full match later. Then we move it back to the agentarea. A full match is a
   full match, there is no sense in keeping a wrongly manually placed disc there
   then. This might count as a very very minor 'helping the player'; but it's
   really too obvious not to tell them. TODO: implement this in the backend. */
.investigator {
    z-index:100;
    position: relative;
    height:36px;
    width:36px;
    margin:3px;
    background-image: url("img/investigators.png");
    background-size:182px;
    border-radius: 4px;
    box-shadow: 1px 1px 1px 1px rgba(0, 0, 0, 0.75);
}
.investigator_red { background-position: 0px 0px }
.investigator_blue { background-position: -36px 0px }
.investigator_yellow { background-position: -72px 0px }
.investigator_green { background-position: -108px 0px }
.investigator_purple { background-position: -144px 0px }
.investigator .cube20,
.investigator .disc30 {
    position: absolute;
}
.investigator .disc30 {
    bottom:-1px;
    right:-2px;
 }
 .investigator > div:nth-of-type(1) { left: -5px; bottom:-2px; z-index:200; }
 .investigator > div:nth-of-type(2) { right: -5px; bottom:-2px; left:17px; z-index:200; }
 .investigator > div:nth-of-type(3) { left: -5px; bottom:13px; z-index:201; }

Replacement in pi.css at line 276 [3.1107565]
B:BD[2.75423] → [2.75423:75458]
```
    height: 30px;
    width: 30px;
```
[2.75423]
[2.75458]
```
    height: 25px;
    width: 25px;
```
Insertion in pi.css at line 279 [3.1107565]
[2.75514]
[2.75514]
```
    background-size: cover;
```

Replacement in pi.css at line 282 [3.1107565]

B:BD[2.75562] → [2.75562:76009]

.disc30_green { background-position: -30px 0px }
.disc30_beige { background-position: -60px 0px }
.disc30_orange { background-position: -90px 0px }
.disc30_white { background-position: -120px 0px }
.disc30_black { background-position: -150px 0px }
.disc30_red { background-position: -180px 0px }
.disc30_yellow { background-position: -210px 0px }
.disc30_gray { background-position: -240px 0px }
.disc30_purple { background-position: -270px 0px }

[2.75562]

.disc30_green { background-position: -25px 0px }
.disc30_beige { background-position: -50px 0px }
.disc30_orange { background-position: -75px 0px }
.disc30_white { background-position: -100px 0px }
.disc30_black { background-position: -125px 0px }
.disc30_red { background-position: -150px 0px }
.disc30_yellow { background-position: -175px 0px }
.disc30_gray { background-position: -200px 0px }
.disc30_purple { background-position: -225px 0px }

Insertion in pi.game.php at line 243 [3.1093769]

[6.898]

[8.575]

    function getLocationIdOfTile($tile)
    {
        // Assert that the tile is actually on the board.
        if ($tile['location'] != 'locslot') {
            throw new BgaVisibleSystemException("Tile is not on the board. Please report this.");
        }
        $tile_slot_id = $tile['location_arg'];
        return floor((int)$tile_slot_id / 100); // the invers of ($loc_id * 100 + 1|2|3)
    }

Replacement in pi.game.php at line 286 [3.1093769]

B:BD[8.989] → [8.989:1348]


        // Assert that the tile is actually on the board.
        if ($tile['location'] != 'locslot') {
            throw new BgaVisibleSystemException("Tile is not on the board. Please report this.");
        }
        $tile_slot_id = $tile['location_arg'];
        $location_mid = floor((int)$tile_slot_id / 100); // the invers of ($loc_id * 100 + 1|2|3)

[8.989]

[2.76973]

        $location_mid = $this->getLocationIdOfTile($tile);

Replacement in pi.game.php at line 327 [3.1093769]

B:BD[2.77153] → [2.77153:77285]

                $this->tokens->getTokensInLocation('agentarea_%'),
                $this->tokens->getTokensInLocation('locslot_%'))

[2.77153]

[9.819]

                array_values($this->tokens->getTokensInLocation('agentarea_%')),
                array_values($this->tokens->getTokensInLocation('locslot_%')))

Insertion in pi.game.php at line 405 [3.1093769]
[10.2265]
[10.2265]
```
        $token_location = "agentarea_{$location_id}";
```

Replacement in pi.game.php at line 413 [3.1093769]

B:BD[10.2597] → [2.77286:77393]

        if (count($this->tokens->getTokensOfTypeInLocation("pi_{$color}_%", "location_{$location_id}"))) {

[10.2597]

[10.2703]

        if (count($this->tokens->getTokensOfTypeInLocation("pi_{$color}_%", $token_location))) {

Replacement in pi.game.php at line 418 [3.1093769]

B:BD[2.77436] → [2.77436:77538]

        $this->tokens->pickTokensForLocation(1, "pi_supply_{$player_id}", "location_{$location_id}");

[2.77436]

[2.77538]

        $_temp = $this->tokens->pickTokensForLocation(1, "pi_supply_{$player_id}", $token_location);
        $pi_token = array_shift($_temp);
        self::notifyAllPlayers(
            'placeToken',
            clienttranslate('${player_name} sends an investigator to ${location_name}.'),
            array(
                'i18n' => array('location_name'),
                'token' => $pi_token,
                'target_id' => $token_location,
                'player_name' => $player['player_name'],
                'location_name' => $this->locations[$location_id]['name']
            ));

Insertion in pi.game.php at line 516 [3.1093769]
[11.10047]
[11.10726]
```
        // Some checks first
```
Deletion in pi.game.php at line 518 [3.1093769]
B:BD[11.10771] → [11.10771:10819]
```
        $player_id = self::getActivePlayerId();
```
Deletion in pi.game.php at line 519 [3.1093769]
B:BD[11.10875] → [8.2682:2755]
∅:D[8.2755] → [11.10875:10876]
B:BD[11.10875] → [11.10875:10876]
```
        $card_name = $this->cardBasis[$currentCard['type_arg']]['name'];
```

Insertion in pi.game.php at line 523 [3.1093769]

[11.11065]


        // Various infos we need
        $card_name = $this->cardBasis[$currentCard['type_arg']]['name'];
        $player_id = self::getActivePlayerId();
        $player = self::loadPlayersBasicInfos()[$player_id];
        $color = $this->constants['HEX2COLORNAME'][$player['player_color']];
        $tile = $this->getCorrespondingTile($currentCard['id']);
        $location_id = $this->getLocationIdOfTile($tile);
        $agent_area = "agentarea_{$location_id}";
        // The locslot to place a token on, in case of success
        $target_id = "locslot_{$tile['location_arg']}";

Insertion in pi.game.php at line 535 [3.1093769]
[11.11066]
[8.2756]
```
        // The solution
```

Replacement in pi.game.php at line 538 [3.1093769]

B:BD[11.11149] → [8.2819:2872]

        // Check for a match with the player's case.

[11.11149]

[8.2872]

        // Check for a full match with the player's case.

Replacement in pi.game.php at line 540 [3.1093769]

B:BD[8.2919] → [8.2919:2945]

B:BD[8.2945] → [10.3022:3740]

            // Full match
            // // TODO: Put player-colored disc onto the locslot (if not there already)
            // $discs = $this->tokens->getTokensOfTypeInLocation('disc_%', "supply_{$player_id}");
            // if (!$discs) {
            //     // The disc for this match is out there already; should be on the slot's parent location/agent slot.
            //     // TODO: find it and put it on the locslot
            // } else {
            //     $disc = array_shift($discs);
            // }
            // $disc = $this->tokens->getTokenOnTop('');
            // if (!$disc) {
            //     throw new BgaUserException(self::_("No more discs in your supply. You should be able to solve the case!"));
            // }

[8.2919]

[10.3740]

            // Get a disc to put on the tile.

Replacement in pi.game.php at line 542 [3.1093769]

B:BD[10.3741] → [10.3741:3774]

            // $newtokens = ...

[10.3741]

[10.3774]

            // First we check if there is already a dics at that *location*,
            // i.e. on an investigator tile. If so, we take it from there. Else
            // from our supply.
            $discs = $this->tokens->getTokensOfTypeInLocation("disc_{$color}_%", $agent_area);
            if (count($discs)) {
                $disc = array_shift($discs);
            } else {
                $disc = $this->tokens->getTokenOnTop("discs_{$player_id}");
            }
            if (!$disc) {
                throw new BgaUserException(self::_("No more discs in your supply. You should be able to solve the case!"));
            }

Deletion in pi.game.php at line 565 [3.1093769]

B:BD[8.3337] → [10.3893:3986]

                    // 'new_tokens' => ..., // or rather do this as a separate notification?

Insertion in pi.game.php at line 567 [3.1093769]

[8.3449]

                ));
            // Move token
            $this->tokens->moveToken($disc['key'], $target_id);
            self::notifyAllPlayers(
                'placeToken', '',
                array(
                    'token' => $disc,
                    'target_id' => $target_id,

Insertion in pi.game.php at line 577 [3.1093769]
[8.3469]
[8.3470]

Replacement in pi.game.php at line 594 [3.1093769]

B:BD[8.4012] → [2.81080:81133]

            // TODO: place token in DB and via Notif

[8.4012]

[11.11299]


            // First check if there is already a cube at that *location*, i.e.
            // on an investigator tile. If so, we take it from there. Else from
            // our supply.
            $cubes = $this->tokens->getTokensOfTypeInLocation("cube_{$color}_%", $agent_area);
            if (count($cubes)) {
                $cube = array_shift($cubes);
            } else {
                $cube = $this->tokens->getTokenOnTop("cubes_{$player_id}");
            }
            if (!$cube) {
                throw new BgaUserException(self::_("No more cubes in your supply!"));
            }
            // Put card on discard
            $this->cards->insertCardOnExtremePosition($card_id, "discard", true);

Replacement in pi.game.php at line 622 [3.1093769]

B:BD[11.11866] → [11.11866:11886]

B:BD[11.11886] → [8.4376:4493]

                ));
            // Put card on discard
            $this->cards->insertCardOnExtremePosition($card_id, "discard", true);

[11.11866]

[8.4493]

                )
            );
            // Move token
            $this->tokens->moveToken($cube['key'], $target_id);
            self::notifyAllPlayers(
                'placeToken', '',
                array(
                    'token' => $cube,
                    'target_id' => $target_id,
                )
            );

Replacement in pi.js at line 146 [3.1082103]

B:BD[9.1965] → [2.81353:81406]

            this.placeTokens(this.gamedatas.tokens);

[9.1965]

[7.6136]


            // Sort tokens: investigators need to be placed before cubes/discs.
            var tokens = this.gamedatas.tokens;
            tokens.sort(function (a, b) { return b.key.startsWith('pi_') - a.key.startsWith('pi_') });
            this.placeTokens(tokens);

Deletion in pi.js at line 337 [3.1082103]

B:BD[2.81708] → [2.81708:81990]

            var html;
            if (ttype == 'cube') {
                var html = '<div id="' + key + '" class="cube20 cube20_' + color + '"></div>';
            } else {
                var html = '<div id="' + key + '" class="disc30 disc30_' + color + '"></div>';
            }

Deletion in pi.js at line 338 [3.1082103]
B:BD[2.82020] → [2.82020:82064]
```
                target_id = token.location;
```

Replacement in pi.js at line 339 [3.1082103]

B:BD[2.82152] → [2.82152:82212]

                if (token.location.startsWith('locslot')) {

[2.82152]

[2.82212]

                // TODO: explain rules
                target_id = token.location;
                if (ttype == 'cube' && target_id.startsWith('locslot_')) {

Replacement in pi.js at line 345 [3.1082103]

B:BD[9.3974] → [2.82314:82355]

            dojo.place(html, target_id);

[9.3974]

            // Cubes/discs for 'agentarea_X' actually go onto the corresponding investigator there.
            if ((ttype == 'cube' || ttype == 'disc') && target_id.startsWith('agentarea')) {
                console.log(token, target_id);
                target_id = dojo.query('#' + target_id + ' .investigator_' + color)[0].id;
            }
            if (!$(key)) {
                var html;
                if (ttype == 'cube') {
                    var html = '<div id="' + key + '" class="cube20 cube20_' + color + '"></div>';
                } else if (ttype == 'disc') {
                    var html = '<div id="' + key + '" class="disc30 disc30_' + color + '"></div>';
                } else {
                    var html = '<div id="' + key + '" class="investigator investigator_' + color + '"></div>';
                }
                dojo.place(html, target_id);
            } else {
                this.slideToObject(key, target_id).play();
            }

Replacement in pi.js at line 564 [3.1082103]

B:BD[2.82739] → [2.82739:82812]

            this.placeToken(notif.args.token_key, notif.args.target_id);

[2.82739]

[2.82812]

            this.placeToken(notif.args.token, notif.args.target_id);

Deletion in pi_pi.tpl at line 21 [3.1076075]

∅:D[12.3460] → [7.8238:8302]

B:BD[13.6766] → [7.8238:8302]

∅:D[7.8302] → [3.1076642:1076900]

B:BD[3.1076642] → [3.1076642:1076900]

B:BD[3.1076900] → [4.5010:5208]

B:BD[3.1076967] → [3.1076967:1077350]

B:BD[3.1077350] → [4.5209:5341]

B:BD[4.5341] → [14.1412:1413]

∅:D[14.2214] → [4.5438:5522]

B:BD[4.5438] → [4.5438:5522]

B:BD[4.5522] → [11.20135:20220]

∅:D[11.20220] → [4.5607:5865]

B:BD[4.5607] → [4.5607:5865]

B:BD[4.5866] → [4.5866:5919]

B:BD[4.5919] → [11.20221:20288]

∅:D[11.20288] → [4.5986:6267]

B:BD[4.5986] → [4.5986:6267]

B:BD[3.1077438] → [4.6268:6464]

B:BD[4.6465] → [4.6465:6650]

B:BD[4.6650] → [7.8303:8319]

    <!-- <div class="disc" style="top:230px; left:150px"></div>
    <div class="disc red" style="top:100px; left:500px"></div>
    <div class="disc blue" style="top:150px; left:500px"></div>
    <div class="disc green" style="top:200px; left:500px"></div>
    <div class="disc purple" style="top:340px; left:440px"></div>
    <div class="disc yellow" style="top:240px; left:223px"></div>
    <div class="disc yellow" style="top:230px; left:223px"></div>
    <div class="disc yellow" style="top:220px; left:223px"></div>
    <div class="cube" style="top:330px; left:150px"></div>
    <div class="cube red" style="top:200px; left:500px"></div>
    <div class="cube blue" style="top:250px; left:500px"></div>
    <div class="cube green" style="top:300px; left:500px"></div>
    <div class="cube purple" style="top:400px; left:166px"></div>
    <div class="cube yellow" style="top:300px; left:200px"></div>
    <div class="cube yellow" style="top:250px; left:251px"></div>
    <div class="cube yellow" style="top:240px; left:251px"></div>
    <div class="investigator" style="background: red; top:218px; left:160px"></div>
    <div class="investigator" style="background: #fe0; top:218px; left:220px"></div>
    <div class="investigator" style="background: lime; top:218px; left:280px"></div>
    <div class="investigator" style="background: magenta; top:218px; left:340px"></div>
    <div class="investigator" style="background: blue; top:218px; left:400px"></div>
    <div class="loc_tokens loc_forestpark" style="">
        <div class="investigator" style="background: #fe0;"></div>
        <div class="investigator" style="background: magenta;"></div>
        <div class="investigator" style="background: red;"></div>
        <div class="investigator" style="background: lime;"></div>
        <div class="investigator" style="background: blue;"></div>
    </div>
    <div class="loc_tokens loc_chinatown" style="">
        <div class="investigator" style="background: red;"></div>
        <div class="investigator" style="background: blue;"></div>
    </div>
    <div class="loc_tokens loc_trocadero" style="">
        <div class="investigator" style="background: red;"></div>
        <div class="investigator" style="background: blue;"></div>
    </div> -->

Deletion in pi_pi.tpl at line 28 [3.1076075]

B:BD[2.83089] → [2.83089:83157]

          <div id="locslot_{ID}_discs" class="locslot_discs"></div>

WIP