From: Benjamin Auder Date: Wed, 3 Jan 2024 14:38:58 +0000 (+0100) Subject: Add Discoduel, draft Dobutsu, some code cleaning X-Git-Url: https://git.auder.net/doc/html/vendor/img/current/gitweb.css?a=commitdiff_plain;h=3232aba3419f129c70d5edd9a4ded1fefc146ea0;p=xogo.git Add Discoduel, draft Dobutsu, some code cleaning --- diff --git a/base_rules.js b/base_rules.js index 0f89cc4..217d055 100644 --- a/base_rules.js +++ b/base_rules.js @@ -338,7 +338,7 @@ export default class ChessRules { getReserveFen(o) { if (o.init) - return "000000000000"; + return Array(2 * V.ReserveArray.length).fill('0').join(""); return ( ['w', 'b'].map(c => Object.values(this.reserve[c]).join("")).join("") ); @@ -416,14 +416,14 @@ export default class ChessRules { } // Some additional variables from FEN (variant dependant) - setOtherVariables(fenParsed, pieceArray) { + setOtherVariables(fenParsed) { // Set flags and enpassant: if (this.hasFlags) this.setFlags(fenParsed.flags); if (this.hasEnpassant) this.epSquare = this.getEpSquare(fenParsed.enpassant); if (this.hasReserve && !this.isDiagram) - this.initReserves(fenParsed.reserve, pieceArray); + this.initReserves(fenParsed.reserve); if (this.options["crazyhouse"]) this.initIspawn(fenParsed.ispawn); if (this.options["teleport"]) { @@ -441,14 +441,16 @@ export default class ChessRules { } // ordering as in pieces() p,r,n,b,q,k - initReserves(reserveStr, pieceArray) { - if (!pieceArray) - pieceArray = ['p', 'r', 'n', 'b', 'q', 'k']; + static get ReserveArray() { + return ['p', 'r', 'n', 'b', 'q', 'k']; + } + + initReserves(reserveStr) { const counts = reserveStr.split("").map(c => parseInt(c, 36)); - const L = pieceArray.length; + const L = V.ReserveArray.length; this.reserve = { - w: ArrayFun.toObject(pieceArray, counts.slice(0, L)), - b: ArrayFun.toObject(pieceArray, counts.slice(L, 2 * L)) + w: ArrayFun.toObject(V.ReserveArray, counts.slice(0, L)), + b: ArrayFun.toObject(V.ReserveArray, counts.slice(L, 2 * L)) }; } diff --git a/pieces/Dobutsu/LICENSE.txt b/pieces/Dobutsu/LICENSE.txt new file mode 100644 index 0000000..2f244ac --- /dev/null +++ b/pieces/Dobutsu/LICENSE.txt @@ -0,0 +1,395 @@ +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/pieces/Dobutsu/README.md b/pieces/Dobutsu/README.md new file mode 100644 index 0000000..73ed708 --- /dev/null +++ b/pieces/Dobutsu/README.md @@ -0,0 +1,13 @@ +[Couch Tomato - I presume] + +I recreated all of the original [Doubutsu](https://en.wikipedia.org/wiki/D%C5%8Dbutsu_sh%C5%8Dgi) pieces in Inkscape SVG format. + +Credits: the original Doubutsu pieces were created by [Madoka Kitato](https://en.wikipedia.org/wiki/Madoka_Kitao). + +(also: [screenshot of the gshogi version](https://raw.githubusercontent.com/Ka-hu/shogi-pieces/master/_screenshots/scrot_doubutsu_gshogi.png)) + +![doubutsu screenshot](https://raw.githubusercontent.com/Ka-hu/shogi-pieces/master/_screenshots/scrot_doubutsu_xboard.png) + +## License + +Where it's not stated otherwise, my work is lincensed under [CC-BY-4.0](https://choosealicense.com/licenses/cc-by-4.0) diff --git a/pieces/Dobutsu/chick.svg b/pieces/Dobutsu/chick.svg new file mode 100644 index 0000000..69358c7 --- /dev/null +++ b/pieces/Dobutsu/chick.svg @@ -0,0 +1,139 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/elephant.svg b/pieces/Dobutsu/elephant.svg new file mode 100644 index 0000000..c7eb6dc --- /dev/null +++ b/pieces/Dobutsu/elephant.svg @@ -0,0 +1,176 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/giraffe.svg b/pieces/Dobutsu/giraffe.svg new file mode 100644 index 0000000..14a55a9 --- /dev/null +++ b/pieces/Dobutsu/giraffe.svg @@ -0,0 +1,186 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/hen.svg b/pieces/Dobutsu/hen.svg new file mode 100644 index 0000000..7256bc8 --- /dev/null +++ b/pieces/Dobutsu/hen.svg @@ -0,0 +1,156 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/lion.svg b/pieces/Dobutsu/lion.svg new file mode 100644 index 0000000..8324454 --- /dev/null +++ b/pieces/Dobutsu/lion.svg @@ -0,0 +1,201 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/rev_chick.svg b/pieces/Dobutsu/rev_chick.svg new file mode 100644 index 0000000..bbefcfc --- /dev/null +++ b/pieces/Dobutsu/rev_chick.svg @@ -0,0 +1,139 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/rev_elephant.svg b/pieces/Dobutsu/rev_elephant.svg new file mode 100644 index 0000000..c8b0b3c --- /dev/null +++ b/pieces/Dobutsu/rev_elephant.svg @@ -0,0 +1,176 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/rev_giraffe.svg b/pieces/Dobutsu/rev_giraffe.svg new file mode 100644 index 0000000..f6eb024 --- /dev/null +++ b/pieces/Dobutsu/rev_giraffe.svg @@ -0,0 +1,186 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/rev_hen.svg b/pieces/Dobutsu/rev_hen.svg new file mode 100644 index 0000000..e172f8b --- /dev/null +++ b/pieces/Dobutsu/rev_hen.svg @@ -0,0 +1,156 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pieces/Dobutsu/rev_lion.svg b/pieces/Dobutsu/rev_lion.svg new file mode 100644 index 0000000..33c11d3 --- /dev/null +++ b/pieces/Dobutsu/rev_lion.svg @@ -0,0 +1,201 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/array.js b/utils/array.js index c2cb25f..af8462e 100644 --- a/utils/array.js +++ b/utils/array.js @@ -5,8 +5,12 @@ export const ArrayFun = { return [...Array(size1)].map(() => Array(size2).fill(initElem)); }, - range: function(max) { - return [...Array(max).keys()]; + range: function(min, max) { + if (!max) { + max = min; + min = 0; + } + return [...Array(max - min).keys()].map(k => k + min); }, toObject: function(keys, values) { diff --git a/variants.js b/variants.js index cad081a..f42033e 100644 --- a/variants.js +++ b/variants.js @@ -43,8 +43,8 @@ const variants = [ {name: 'Dark', desc: 'In the shadow'}, {name: 'Diamond', desc: 'Rotating board'}, {name: 'Dice', desc: 'Roll the dice'}, -// {name: 'Discoduel', desc: 'Enter the disco', disp: 'Disco Duel'}, -// {name: 'Dobutsu', desc: "Let's catch the Lion!"}, + {name: 'Discoduel', desc: 'Enter the disco', disp: 'Disco Duel'}, + {name: 'Dobutsu', desc: "Let's catch the Lion!"}, // {name: 'Doublearmy', desc: '64 pieces on the board', disp: 'Double Army'}, {name: 'Doublemove', desc: 'Double moves'}, // {name: 'Dynamo', desc: 'Push and pull'}, diff --git a/variants/Avalanche/class.js b/variants/Avalanche/class.js index ee80550..8a4981f 100644 --- a/variants/Avalanche/class.js +++ b/variants/Avalanche/class.js @@ -167,7 +167,7 @@ export default class AvalancheRules extends ChessRules { } } - atLeastOneMove(color, lastMove) { + atLeastOneMove(color) { if (this.subTurn == 0) return true; return super.atLeastOneMove(color); diff --git a/variants/Chaining/class.js b/variants/Chaining/class.js index 9d771da..4ae7208 100644 --- a/variants/Chaining/class.js +++ b/variants/Chaining/class.js @@ -20,8 +20,8 @@ export default class ChainingRules extends ChessRules { return true; //self captures induce chaining } - setOtherVariables(fenParsed, pieceArray) { - super.setOtherVariables(fenParsed, pieceArray); + setOtherVariables(fenParsed) { + super.setOtherVariables(fenParsed); // Stack of "last move" only for intermediate chaining this.lastMoveEnd = []; } diff --git a/variants/Clorange/class.js b/variants/Clorange/class.js index 485bbd6..e8506db 100644 --- a/variants/Clorange/class.js +++ b/variants/Clorange/class.js @@ -14,14 +14,6 @@ export default class ClorangeRules extends ChessRules { return true; } - getReserveFen(o) { - if (o.init) - return "00000000000000000000"; - return ( - ["w","b"].map(c => Object.values(this.reserve[c]).join("")).join("") - ); - } - pieces(color, x, y) { let res = super.pieces(color, x, y); res['s'] = {"class": "nv-pawn", moveas: "p"}; @@ -38,9 +30,8 @@ export default class ClorangeRules extends ChessRules { static get NV_PIECES() { return ['s', 'u', 'o', 'c', 't']; } - - setOtherVariables(fen) { - super.setOtherVariables(fen, V.V_PIECES.concat(V.NV_PIECES)); + static get ReserveArray() { + return V.V_PIECES.concat(V.NV_PIECES); } // Forbid non-violent pieces to capture diff --git a/variants/Convert/class.js b/variants/Convert/class.js index bc99c63..cd2d1a9 100644 --- a/variants/Convert/class.js +++ b/variants/Convert/class.js @@ -15,8 +15,8 @@ export default class ConvertRules extends ChessRules { return false; } - setOtherVariables(fenParsed, pieceArray) { - super.setOtherVariables(fenParsed, pieceArray); + setOtherVariables(fenParsed) { + super.setOtherVariables(fenParsed); // Stack of "last move" only for intermediate chaining this.lastMoveEnd = []; } diff --git a/variants/Coregal/class.js b/variants/Coregal/class.js index 23f67c7..bbc35a4 100644 --- a/variants/Coregal/class.js +++ b/variants/Coregal/class.js @@ -61,8 +61,8 @@ export default class CoregalRules extends ChessRules { ); } - setOtherVariables(fenParsed, pieceArray) { - super.setOtherVariables(fenParsed, pieceArray); + setOtherVariables(fenParsed) { + super.setOtherVariables(fenParsed); this.relPos = { 'w': { 'k': fenParsed.relpos[0], diff --git a/variants/Discoduel/class.js b/variants/Discoduel/class.js new file mode 100644 index 0000000..c081b31 --- /dev/null +++ b/variants/Discoduel/class.js @@ -0,0 +1,51 @@ +import ChessRules from "/base_rules.js"; +import {ArrayFun} from "/utils/array.js" + +export default class DiscoduelRules extends ChessRules { + + static get Options() { + return {}; //nothing would make sense + } + + get pawnPromotions() { + return ['p']; + } + + get hasFlags() { + return false; + } + + genRandInitBaseFen() { + return { + fen: "1n4n1/8/8/8/8/8/PPPPPPPP/8", + o: {} + }; + } + + getPotentialMovesFrom([x, y]) { + const moves = super.getPotentialMovesFrom([x, y]); + if (this.turn == 'b') + // Prevent pawn captures on last rank: + return moves.filter(m => m.vanish.length == 1 || m.vanish[1].x != 0); + return moves; + } + + filterValid(moves) { + return moves; + } + + getCurrentScore() { + // No real winning condition (promotions count...) + if ( + ArrayFun.range(1, this.size.x).every(row_idx => { + this.board[row_idx].every(square => square.charAt(0) != 'w') + }) + || + !this.atLeastOneMove(this.turn) + ) { + return "1/2"; + } + return "*"; + } + +}; diff --git a/variants/Discoduel/rules.html b/variants/Discoduel/rules.html new file mode 100644 index 0000000..490d279 --- /dev/null +++ b/variants/Discoduel/rules.html @@ -0,0 +1,5 @@ +

