diff --git a/src/AppBundle/Command/ImportStdCommand.php b/src/AppBundle/Command/ImportStdCommand.php index 409adfa..5cad464 100644 --- a/src/AppBundle/Command/ImportStdCommand.php +++ b/src/AppBundle/Command/ImportStdCommand.php @@ -759,6 +759,7 @@ protected function importObligationData(Card $card, $data) 'boost', 'boost_star', 'scheme_acceleration', + 'scheme_amplify', 'scheme_crisis', 'scheme_hazard', ]; @@ -828,6 +829,7 @@ protected function importAllyData(Card $card, $data) 'attack_star', 'health_star', 'scheme_acceleration', + 'scheme_amplify', 'scheme_hazard', 'thwart_cost', 'thwart_star', @@ -860,6 +862,7 @@ protected function importEnvironmentData(Card $card, $data) { $optionalKeys = [ 'scheme_acceleration', + 'scheme_amplify', 'scheme_hazard', ]; foreach($optionalKeys as $key) { @@ -878,6 +881,7 @@ protected function importSideSchemeData(Card $card, $data) 'escalation_threat_fixed', 'escalation_threat_star', 'scheme_acceleration', + 'scheme_amplify', 'scheme_crisis', 'scheme_hazard', ]; @@ -895,6 +899,7 @@ protected function importMainSchemeData(Card $card, $data) 'escalation_threat_fixed', 'escalation_threat_star', 'scheme_acceleration', + 'scheme_amplify', 'scheme_crisis', 'scheme_hazard', 'stage', @@ -919,6 +924,7 @@ protected function importPlayerSideSchemeData(Card $card, $data) $optionalKeys = [ 'base_threat_fixed', 'scheme_acceleration', + 'scheme_amplify', 'scheme_crisis', 'scheme_hazard', ]; @@ -985,6 +991,7 @@ protected function importAttachmentData(Card $card, $data) 'boost_star', 'scheme', 'scheme_acceleration', + 'scheme_amplify', 'scheme_crisis', 'scheme_hazard', 'scheme_star', diff --git a/src/AppBundle/Entity/Card.php b/src/AppBundle/Entity/Card.php index d251ec0..423341a 100644 --- a/src/AppBundle/Entity/Card.php +++ b/src/AppBundle/Entity/Card.php @@ -77,6 +77,7 @@ public function serialize() { $optionalFields[] = 'resource_mental'; $optionalFields[] = 'resource_wild'; $optionalFields[] = 'scheme_acceleration'; + $optionalFields[] = 'scheme_amplify'; $optionalFields[] = 'scheme_crisis'; $optionalFields[] = 'scheme_hazard'; case 'ally': @@ -158,6 +159,7 @@ public function serialize() { $optionalFields[] = 'escalation_threat_fixed'; $optionalFields[] = 'escalation_threat_star'; $optionalFields[] = 'scheme_acceleration'; + $optionalFields[] = 'scheme_amplify'; $optionalFields[] = 'scheme_crisis'; $optionalFields[] = 'scheme_hazard'; break; @@ -2560,6 +2562,11 @@ public function getThreatStar() */ private $schemeAcceleration; + /** + * @var integer + */ + private $schemeAmplify; + /** * @var integer */ @@ -2614,6 +2621,30 @@ public function getSchemeAcceleration() return $this->schemeAcceleration; } + /** + * Set schemeAmplify + * + * @param integer $schemeAmplify + * + * @return Card + */ + public function setSchemeAmplify($schemeAmplify) + { + $this->schemeAmplify = $schemeAmplify; + + return $this; + } + + /** + * Get schemeAmplify + * + * @return integer + */ + public function getSchemeAmplify() + { + return $this->schemeAmplify; + } + /** * Set schemeHazard * diff --git a/src/AppBundle/Resources/config/doctrine/Card.orm.yml b/src/AppBundle/Resources/config/doctrine/Card.orm.yml index f8ed685..f50227e 100755 --- a/src/AppBundle/Resources/config/doctrine/Card.orm.yml +++ b/src/AppBundle/Resources/config/doctrine/Card.orm.yml @@ -195,6 +195,9 @@ AppBundle\Entity\Card: schemeAcceleration: type: smallint nullable: true + schemeAmplify: + type: smallint + nullable: true schemeHazard: type: smallint nullable: true diff --git a/src/AppBundle/Resources/public/css/icons.css b/src/AppBundle/Resources/public/css/icons.css index de92c41..66886ad 100755 --- a/src/AppBundle/Resources/public/css/icons.css +++ b/src/AppBundle/Resources/public/css/icons.css @@ -1,10 +1,8 @@ @font-face { font-family: 'marvel-icons'; - src: url('../fonts/marvel-icons.eot?4fzpq9'); - src: url('../fonts/marvel-icons.eot?4fzpq9#iefix') format('embedded-opentype'), - url('../fonts/marvel-icons.ttf?4fzpq9') format('truetype'), - url('../fonts/marvel-icons.woff?4fzpq9') format('woff'), - url('../fonts/marvel-icons.svg?4fzpq9#marvel-icons') format('svg'); + + src: url('../fonts/ChampionsIcons.ttf?') format('truetype'); + font-weight: normal; font-style: normal; } @@ -55,76 +53,50 @@ font-size: 32px; } .icon-crisis:before { - content: "\e900"; + content: "C"; } .icon-acceleration { font-size: 32px; } .icon-acceleration:before { - content: "\e901"; + content: "A"; +} +.icon-amplify { + font-size: 32px; +} +.icon-amplify:before { + content: "F"; } .icon-hazard { font-size: 32px; } .icon-hazard:before { - content: "\e902"; + content: "H"; } .icon-per_hero:before { - content: "\e903"; + content: "G"; } .icon-unique:before { - content: "\e904"; + content: "U"; } .icon-star:before { - content: "\e905"; + content: "S"; } .icon-boost:before { - content: "\e906"; + content: "B"; } .icon-cost:before { - content: "\e907"; -} -.icon-energy_fill:before { - content: "\e908"; - color: #86671b; -} -.icon-energy_outline:before { - content: "\e909"; - color: #f6be33; + content: "D"; } .icon-energy:before { - content: "\e90a"; -} -.icon-mental_fill:before { - content: "\e90b"; - color: #b7c9eb; -} -.icon-mental_outline:before { - content: "\e90c"; - color: #5c72c1; + content: "E"; } .icon-mental:before { - content: "\e90d"; -} -.icon-physical_fill:before { - content: "\e90e"; - color: #ee9080; -} -.icon-physical_outline:before { - content: "\e90f"; - color: #aa3220; + content: "M"; } .icon-physical:before { - content: "\e910"; -} -.icon-wild_fill:before { - content: "\e911"; - color: #45bc5c; -} -.icon-wild_outline:before { - content: "\e912"; - color: #247034; + content: "P"; } .icon-wild:before { - content: "\e913"; + content: "W"; } diff --git a/src/AppBundle/Resources/public/fonts/ChampionsIcons.ttf b/src/AppBundle/Resources/public/fonts/ChampionsIcons.ttf new file mode 100644 index 0000000..a8c4796 Binary files /dev/null and b/src/AppBundle/Resources/public/fonts/ChampionsIcons.ttf differ diff --git a/src/AppBundle/Resources/public/fonts/marvel-icons.eot b/src/AppBundle/Resources/public/fonts/marvel-icons.eot deleted file mode 100755 index bebe18a..0000000 Binary files a/src/AppBundle/Resources/public/fonts/marvel-icons.eot and /dev/null differ diff --git a/src/AppBundle/Resources/public/fonts/marvel-icons.svg b/src/AppBundle/Resources/public/fonts/marvel-icons.svg deleted file mode 100755 index 920cd29..0000000 --- a/src/AppBundle/Resources/public/fonts/marvel-icons.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AppBundle/Resources/public/fonts/marvel-icons.ttf b/src/AppBundle/Resources/public/fonts/marvel-icons.ttf deleted file mode 100755 index 6246889..0000000 Binary files a/src/AppBundle/Resources/public/fonts/marvel-icons.ttf and /dev/null differ diff --git a/src/AppBundle/Resources/public/fonts/marvel-icons.woff b/src/AppBundle/Resources/public/fonts/marvel-icons.woff deleted file mode 100755 index ca4fb36..0000000 Binary files a/src/AppBundle/Resources/public/fonts/marvel-icons.woff and /dev/null differ diff --git a/src/AppBundle/Resources/public/js/app.format.js b/src/AppBundle/Resources/public/js/app.format.js index 89c3d47..87a79f2 100755 --- a/src/AppBundle/Resources/public/js/app.format.js +++ b/src/AppBundle/Resources/public/js/app.format.js @@ -202,11 +202,14 @@ format.text = function text(card, alternate) { text = text.replace(/\[\[([^\]]+)\]\]/g, '$1'); text = text.replace(/\[(\w+)\]/g, ''); text = text.split("\n").join('

'); - if (card.scheme_acceleration || card.scheme_crisis || card.scheme_hazard) { + if (card.scheme_acceleration || card.scheme_crisis || card.scheme_amplify || card.scheme_hazard) { text += '

'; for (i = 0; i < (card.scheme_acceleration || 0); i++) { text += ''; } + for (i = 0; i < (card.scheme_amplify || 0); i++) { + text += ''; + } for (i = 0; i < (card.scheme_crisis || 0); i++) { text += ''; } diff --git a/src/AppBundle/Resources/views/Search/card-text.html.twig b/src/AppBundle/Resources/views/Search/card-text.html.twig index 9481820..3f765f9 100755 --- a/src/AppBundle/Resources/views/Search/card-text.html.twig +++ b/src/AppBundle/Resources/views/Search/card-text.html.twig @@ -2,6 +2,7 @@

{{ card.text|raw }} {% if card.scheme_acceleration %}{% for i in 1..card.scheme_acceleration %}{% endfor %}{% endif %} + {% if card.scheme_amplify %}{% for i in 1..card.scheme_amplify %}{% endfor %}{% endif %} {% if card.scheme_crisis %}{% for i in 1..card.scheme_crisis %}{% endfor %}{% endif %} {% if card.scheme_hazard %}{% for i in 1..card.scheme_hazard %}{% endfor %}{% endif %}
diff --git a/src/AppBundle/Services/CardsData.php b/src/AppBundle/Services/CardsData.php index 1975ddf..0c65220 100755 --- a/src/AppBundle/Services/CardsData.php +++ b/src/AppBundle/Services/CardsData.php @@ -43,6 +43,7 @@ public function replaceSymbols($text) '[boost]' => '', '[crisis]' => '', '[acceleration]' => '', + '[amplify]' => '', '[hazard]' => '' ]; $text = preg_replace("/\[\[([^\]]+)\]\]/", '${1}', $text);