From 6708dcc5024111ecca4f641bd53a450b593aeb8d Mon Sep 17 00:00:00 2001 From: mougy Date: Tue, 31 Dec 2024 04:50:46 +0000 Subject: [PATCH 1/2] add amplify icon and support for scheme_amplify --- src/AppBundle/Command/ImportStdCommand.php | 7 ++ src/AppBundle/Entity/Card.php | 31 ++++++++ .../Resources/config/doctrine/Card.orm.yml | 3 + src/AppBundle/Resources/public/css/icons.css | 70 ++++++------------ .../Resources/public/fonts/ChampionsIcons.ttf | Bin 0 -> 9972 bytes .../Resources/public/js/app.format.js | 5 +- .../views/Search/card-text.html.twig | 1 + src/AppBundle/Services/CardsData.php | 1 + 8 files changed, 68 insertions(+), 50 deletions(-) create mode 100644 src/AppBundle/Resources/public/fonts/ChampionsIcons.ttf diff --git a/src/AppBundle/Command/ImportStdCommand.php b/src/AppBundle/Command/ImportStdCommand.php index 409adfa..0b64754 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) { @@ -879,6 +882,7 @@ protected function importSideSchemeData(Card $card, $data) 'escalation_threat_star', 'scheme_acceleration', 'scheme_crisis', + 'scheme_amplify', 'scheme_hazard', ]; foreach($optionalKeys as $key) { @@ -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', @@ -920,6 +925,7 @@ protected function importPlayerSideSchemeData(Card $card, $data) 'base_threat_fixed', 'scheme_acceleration', 'scheme_crisis', + 'scheme_amplify', 'scheme_hazard', ]; foreach($optionalKeys as $key) { @@ -986,6 +992,7 @@ protected function importAttachmentData(Card $card, $data) 'scheme', 'scheme_acceleration', 'scheme_crisis', + 'scheme_amplify', 'scheme_hazard', 'scheme_star', ]; diff --git a/src/AppBundle/Entity/Card.php b/src/AppBundle/Entity/Card.php index d251ec0..0e93b9f 100644 --- a/src/AppBundle/Entity/Card.php +++ b/src/AppBundle/Entity/Card.php @@ -78,6 +78,7 @@ public function serialize() { $optionalFields[] = 'resource_wild'; $optionalFields[] = 'scheme_acceleration'; $optionalFields[] = 'scheme_crisis'; + $optionalFields[] = 'scheme_amplify'; $optionalFields[] = 'scheme_hazard'; case 'ally': $mandatoryFields[] = 'cost'; @@ -159,6 +160,7 @@ public function serialize() { $optionalFields[] = 'escalation_threat_star'; $optionalFields[] = 'scheme_acceleration'; $optionalFields[] = 'scheme_crisis'; + $optionalFields[] = 'scheme_amplify'; $optionalFields[] = 'scheme_hazard'; break; case "mainScheme": @@ -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 0000000000000000000000000000000000000000..a8c4796ec5b1f34117f4c55b57a6964b9262ab30 GIT binary patch literal 9972 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 literal 0 HcmV?d00001 diff --git a/src/AppBundle/Resources/public/js/app.format.js b/src/AppBundle/Resources/public/js/app.format.js index 89c3d47..4f962a5 100755 --- a/src/AppBundle/Resources/public/js/app.format.js +++ b/src/AppBundle/Resources/public/js/app.format.js @@ -202,7 +202,7 @@ 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 += ''; @@ -210,6 +210,9 @@ format.text = function text(card, alternate) { for (i = 0; i < (card.scheme_crisis || 0); i++) { text += ''; } + for (i = 0; i < (card.scheme_amplify || 0); i++) { + text += ''; + } for (i = 0; i < (card.scheme_hazard || 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..99c81dc 100755 --- a/src/AppBundle/Resources/views/Search/card-text.html.twig +++ b/src/AppBundle/Resources/views/Search/card-text.html.twig @@ -3,6 +3,7 @@ {{ card.text|raw }} {% if card.scheme_acceleration %}{% for i in 1..card.scheme_acceleration %}{% endfor %}{% endif %} {% if card.scheme_crisis %}{% for i in 1..card.scheme_crisis %}{% endfor %}{% endif %} + {% if card.scheme_amplify %}{% for i in 1..card.scheme_amplify %}{% endfor %}{% endif %} {% if card.scheme_hazard %}{% for i in 1..card.scheme_hazard %}{% endfor %}{% endif %} {% if (card.boost_star) or (card.boost is defined and card.boost > 0) %} 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); From 38819bc9032268d1ff05c74f0ed6a27fc8c98933 Mon Sep 17 00:00:00 2001 From: mougy Date: Mon, 6 Jan 2025 23:12:46 +0000 Subject: [PATCH 2/2] review --- src/AppBundle/Command/ImportStdCommand.php | 6 ++-- src/AppBundle/Entity/Card.php | 8 ++--- .../Resources/public/fonts/marvel-icons.eot | Bin 4168 -> 0 bytes .../Resources/public/fonts/marvel-icons.svg | 30 ------------------ .../Resources/public/fonts/marvel-icons.ttf | Bin 7340 -> 0 bytes .../Resources/public/fonts/marvel-icons.woff | Bin 7416 -> 0 bytes .../Resources/public/js/app.format.js | 6 ++-- .../views/Search/card-text.html.twig | 2 +- 8 files changed, 11 insertions(+), 41 deletions(-) delete mode 100755 src/AppBundle/Resources/public/fonts/marvel-icons.eot delete mode 100755 src/AppBundle/Resources/public/fonts/marvel-icons.svg delete mode 100755 src/AppBundle/Resources/public/fonts/marvel-icons.ttf delete mode 100755 src/AppBundle/Resources/public/fonts/marvel-icons.woff diff --git a/src/AppBundle/Command/ImportStdCommand.php b/src/AppBundle/Command/ImportStdCommand.php index 0b64754..5cad464 100644 --- a/src/AppBundle/Command/ImportStdCommand.php +++ b/src/AppBundle/Command/ImportStdCommand.php @@ -881,8 +881,8 @@ protected function importSideSchemeData(Card $card, $data) 'escalation_threat_fixed', 'escalation_threat_star', 'scheme_acceleration', - 'scheme_crisis', 'scheme_amplify', + 'scheme_crisis', 'scheme_hazard', ]; foreach($optionalKeys as $key) { @@ -924,8 +924,8 @@ protected function importPlayerSideSchemeData(Card $card, $data) $optionalKeys = [ 'base_threat_fixed', 'scheme_acceleration', - 'scheme_crisis', 'scheme_amplify', + 'scheme_crisis', 'scheme_hazard', ]; foreach($optionalKeys as $key) { @@ -991,8 +991,8 @@ protected function importAttachmentData(Card $card, $data) 'boost_star', 'scheme', 'scheme_acceleration', - 'scheme_crisis', 'scheme_amplify', + 'scheme_crisis', 'scheme_hazard', 'scheme_star', ]; diff --git a/src/AppBundle/Entity/Card.php b/src/AppBundle/Entity/Card.php index 0e93b9f..423341a 100644 --- a/src/AppBundle/Entity/Card.php +++ b/src/AppBundle/Entity/Card.php @@ -77,8 +77,8 @@ public function serialize() { $optionalFields[] = 'resource_mental'; $optionalFields[] = 'resource_wild'; $optionalFields[] = 'scheme_acceleration'; - $optionalFields[] = 'scheme_crisis'; $optionalFields[] = 'scheme_amplify'; + $optionalFields[] = 'scheme_crisis'; $optionalFields[] = 'scheme_hazard'; case 'ally': $mandatoryFields[] = 'cost'; @@ -159,8 +159,8 @@ public function serialize() { $optionalFields[] = 'escalation_threat_fixed'; $optionalFields[] = 'escalation_threat_star'; $optionalFields[] = 'scheme_acceleration'; - $optionalFields[] = 'scheme_crisis'; $optionalFields[] = 'scheme_amplify'; + $optionalFields[] = 'scheme_crisis'; $optionalFields[] = 'scheme_hazard'; break; case "mainScheme": @@ -2566,7 +2566,7 @@ public function getThreatStar() * @var integer */ private $schemeAmplify; - + /** * @var integer */ @@ -2621,7 +2621,7 @@ public function getSchemeAcceleration() return $this->schemeAcceleration; } - /** + /** * Set schemeAmplify * * @param integer $schemeAmplify 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 bebe18a2a06340101b09fd8fa32eb6ddf7e6aff6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4168 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 - - -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 62468898284103cc156db9aea7df4343c6a4814e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7340 zcma)B36LCDd48{7-}g*+PtSdH&#^nRJNKcLRy(U}rIoajR$kdy#by=6SGRQKx zFo(HJ@D*aH1cS|y5Xw1#fH?{m2^6jX6-Wrd}Er%+Ko}Qlf z{&)0y|Ns5R`v+l!kb+)^2x{)XuF*E4dh3}DL=Z;=W-P~q9Y^DuUJaLKaIa6B;qG<&LnfTM)ucUn19RaB zryYYqIe0~v_AU1+o$$38>{oG*k+CWmQQ3+xnCC?=t!_}g9FH+WxLihT@oW0Q+QiJZ zMt!TTdm>wOoSdIX_;^$GxWX$DmL(YT1T#@Bi$4ezj^`sP$4b0OIM;1Ewyb0gQxvd$ zxYWlC#u?krV)EUeNpf74@sBl0(zjHS(->oplgmZ7s6{O3Mp79*V!4hQbKwmoHl^z} zPTO|I)(g-V?`*f{aN4SWT8>uqNG+meWtPWGB``$va4(ecCOin_3F3z03L08ey5p^bjviKOl$`lgne{kqF$Sm&=+y{u0U!gYbz##(it|o8U>?*+P#WUibf6A(T*H+f?F<^?l|%f)C^uwN zh;}!|3xS@DlqJBoSHZxxPOsy19AF;UmP`BIQ`ZfP1vbG)3CJ>zh? z!?6tO*qoi7#4K?{B`z{V738?0q=ejX=AK3qD@l=8FyS>KNeSIB3lj{VFeOuwWPbJd zV~@S};fLQ#aNeCTRV^2lOpz!=CLkGx;Rv6Wq~nx_h9Vpp76r!zL^hg&;BbP78I2Pa zmM}z&T18#Qd_t9DqMDviGufqfr+eWMR*efR3zOmdc0c~a6OTVa4HgEzBJv=)2W`cZ=#2I{P|NcAhxxE2@cc3)+3^`7HM#$e@z*(@rz|e3_ ztzb1F9$QViCW8VyFx61;g&!%RsE*AJ$1$#DZhbAD$YyI;V7Ja;yfiy~Lp~OpaXPlB z9GH6R8wZOFn_~`5Z9IgTi5=VOSmdH{ystl4P{dci7GqOYB3?YcH8yy7`i4q+`_|ML zxEzdD&@}l0_>~<2-$Jc<*|Xg5^aI{e8`Gv}2<{wpF~55om>J`BL5UfvM2JAN;)X5# zwC@wl8(PvW-gN!2r%0|SZ`^e2^0?*!gh?))n4eGASy5)7lNQr>o#VHO8OK{*+TJjA zix{~^znLo54ZtzWiP@ZMF@$04n4cHH{9snErBkz;-3lw{g1+y%`Qt?+!|@O%pwr;% zpCq&BI`q)*?lAP6>st!U3biaDq2C^DkGDrQ1F%B9-Ag8ey3&vx!;!~?S}zbKSe}rL zp=86UoaQ47F$P(dNfjA>LqKY z#BkQ65py}hh+fXB7dX~#I-AeFt0u@I_iZaK$_hB{+E^l*2de<)hcFTbCx@(VB%s8-~T74|B89X_dmM&37mbQ zh~Ibd#0h+M^^1pAe=+S3mOH z3tu_-=0ARd`Q&f^^{LGtvKJllhSkUM@bB&;#*g-|{;2szd~ErlBlsUyH=mt;&7svl zyYcG_7~S|uSl8X4&kut>gLa1!Z-ugqQGMn<|k%azSqLGwS983)192$ZrO~xe{2fROw?vlsl(HoW@EW# z;q`Z7yt1X#oFZ{C8%LuP(I^MeH0&?A_AGgfdi3DM&|5R_!xEJ5J%QQEX%GGMQw81nb>3*{iF)~K2QkivQiYke% zu}WLd>b0@TY|NEaGw~KJZNyW#J-ssAn@zmWJv9tRhcm^h_S+?$C9JNueZSgjH4kR8 zDobe9t2U2R?*pH>`mxAVp|^+H0E&-K06sRrsRvo@mu&?6*h`xz|Gy1f!-#&T=LH=d z@Faw~j~GNC)Tmp)5*H*Ls5T{1p3Q)r2w38Kfw`yvNWxgz|NidNn(`NB+0m2Qo~u#t zfD^tysnLq1#?l|Ms_|5+FkP)qS97Tidrt3eR;$BkbZ(>Lj~||$J)BKBVCBxnR7FiB z<|b-QGjH~9$fP5hl1R?gCK_hJ)YICEAVj0XYPCu3KfOCXX@6LWaxA%J@5DrHKABPo zxp{B<*767SC|Ug@wUw(*Pgnh}gjdX4W_F+MhC{br$gF8#WrZ_v>H;O{jshzZ9+5;c_Xa?gE{86`4clUv7DUIYZ`}P=kUkVA&vW zG{EJ+59TNr!?>76YZPe#%BTsZ1Hj}`BHT8dOsI*D*&(5Vv24hSC8<#`S`3%9L$fEu$g#R2=H=F%lVjr?hG3);$#R*kj~`7V^t%-SADn8`=hG>RV@2OTzjNpQ$SYH2d<|(rP7{EmYy^*?v_ezO=G1m@7dEiZu52vLr3jg_T}6$G7=vEq9EwnUQkrxP(iOfD;NhQQ05!i!bUYe!7!PAQ(4 z^E`>uLptA2Bq9JD!g0EUw@L;FYMRiOQ+u%9Xtf?#T-@RhjMIDbp0~p*@;+Be~`BJHrcHM#` z%Zi=NEOxrH8*j-v-Q2c=ix2gC%3c6++-2A`6q_lUIV~~~C-=m2z7=2n*&P`?91hPE zOCkp`o}87Pa`~oqYl3%->Dk%yl`&c12@%uk_8r^r?somirmfp9*QyZH0X3x@TiAO# zl@?8&7g$jgqGD%kQsY~{3%T|B;GmeYYsuzdDO^ODP zO=zDw!|1YX3u2n=b2ZHD%SbVISEs$D1q$xEOd`>2wHFh~k|oKO)r>h@`oXT)D4mDs zBvO7hA$en>ei7+0O9S-~vtB8?KQI(`XIOFO4QIb zy^xA@z|(;@w91-Q12{;KvS2t-kRj+3VZ0it6+{J2mGO)Qi8pGg09xe|g!SOBz`M$# zT29Ec1uH^SH9<|H5ivHE@Y6FlmUAVGP)2+ znT73TO^{=qa%NzQJjY9-2wY)gT~DSrj3;(L(gY^R&gUoI4r}5G&k_y}BCu=`jwi`d zytoCNx2ZH2n#J*$9EGuTQ&`|Qm6a655Fv2mI7p(wk~mE>wA{w1s6gZ@*$zv15mX2A zlq~Z$X=^__oaA`9x02N2EU?U^xi`Q!M(wqql1ItgAQO*Df>kNOfkkiyf}i{0*!Qry z>+2ui_D`S5e*9jX_{Sxj`-SnPk2P0+wI0jTvyO^3!8DK#B_-DyR0aZpJYau_JA)Qr z2=adP$p~;-buFO+rWOuDLqH}N>jt%ycO6*$)(ewZ`gP&i=XZbg`GoN{ARP+OUPUu+w1^a*N+IPsC$otS) z*gw^P^#sT$k_pb!pcTFF=mDA$rmg9bIWPiY@}w1^G~Te^br_7*?} zcouwb{=!$Exz(8dU!<^a3L|^(Hd4Bk>hMs$Z3&sWic_0@4XF>ECq@=^f;295R z3Mq6Ln?W%)iSA;v=oa!DbcQ^H-UNMius5R>Rzau9*H9V0h}F>D?l}J6(XDbiZ|w7`27J=lVZUeB|~3 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 ca4fb3686c6a48c19fae9d9b3d20d4664e891ded..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7416 zcma)B36LCDd48{7-}g*+PtSdH&#^nRJNKcLRy(U}rIoZ=tt{DC#by? z3v-yufUz9{RD!|gs1TQP00DCpDgsno0VAf1mySA z$G!gBA2@z^h0?wNd0Lk~=JC__90S@{5Q@*z=b1Zi`t^zB!$%QHvQXZqPyFWUhfe?z zXw#4{(ntIv`!6TXT(}6dLy!-i8%o^b>2pVDy~{v@IidE0S($dkAgH_`=QH@S_B2~!U#hxBj_chF$fK&f}vj?{}0nx6hqUjK(?X+I)ENP ze}+)0j{Q2Wz+LVSX7HfjcC#36$L0kc!|l_uI&O7oajRKw;0{!4_aO=7K{J+P!iuAI zO|OPaGq~5M#c=n!{UH-}-D=XByn(r}h0~5fqZ|y;rFF}_N+%pPgZ(P*F)~&KBPv@F z2J^h=rPXz+m*X*J2$#!VTuB_50?6v!8l{vSxkQTf+WXf8UI|9Bz;pQIgK&q zIJsPOi(15jY9y86BbMu^F&9QCu_;}*aoV;swqAg`cze4&htpR5b8@tzM`{r*E3-Ui zB3U;(W<`=JWbo49EesnmOS<8CuWmFFHa=dPVKBjoNHmF=m+->w&n_%5gy8oaU4DpR zf-NTKp0$_Ahshg}k8VM?!|rvHU~L!!V4hW(`Bx>P$a2OsRY|AA#8Tr72LrN}CjYgfSuC#PbWM%0Ok{e9 z_fJ10h!c~`W8;ws+@<91Y5cxRm)?gjf_&Wq{Q44k13HE7Mu-al89=QIiyl&(ciI8- zAV-4K5cj47aj4@OuJmYSkPxpN;vZVMA)7+9yD?q}Q9=?OKH-QVtX&ppbj zae-x_GyK5L$DerO@kgl+!oXKV-b3y~n?V%TfgK zci-3Y`~1o4@>*5^B(lWlW{q*%j3;6d*~}Q556BE7ZSEEKO?Gc6Ye|kF5#C9rhQ(sV z?L_r(J#Sunj%ef~s1ayJkee%-uM@1!wS(!7q>OHQsIXdgxq?4zCdu8c?Q_l698N}~ z2^^0^;uz1hT65c5GwTzOi$@;ay~4^3I|KT{%HTWqEuCZVor`?i zo1!7ObJWEA{%v4pjMoJvW~dS&0?~@=HuclKPcUz2Nw;{@^~0VbxuU#&!>!BXngTZf8zG*aH*OV&(@;jBp`=5mA)y_{7qaID>QHlFg8wBpvH z1T;Z5k}|B8FEX|QI*Q@IR)NWjI7Jgmv6@Ztt_EtJGkryi5zzw%a%5rrKuXUDT1sMd z!h*apqTR^I6(zZ$R+%fi()6MXyicXHq|Ec~mekmWoK}#Eo5texG^j>VV>L!&9VNb_ zCdeZ9eJd`?3K;I%SR$GStpMtWFtBw|4OA6Zoz4j^wWd%bB1k49R8>Ma7VubJ`w=-s zP9X5+EO$`B#KjtZ@J~R1 z-#tK#pDnKbtobHt2xOM?juIy2BlBg?kyJ z^4tqts!o%ZTrujcHpPh>)N(@q3GyKV1W({uf%m=s;B`zZUufEzZed)QpO|U+UJKjS z*2&3EcXD#8Wi#&L*c6_bsLiBO2d6j8#&XTV8}7n*Wo7lJD;I#TOqqSl!JF>ym&;R_ z$!vkjS@4DwrJP8lGl@hQ4AHI4Z8+yR06KSfr#%2aMdD&Mjz%Yy^Rx8(7o@3|7<$T+0~Mm~J2&BZ3>Fu%^rOy+AUkD_Q{(3EWWs>E5n!FTQ?< zX|5}ktJQL8ooPzagJvOOWQj#dx}-k`QV>V&H*LrEURBT-fPAv?-DDYzFj1 zz!KjJ)I|kA68g&ik9VHbl)o^`j-J$ZU5bJQobdfgjb1uVlnoF(Q zb#iC3S{+8CbL$;{{NU{D!EDL_Eq6MmDrzDzH&JVvd9!~*CLPg~L~^b+(J%|9p4L_b zAsQW4t4;FY$(`{@`{PQKW63SMCnjq1$&^CK&AZ#TmOrXT$?Ch*R<1fdUG=*XUNLW( z*?F=XHr;$Kv-)j&ZhZFO!C8M8!xMxfx7Q9g>Xq_3!(dr$*l66|uY(daAqU3(e6(VR z)1{cY2V~|oWDcEurRD|Z44G?O4GOk^WrM)b0G9(hn4??_{bK5^QKSVZqbis-0F_IL zaNBS)p(;9NhlC2ovLP#$q((t$F~I`r(O*8I@}D$jZD7n_u2A+`SMdx*gMKL7T@Si(Jlmm-1m5vt zExX;}n(aZe+q+^18Ha8Z-3L%_nFE-&CVM zpH5jEEBgM~?b{b4ubPp-6&~b_2}|=WyW{?f!A@K@C$$_AJb$lO00$GULSd=s^CXuY zxSsBmO1m;ydeX$WTPn3Rjg`L23z5ir&r8zUQ^}-BJ!`l&W1QoRR~30U<6XecMzPy{ z_tM@?Ue8M0I_<#8)idG5%{d2XWl5C4P|BE(=i>2Q_4*xj;A-y94mO?3~|9bHZ!v!$8k~JE^QbNPnXLg?ex0Ez4uQ}8pZ77WUqf> zvYw&yKC!fPHUlXPD8MsXt!)q%Y-X)@F~&Mh!?rXvI`Pj?lXn@0y!OAKNx4?tUn(Uz zL!==Oh+3>&W?uw-_b~cf^gkeo0EuRw0>c8=r0EHvW`a$n%89?~$-|z#qU0(DTw#QO zu*HZj@GWQy+sXy|+Q3vKp^wnk(ai^xjqJk6GKRB&H-;wg1ARN11?`jXP}BrnVwl)y zdI6M1h;oE$v@8YG71YClmyQljKV1^MnO|5%rJ0NP#?LKhQWHE6P$F}xAn2To71#5( zB$BK@ornQqa#@Kp1YYJ8UaWdvJ7P+AN%6#-=SiF%()oTO5dq*3j?*Q)Su!{f(}cd9 z+J*H-tM$;*(k6dkoZOxFylq|~=M~QG*uJoTR2lC{4uiefcR+UE-EQZmC$BFO^DZ*DXl0tk~JiQl~q+{+6uM&28DY^l-nY>;@pm zU4~slv6-To(;^dba$h{>Tk+Kw?#$rfaCoX%5;^ek1;}6+2^-8sECz1XbbKrnN&+ z`i=VB;^O6{ecUq3R)6;b$3<$@JBGsziUyEPXrDdB=(21JVw&u6HO%bENHKRur@g5K z0`9s@BGGKMmlDa6CCQf6j5%ETJzcR;It$)OuHXxtNioczA=*#ALnhF_qhDXK9-!tz zGZEU4FcVk_NQQ?LNVwOWsz!E0AH@X#YvDce=daicfEd8F!Gy)-=BW6ZSQ^y0+Bi(K zyg+pZbsPX~;3BnKZ3^gXCJGa3U74H{S}_1Q#W}>|=odPMI<(I+J!XWY7Wf$8SYjvJ zO{P1RNVsy;-{Pm+X;qezk{B1IB=wx)0;39c9$a%qENfCsfUp6XDs4+b>RY{8GqlOJ38Nv&qE(sE+L=9cj3#mv4EFD-wtE^cyfP(}f3x*Q~8Js>5 z+N+UTK~&&W8P8}Cc%zyMpj9q`TMzaMtg9@l<%CR2up&fN6T~DM5o1#cKRt6}IX7d7 zhUQC=Mzm`%nqWsjYYH4uU@i_TDBONF?k0BBB7%9nx9zrKDlfvANuF2Xphu&43XI6e z8Yo3hgg^`(S=CLENm@nf*k9VGXq=XIbIS);0hz_dNRFk zJh2UeCeT54K0omem=jNUmT+(ofoY3yJV}<~#Z6$mO{KZeERM(ID72-E!UD&stfVN0 z2#y=aK@bh5#A%wL<<>_<1w2>Dc38rTAUY7IWSO^1oBP?}B*)9Wm82GDfn_F*y#c;4 zYOno*ypOz{M)OO8RVl%NMQ{azpZn?9kFdJqTc6tUPoK|z>VBN~$Nf0>E8}aQY_9(1 ziZ4sgIx5-#-9R{$lw50283+X8fc+uv3|fF8i2KnuBfx3ZwS)?&S~v&|0hyqz8&p%? zvv>8oFHK_Uw}oe)-}#N_6UN(xENhV0Hw;OM<|IZue%pfwxCk?3o|)w`@=w_u>pYE* zn7na`TSqRhe(B~Ptp5E&-@&E9KRj#V=;_FBHAZj9vz8;OOp=Xq^ZWg`ih{KIap%du zG!1R_yUh1f(U0&sp=13gtp9CmKOk==A3~>L{Zs<31VBcfOmLnCspy4A50H#7Y)y~M zff5LVC#~Qd?F7WoRdiksq;zZ#BIJG$3IeM@efDyN$?WaKvS;@!+yP<%jsXptu>w=i zW~(@zdi93&GqFNG=H@}9>KUL#HO<02%kqXS8(?5^`8ohT6-&(~OITNwZgQAWA`oDe zv}R%dU56@DTbs=}0EStvEatKduX20Zt?eN24nTzy;24&JQ~HiZW9yAG!-LpTwJ0`J z#Q-@1Y%u(|KmNdAF9qBIzjg7t{TDIb+5*S`&w}UXFMs2iTaD@eMGE~(2BBvQE76y~ zBg;?!&j}nxD1mmte;$Z^k=BEE5R#_p(G?GS3Ujm>n?W%)iSA*u=oa!KIz=8vZ-zSC z*qhM`tDuwQo2U#AVl{Lx`65cfgII`hL*GR@3hSUDl(&OAI(l2svy5z%MXUI|%pCI+ z^GmXme2#sXeUkk*ZV&eb{-WTCUFp3L{`Zsz)I7AHvy7wP!2d4vy0V%eGkWRhsnJ?6 z$V1qI))de?M|1-8ZKE^`>BmQD4&<&lO7lQJIZDeYiM~evzhNby#GxciGe}2|j?x6^ zOQSRk>8D0%4x$f@QJM$(U8A&&y66XI4xfL`^6ANwN6wvHL1)lmbRNA1Ed%-|VeBL5 z9GsC>u3tXCa`N2Se5>9>*F)iX2+o}hit?z1>Ztk0bn?g4*|&WBuG5FlqkS;QahT_6 zI-ftL;oP~i7xKrK&n}-od|~-${;C|81?jy2 diff --git a/src/AppBundle/Resources/public/js/app.format.js b/src/AppBundle/Resources/public/js/app.format.js index 4f962a5..87a79f2 100755 --- a/src/AppBundle/Resources/public/js/app.format.js +++ b/src/AppBundle/Resources/public/js/app.format.js @@ -207,12 +207,12 @@ format.text = function text(card, alternate) { for (i = 0; i < (card.scheme_acceleration || 0); i++) { text += ''; } - for (i = 0; i < (card.scheme_crisis || 0); i++) { - text += ''; - } for (i = 0; i < (card.scheme_amplify || 0); i++) { text += ''; } + for (i = 0; i < (card.scheme_crisis || 0); i++) { + text += ''; + } for (i = 0; i < (card.scheme_hazard || 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 99c81dc..3f765f9 100755 --- a/src/AppBundle/Resources/views/Search/card-text.html.twig +++ b/src/AppBundle/Resources/views/Search/card-text.html.twig @@ -2,8 +2,8 @@

{{ card.text|raw }} {% if card.scheme_acceleration %}{% for i in 1..card.scheme_acceleration %}{% endfor %}{% endif %} - {% if card.scheme_crisis %}{% for i in 1..card.scheme_crisis %}{% 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 %}
{% if (card.boost_star) or (card.boost is defined and card.boost > 0) %}