+ Eight pawns try to promote, while the knights attempts to prevent them. + A pawn reaching last rank does not transform, but become immune to captures. +

+

Goal: "promoting" as many pawns as possible.

diff --git a/variants/Discoduel/style.css b/variants/Discoduel/style.css new file mode 100644 index 0000000..a3550bc --- /dev/null +++ b/variants/Discoduel/style.css @@ -0,0 +1 @@ +@import url("/base_pieces.css"); diff --git a/variants/Dobutsu/class.js b/variants/Dobutsu/class.js new file mode 100644 index 0000000..7632a17 --- /dev/null +++ b/variants/Dobutsu/class.js @@ -0,0 +1,100 @@ +import ChessRules from "/base_rules.js"; + +export default class DobutsuRules extends ChessRules { + + static get Options() { + return {}; + } + + get hasFlags() { + return false; + } + + get hasEnpassant() { + return false; + } + + pieces(color, x, y) { + const pawnShift = this.getPawnShift(color || 'w'); + // NOTE: classs change according to playerColor (orientation) + const mySide = (this.playerColor == color); + return { + 'c': { + "class": (mySide ? "" : "rev-") + "chick", + both: [{steps: [[pawnShift, 0]], range: 1}] + }, + 'h': { + "class": (mySide ? "" : "rev-") + "hen", + both: [ + { + steps: [ + [pawnShift, 1], [pawnShift, -1], + [0, 1], [0, -1], [1, 0], [-1, 0] + ], + range: 1 + } + ] + }, + 'e': { + "class": (mySide ? "" : "rev-") + "elephant", + both: [{steps: [[-1, 1], [-1, -1], [1, 1], [1, -1]], range: 1}] + }, + 'g': { + "class": (mySide ? "" : "rev-") + "giraffe", + both: [{steps: [[0, 1], [0, -1], [1, 0], [-1, 0]], range: 1}] + }, + 'l': { + "class": (mySide ? "" : "rev-") + "lion", + both: [{ + steps: [[-1, 1], [-1, -1], [1, 1], [1, -1], + [0, 1], [0, -1], [1, 0], [-1, 0]], + range: 1 + }] + } + }; + } + + isKing(x, y, p) { + if (!p) + p = this.getPiece(x, y); + return (p == 'l'); + } + + static get ReserveArray() { + return ['p', 'h', 'e', 'g']; + } + + constructor(o) { + o.options = {crazyhouse: true, taking: true}; + super(o); + } + + get pawnPromotions() { + return ['h']; + } + + genRandInitBaseFen() { + return { + fen: "gle/1c1/1C1/ELG", + o: {} + }; + } + + get size() { + return {x: 4, y: 4}; + } + + getCurrentScore(move_s) { + const res = super.getCurrentScore(move_s); + if (res != '*') + return res; + const oppCol = C.GetOppTurn(this.turn); + const oppLastRank = (oppCol == 'b' ? 3 : 0); + for (let j=0; j < this.size.y; j++) { + if (this.board[oppLastRank][j] == oppCol + 'l') + return (oppCol == 'w' ? "1-0" : "0-1"); + } + return "*"; + } + +}; diff --git a/variants/Dobutsu/rules.html b/variants/Dobutsu/rules.html new file mode 100644 index 0000000..45bbc5d --- /dev/null +++ b/variants/Dobutsu/rules.html @@ -0,0 +1,12 @@ +

+ Simplified Shogi game. Goal: capture the Lion. + Pieces move as indicated on them (red arrows). +

+ +

Captured units can be landed on the board later.

+ +

+ + Wikipedia page + . +

diff --git a/variants/Dobutsu/style.css b/variants/Dobutsu/style.css new file mode 100644 index 0000000..fb861f1 --- /dev/null +++ b/variants/Dobutsu/style.css @@ -0,0 +1,34 @@ +piece.chick { + background-image: url('/pieces/Dobutsu/chick.svg'); +} +piece.rev-chick { + background-image: url('/pieces/Dobutsu/rev_chick.svg'); +} + +piece.hen { + background-image: url('/pieces/Dobutsu/hen.svg'); +} +piece.rev-hen { + background-image: url('/pieces/Dobutsu/rev_hen.svg'); +} + +piece.elephant { + background-image: url('/pieces/Dobutsu/elephant.svg'); +} +piece.rev-elephant { + background-image: url('/pieces/Dobutsu/rev_elephant.svg'); +} + +piece.giraffe { + background-image: url('/pieces/Dobutsu/giraffe.svg'); +} +piece.rev-giraffe { + background-image: url('/pieces/Dobutsu/rev_giraffe.svg'); +} + +piece.lion { + background-image: url('/pieces/Dobutsu/lion.svg'); +} +piece.rev-lion { + background-image: url('/pieces/Dobutsu/rev_lion.svg'); +}