online multiplayer chess game (note server currently down)
| -rw-r--r-- | Events.gd | 1 | ||||
| -rw-r--r-- | Globals.gd | 4 | ||||
| -rw-r--r-- | Grid.gd | 75 | ||||
| -rw-r--r-- | LICENSE | 661 | ||||
| -rw-r--r-- | Square.gd | 14 | ||||
| -rw-r--r-- | Square.tscn | 32 | ||||
| -rw-r--r-- | Utils.gd | 29 | ||||
| -rw-r--r-- | World.tscn | 5 | ||||
| -rw-r--r-- | assets/ui/Roboto-Medium.ttf | 3 | ||||
| -rw-r--r-- | assets/ui/checkedbox.png | 3 | ||||
| -rw-r--r-- | assets/ui/checkedbox.png.import (renamed from circle.png.import) | 8 | ||||
| -rw-r--r-- | assets/ui/svg/.gdignore | 1 | ||||
| -rw-r--r-- | assets/ui/uncheckedbox.png.import | 35 | ||||
| -rw-r--r-- | circle.png | 3 | ||||
| -rw-r--r-- | pieces/King.gd | 26 | ||||
| -rw-r--r-- | pieces/Knight.gd | 4 | ||||
| -rw-r--r-- | pieces/Pawn.gd | 30 | ||||
| -rw-r--r-- | pieces/Piece.gd | 50 | ||||
| -rw-r--r-- | project.godot | 10 | ||||
| -rw-r--r-- | sounds/SoundFX.gd | 4 | ||||
| -rw-r--r-- | ui/GameUI.tscn | 67 | ||||
| -rw-r--r-- | ui/Settings.gd | 36 | ||||
| -rw-r--r-- | ui/Settings.tscn | 59 | ||||
| -rw-r--r-- | ui/StartMenu.gd | 27 | ||||
| -rw-r--r-- | ui/StartMenu.tscn | 68 | ||||
| -rw-r--r-- | ui/Timer.gd | 32 | ||||
| -rw-r--r-- | ui/TimerLabels.gd | 33 | ||||
| -rw-r--r-- | ui/main.tres | 14 | ||||
| -rw-r--r-- | ui/roboto.tres | 7 | ||||
| -rw-r--r-- | ui/verdana.tres | 2 |
30 files changed, 1175 insertions, 168 deletions
@@ -3,3 +3,4 @@ extends Node # warning-ignore-all:unused_signal signal turn_over signal just_before_turn_over # called just before turn over +signal outoftime # called when the time is up @@ -1,10 +1,10 @@ extends Node var grid: Grid = null -var piece_set = "california" +var piece_set := "california" var white_turns := 0 var black_turns := 0 -var in_check = false +var in_check := false var checking_piece: Piece = null var white_king: King var black_king: King @@ -1,19 +1,19 @@ extends Node2D class_name Grid -onready var PIECE_SET = Globals.piece_set +onready var PIECE_SET: String = Globals.piece_set -export(Color) var board_color1 = Color(0.870588, 0.890196, 0.901961) -export(Color) var board_color2 = Color(0.54902, 0.635294, 0.678431) -export(Color) var overlay_color = Color(0.2, 0.345098, 0.188235, 0.592157) +export(Color) var board_color1 := Color(0.870588, 0.890196, 0.901961) +export(Color) var board_color2 := Color(0.54902, 0.635294, 0.678431) +export(Color) var overlay_color := Color(0.2, 0.345098, 0.188235, 0.592157) const Piece = preload("res://Piece.tscn") const Square = preload("res://Square.tscn") const BottomLeftLabel = preload("res://ui/BottomLeftLabel.tscn") const TopRightLabel = preload("res://ui/TopRightLabel.tscn") -const piece_size = Vector2(100, 100) -const default_metadata = { +const piece_size := Vector2(100, 100) +const default_metadata := { "wccl": false, # white can castle left "wccr": false, # white can castle right "bccl": false, # black can castle left @@ -23,16 +23,16 @@ const default_metadata = { "bcep": [], # black can enpassant } -var matrix = [] -var background_matrix = [] -var history_matrixes: Dictionary = {} +var matrix := [] +var background_matrix := [] +var history_matrixes := {} -var last_clicked +var last_clicked = null -onready var background = $Background -onready var ASSETS_PATH = "res://assets/pieces/" + PIECE_SET + "/" -onready var foreground = $Foreground -onready var pieces = $Pieces +onready var background := $Background +onready var ASSETS_PATH := "res://assets/pieces/" + PIECE_SET + "/" +onready var foreground := $Foreground +onready var pieces := $Pieces func _ready(): @@ -41,11 +41,19 @@ func _ready(): init_matrix() # create the pieces init_labels() Events.connect("turn_over", self, "_on_turn_over") # listen for turn_over events + Events.connect("outoftime", self, "_on_outoftime") # listen for timeout events + + +func _on_outoftime(who): + if who == "white": + win("black") + else: + win("white") func init_labels(): for i in range(8): - var letterslabel = BottomLeftLabel.instance() + var letterslabel := BottomLeftLabel.instance() letterslabel.rect_position.x = i * piece_size.x letterslabel.rect_position.y = piece_size.y * 7 size_label(letterslabel, i) @@ -53,7 +61,7 @@ func init_labels(): letterslabel.rect_position / piece_size )[0] foreground.add_child(letterslabel) - var numberslabel = TopRightLabel.instance() + var numberslabel := TopRightLabel.instance() numberslabel.rect_position.y = i * piece_size.x numberslabel.rect_position.x = piece_size.x * 7 size_label(numberslabel, i) @@ -74,27 +82,22 @@ func threefoldrepetition(): func mat2str(mat = matrix): - var string = "" + var string := "" for y in range(8): - string += "\n" for x in range(8): var spot = mat[y][x] if spot: string += spot.mininame else: string += "*" - string += "\n" for i in mat[8].keys(): # store the metadata var thing = mat[8][i] - string += i + "=" + str(thing) - if default_metadata[i] != thing: - string += "!" - string += "\n" + string += i + str(thing) return string func _on_turn_over(): - var matstr = mat2str() + var matstr: String = mat2str() # print(matstr) if !history_matrixes.has(matstr): history_matrixes[matstr] = 1 @@ -108,14 +111,7 @@ func _on_turn_over(): if !can_move(): print("what") if Globals.in_check: - var winner = "black" if Globals.turn else "white" - print(winner, " won the game in ", Globals.turns(winner), " turns!") - print("the board:") - SoundFx.play("Victory") - print_matrix_pretty() - yield(get_tree().create_timer(5), "timeout") - get_tree().reload_current_scene() - SoundFx.play("Victory") + win("black" if Globals.turn else "white") else: print("stalemate") drawed() @@ -132,6 +128,15 @@ func drawed(): SoundFx.play("Victory") +func win(winner): + print(winner, " won the game in ", Globals.turns(winner), " turns!") + SoundFx.play("Victory") + print_matrix_pretty() + yield(get_tree().create_timer(5), "timeout") + get_tree().reload_current_scene() + SoundFx.play("Victory") + + func check_in_check(prin = false): # check if in_check for i in range(0, 8): # for each row for j in range(0, 8): # for each column @@ -170,7 +175,7 @@ func init_matrix(): # create the matrix func make_piece(position: Vector2, script: String, sprite: String, white: bool = true): # make peace - var piece = Piece.instance() # create a piece + var piece := Piece.instance() # create a piece piece.script = load(script) # set the script piece.sprite = piece.get_node("Sprite") # get the sprite piece.sprite.texture = load(sprite) # set the sprite @@ -185,7 +190,7 @@ func init_board(): # create the board for i in range(8): # for each row background_matrix.append([]) # add a row for j in range(8): # for each column - var square = Square.instance() # create a square + var square := Square.instance() # create a square square.rect_size = piece_size # set the size square.rect_position = Vector2(i, j) * piece_size # set the position square.name = "square_" + str(i) + "_" + str(j) # set the real name @@ -352,5 +357,3 @@ func _input(event): # input last_clicked.took() # kill the piece last_clicked = null clear_fx() # clear the circles - if event.is_action_released("fullscreen"): - OS.window_fullscreen = !OS.window_fullscreen @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<https://www.gnu.org/licenses/>. @@ -1,19 +1,19 @@ extends ColorRect -var real_position = Vector2() -var algebraic_string = "" -var circle_on = false +var real_position := Vector2() +var algebraic_string := "" +var circle_on := false -onready var area = $Squarea -onready var areacollisionshape = $Squarea/CollisionShape2D -onready var circle = $Circle +onready var area := $Squarea +onready var areacollisionshape := $Squarea/CollisionShape2D +onready var circle := $Circle signal clicked(real_position) func _ready(): circle.position = Globals.grid.piece_size / 2 - circle.modulate = Globals.grid.overlay_color + circle.material.set_shader_param("color", Globals.grid.overlay_color) circle.visible = false areacollisionshape.global_position += Globals.grid.piece_size / 2 areacollisionshape.shape.extents = Vector2(rect_size.x / 2, rect_size.y / 2) diff --git a/Square.tscn b/Square.tscn index 3b9819b..3ee74a3 100644 --- a/Square.tscn +++ b/Square.tscn @@ -1,11 +1,34 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Square.gd" type="Script" id=1] -[ext_resource path="res://circle.png" type="Texture" id=2] +[ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 381, 394.5 ) +[sub_resource type="Shader" id=2] +code = "shader_type canvas_item; + +uniform float amt : hint_range(0.0, 1.0); +uniform vec4 color : hint_color; + +void fragment() +{ + if (distance(UV, vec2(0.5,0.5)) > amt/2.0) + { + COLOR = vec4(0.0); + } + else + { + COLOR = vec4(color); + } +}" + +[sub_resource type="ShaderMaterial" id=3] +shader = SubResource( 2 ) +shader_param/amt = 1.0 +shader_param/color = Color( 0.431373, 0.584314, 0.388235, 0.639216 ) + [node name="Square" type="ColorRect"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -25,7 +48,10 @@ z_index = 3 shape = SubResource( 1 ) [node name="Circle" type="Sprite" parent="."] -position = Vector2( 9, 51 ) +visible = false +material = SubResource( 3 ) +position = Vector2( 8, 8 ) +scale = Vector2( 25, 25 ) texture = ExtResource( 2 ) [connection signal="input_event" from="Squarea" to="." method="_on_Squarea_input_event"] @@ -1,9 +1,9 @@ extends Node var turn_moves := "1. " -var turns_moves = [] +var turns_moves := [] -var counter = 0 +var counter := 0 func _ready(): @@ -28,9 +28,7 @@ func add_move(move): func calculate_algebraic_position(real_position): - var algebraic_string = char(65 + (real_position.x)).to_lower() - algebraic_string += str(8 - real_position.y) - return algebraic_string + return char(65 + (real_position.x)).to_lower() + str(8 - real_position.y) func get_node_name(node): @@ -51,15 +49,15 @@ func get_node_name(node): func walk_dir(path = "res://assets/pieces"): # walk the directory, finding the asset packs - var folders = [] # init the folders - var favoritism = false + var folders := [] # init the folders + var favoritism := false if path == "res://assets/pieces": # put favorite on top folders.append("california") favoritism = true - var dir = Directory.new() # init the directory + var dir := Directory.new() # init the directory if dir.open(path) == OK: # open the directory dir.list_dir_begin() # list the directory - var file_name = dir.get_next() # get the next file + var file_name := dir.get_next() # get the next file while file_name != "": # while there is a file if dir.current_is_dir(): # if the current is a directory if file_name == "." or file_name == "..": # if it is a dot or dot dot @@ -73,3 +71,16 @@ func walk_dir(path = "res://assets/pieces"): # walk the directory, finding the else: printerr("An error occurred when trying to access the path " + path) # print the error return folders # return the folders + + +func format_seconds(time: float, use_milliseconds: bool = false): + var minutes := time / 60 + var seconds := fmod(time, 60) + + if not use_milliseconds: + return "%02d:%02d" % [minutes, seconds] + return "%02d:%04.1f" % [minutes, seconds] + + +func round_place(num, places): + return round(num * pow(10, places)) / pow(10, places) @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Grid.gd" type="Script" id=1] +[ext_resource path="res://ui/GameUI.tscn" type="PackedScene" id=2] [node name="World" type="Node2D"] @@ -12,3 +13,5 @@ script = ExtResource( 1 ) [node name="Pieces" type="Node2D" parent="Grid"] [node name="Foreground" type="CanvasLayer" parent="Grid"] + +[node name="UI" parent="." instance=ExtResource( 2 )] diff --git a/assets/ui/Roboto-Medium.ttf b/assets/ui/Roboto-Medium.ttf new file mode 100644 index 0000000..57e8ca6 --- /dev/null +++ b/assets/ui/Roboto-Medium.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ac8e03606ffa4c37f61a6510a2080f1f37a7054f4726c214887d3b23f72e369 +size 168644 diff --git a/assets/ui/checkedbox.png b/assets/ui/checkedbox.png new file mode 100644 index 0000000..abb4081 --- /dev/null +++ b/assets/ui/checkedbox.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dc47f9ea42c55114ef4be55fca4844ff71e98134a4e7441b316f05e62b4f79a +size 593 diff --git a/circle.png.import b/assets/ui/checkedbox.png.import index 2e2e79f..e3ab98b 100644 --- a/circle.png.import +++ b/assets/ui/checkedbox.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/circle.png-10953cad44a8947fbdd4128a631e9e52.stex" +path="res://.import/checkedbox.png-f26561169cef71f8f74eac78fd309778.stex" metadata={ "vram_texture": false } [deps] -source_file="res://circle.png" -dest_files=[ "res://.import/circle.png-10953cad44a8947fbdd4128a631e9e52.stex" ] +source_file="res://assets/ui/checkedbox.png" +dest_files=[ "res://.import/checkedbox.png-f26561169cef71f8f74eac78fd309778.stex" ] [params] @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=false +flags/filter=true flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/assets/ui/svg/.gdignore b/assets/ui/svg/.gdignore index 8d1c8b6..e69de29 100644 --- a/assets/ui/svg/.gdignore +++ b/assets/ui/svg/.gdignore @@ -1 +0,0 @@ - diff --git a/assets/ui/uncheckedbox.png.import b/assets/ui/uncheckedbox.png.import new file mode 100644 index 0000000..c73e747 --- /dev/null +++ b/assets/ui/uncheckedbox.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/uncheckedbox.png-da54f770d122815b03b3534fcf3d2230.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/uncheckedbox.png" +dest_files=[ "res://.import/uncheckedbox.png-da54f770d122815b03b3534fcf3d2230.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/circle.png b/circle.png deleted file mode 100644 index fcb4253..0000000 --- a/circle.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3dc7e9169eaadf4d2be8954be9f1433d22e4973197a71fb5b843044bb19c098 -size 190 diff --git a/pieces/King.gd b/pieces/King.gd index 705c0bb..9ab9091 100644 --- a/pieces/King.gd +++ b/pieces/King.gd @@ -1,14 +1,14 @@ extends Piece class_name King, "res://assets/pieces/california/wK.png" -var castle_check = true -var can_castle = [] +var castle_check := true +var can_castle := [] func get_moves(): - var moves = [] + var moves := [] for i in all_dirs(): - var spot = pos_around(i) + var spot: Vector2 = pos_around(i) if is_on_board(spot): if no_enemys and at_pos(spot): continue @@ -41,10 +41,10 @@ func _ready(): func castleing(): - var moves = [] - var rooks = [pos_around(Vector2.RIGHT * 3), pos_around(Vector2.LEFT * 4)] - var rook_motion = [pos_around(Vector2.RIGHT), pos_around(Vector2.LEFT)] - var king_moveto_spots = [Vector2.RIGHT, Vector2.LEFT] # O-O and O-O-O respectivel + var moves := [] + var rooks := [pos_around(Vector2.RIGHT * 3), pos_around(Vector2.LEFT * 4)] + var rook_motion := [pos_around(Vector2.RIGHT), pos_around(Vector2.LEFT)] + var king_moveto_spots := [Vector2.RIGHT, Vector2.LEFT] # O-O and O-O-O respectivel for i in range(len(rooks)): if !is_on_board(rooks[i]): continue @@ -53,9 +53,9 @@ func castleing(): continue if rook.has_moved: continue - var direction = king_moveto_spots[i] - var posx2 = pos_around(direction * 2) - var pos = pos_around(direction) + var direction: Vector2 = king_moveto_spots[i] + var posx2: Vector2 = pos_around(direction * 2) + var pos: Vector2 = pos_around(direction) if at_pos(posx2) or at_pos(pos): continue if checkcheck(posx2) or checkcheck(pos): @@ -83,13 +83,13 @@ func castle(position): func can_move(): # checks if you can legally move castle_check = false - var can = .can_move() + var can: bool = .can_move() castle_check = true return can func get_attacks(): castle_check = false - var final = .get_attacks() + var final: Array = .get_attacks() castle_check = true return final diff --git a/pieces/Knight.gd b/pieces/Knight.gd index 156a58d..2efe40d 100644 --- a/pieces/Knight.gd +++ b/pieces/Knight.gd @@ -3,7 +3,7 @@ class_name Knight, "res://assets/pieces/california/wN.png" func get_moves(): - var moves = [ + var moves := [ pos_around(Vector2(-2, -1)), pos_around(Vector2(-2, 1)), pos_around(Vector2(2, -1)), @@ -13,7 +13,7 @@ func get_moves(): pos_around(Vector2(-1, 2)), pos_around(Vector2(1, 2)) ] - var final = [] + var final := [] for i in moves: if is_on_board(i): if no_enemys and at_pos(i): diff --git a/pieces/Pawn.gd b/pieces/Pawn.gd index f96d323..8571e74 100644 --- a/pieces/Pawn.gd +++ b/pieces/Pawn.gd @@ -1,11 +1,11 @@ extends Piece class_name Pawn, "res://assets/pieces/california/wP.png" -onready var whiteint = 1 if white else -1 +onready var whiteint := 1 if white else -1 -var twostepfirstmove = false -var just_set = false -var enpassant = [] +var twostepfirstmove := false +var just_set := false +var enpassant := [] func moveto(position, real = true, take = false): @@ -29,10 +29,10 @@ func _on_turn_over(): func get_moves(): - var points = [Vector2.UP, Vector2.UP * 2] - var moves = [] + var points := [Vector2.UP, Vector2.UP * 2] + var moves := [] for i in range(len(points)): - var point = points[i] + var point: Vector2 = points[i] point *= whiteint point = pos_around(point) if at_pos(point) == null: @@ -52,10 +52,10 @@ func passant(position): func get_attacks(): - var points = [Vector2.UP + Vector2.RIGHT, Vector2.UP + Vector2.LEFT] - var moves = [] + var points := [Vector2.UP + Vector2.RIGHT, Vector2.UP + Vector2.LEFT] + var moves := [] for i in range(len(points)): - var point = points[i] + var point: Vector2 = points[i] point *= whiteint point = pos_around(point) if !is_on_board(point): @@ -69,8 +69,8 @@ func get_attacks(): func en_passant(turncheck = true): # in passing - var passants = [pos_around(Vector2.LEFT), pos_around(Vector2.RIGHT)] - var moves = [] + var passants := [pos_around(Vector2.LEFT), pos_around(Vector2.RIGHT)] + var moves := [] for i in passants: if !is_on_board(i): continue @@ -87,7 +87,7 @@ func en_passant(turncheck = true): # in passing continue if check_spots_check and checkcheck(i): continue - var position = i + (Vector2.UP * whiteint) + var position: Vector2 = i + (Vector2.UP * whiteint) if !at_pos(position): moves.append(position) enpassant.append([position, spot]) @@ -95,11 +95,11 @@ func en_passant(turncheck = true): # in passing func _just_before_turn_over(): - var had_a_enpassant = len(enpassant) > 0 + var had_a_enpassant := len(enpassant) > 0 enpassant.clear() if !had_a_enpassant: # scuffed method to check if enpassant is possible en_passant(false) - var temporary = [] + var temporary := [] for i in enpassant: temporary.append(i[0]) if !temporary: diff --git a/pieces/Piece.gd b/pieces/Piece.gd index 7acf885..8c5565a 100644 --- a/pieces/Piece.gd +++ b/pieces/Piece.gd @@ -1,26 +1,26 @@ extends Node2D class_name Piece, "res://assets/pieces/california/wP.png" -var real_position = Vector2.ZERO +var real_position := Vector2.ZERO var white := true -var shortname = "" -var mininame = "♙" -var has_moved = false -var sprite -var frameon -var team = "w" -var check_spots_check = true -var no_enemys = false -var override_moveto = false - -onready var tween = $Tween -onready var anim = $AnimationPlayer -onready var colorrect = $ColorRect -onready var frame = $Frame +var shortname := "" +var mininame := "♙" +var has_moved := false +var sprite: Sprite +var frameon := false +var team := "w" +var check_spots_check := true +var no_enemys := false +var override_moveto := false + +onready var tween := $Tween +onready var anim := $AnimationPlayer +onready var colorrect := $ColorRect +onready var frame := $Frame func _ready(): - var tmp = Utils.get_node_name(self) + var tmp: Array = Utils.get_node_name(self) mininame = tmp[0] shortname = tmp[1] frame.position = Globals.grid.piece_size / 2 @@ -41,12 +41,12 @@ func clear_clicked(): func algebraic_take_notation(position): - var starter = shortname if shortname != "p" else to_algebraic(real_position)[0] + var starter := shortname if shortname != "p" else to_algebraic(real_position)[0] return starter + "x" + to_algebraic(position) func algebraic_move_notation(position): - var starter = shortname if shortname != "p" else "" + var starter := shortname if shortname != "p" else "" return starter + to_algebraic(position) @@ -68,7 +68,7 @@ func move(newpos: Vector2): # dont use directly; use moveto tween.start() -func moveto(position, real = true, take = false): +func moveto(position, real := true, take := false): Globals.grid.matrix[real_position.y][real_position.x] = null Globals.grid.matrix[position.y][position.x] = self if real: @@ -100,10 +100,10 @@ func all_dirs(): ] -func traverse(arr = [Vector2.UP, Vector2.DOWN, Vector2.LEFT, Vector2.RIGHT]): - var circle_array = [] +func traverse(arr := [Vector2.UP, Vector2.DOWN, Vector2.LEFT, Vector2.RIGHT]): + var circle_array := [] for i in arr: - var pos = real_position + var pos := real_position while true: pos += i if !is_on_board(pos): @@ -135,8 +135,8 @@ func get_moves(): # @Override func get_attacks(): # @Override no_enemys = false - var moves = get_moves() # assumes the attacks are same as moves - var final = [] + var moves: Array = get_moves() # assumes the attacks are same as moves + var final := [] for i in moves: if at_pos(i) != null: if at_pos(i).white != white: # attack ze enemie @@ -175,7 +175,7 @@ func set_circle(positions: Array, type := "move"): func checkcheck(pos): # moves to position, then checks if your king is in check - var mat = Globals.grid.matrix.duplicate(true) # make a copy of the matrix + var mat: Array = Globals.grid.matrix.duplicate(true) # make a copy of the matrix moveto(pos, false) # move to the position if Globals.grid.check_in_check(): # if you are still in check Globals.grid.matrix = mat # revert changes on the matrix diff --git a/project.godot b/project.godot index c43fb2f..063eedf 100644 --- a/project.godot +++ b/project.godot @@ -52,12 +52,12 @@ _global_script_classes=[ { _global_script_class_icons={ "Bishop": "res://assets/california/wB.png", "Grid": "", -"King": "res://assets/california/wK.png", -"Knight": "res://assets/california/wN.png", +"King": "res://assets/pieces/california/wK.png", +"Knight": "res://assets/pieces/california/wN.png", "Pawn": "res://assets/pieces/california/wP.png", "Piece": "res://assets/pieces/california/wP.png", -"Queen": "res://assets/california/wQ.png", -"Rook": "res://assets/california/wR.png" +"Queen": "res://assets/pieces/california/wQ.png", +"Rook": "res://assets/pieces/california/wR.png" } [application] @@ -85,7 +85,7 @@ gdscript/warnings/return_value_discarded=false [display] -window/size/width=800 +window/size/width=1200 window/size/height=800 window/stretch/mode="2d" window/stretch/aspect="keep" diff --git a/sounds/SoundFX.gd b/sounds/SoundFX.gd index be0aff0..09a71be 100644 --- a/sounds/SoundFX.gd +++ b/sounds/SoundFX.gd @@ -2,7 +2,7 @@ extends Node const soundpath = "res://sounds/" -var sounds = { +var sounds := { "Check": load(soundpath + "Check.ogg"), "Error": load(soundpath + "Error.ogg"), "Victory": load(soundpath + "Victory.ogg"), @@ -12,7 +12,7 @@ var sounds = { "Move": load(soundpath + "Move.ogg"), } -onready var sound_players = get_children() +onready var sound_players := get_children() func play(sound_string, pitch_scale = 1, volume_db = 0): diff --git a/ui/GameUI.tscn b/ui/GameUI.tscn new file mode 100644 index 0000000..59f223d --- /dev/null +++ b/ui/GameUI.tscn @@ -0,0 +1,67 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://ui/main.tres" type="Theme" id=1] +[ext_resource path="res://ui/roboto.tres" type="DynamicFont" id=2] +[ext_resource path="res://ui/TimerLabels.gd" type="Script" id=3] +[ext_resource path="res://ui/TimerLabels.gd" type="Script" id=4] +[ext_resource path="res://ui/Timer.gd" type="Script" id=5] + +[node name="UI" type="CanvasLayer"] + +[node name="Holder" type="Control" parent="."] +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -400.0 +theme = ExtResource( 1 ) + +[node name="Back" type="ColorRect" parent="Holder"] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.141176, 0.141176, 0.141176, 1 ) + +[node name="VBox" type="VBoxContainer" parent="Holder/Back"] +anchor_right = 1.0 +anchor_bottom = 1.0 +custom_constants/separation = 100 +alignment = 1 + +[node name="BlackTime" type="Label" parent="Holder/Back/VBox"] +margin_top = 267.0 +margin_right = 400.0 +margin_bottom = 350.0 +custom_fonts/font = ExtResource( 2 ) +text = "00:00.0" +align = 1 +valign = 1 +script = ExtResource( 4 ) + +[node name="ColorRect" type="ColorRect" parent="Holder/Back/VBox/BlackTime"] +show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 72.0 +margin_right = -72.0 +color = Color( 0, 0, 0, 1 ) + +[node name="WhiteTime" type="Label" parent="Holder/Back/VBox"] +margin_top = 450.0 +margin_right = 400.0 +margin_bottom = 533.0 +custom_fonts/font = ExtResource( 2 ) +text = "00:00.0" +align = 1 +valign = 1 +script = ExtResource( 3 ) +white = true + +[node name="ColorRect" type="ColorRect" parent="Holder/Back/VBox/WhiteTime"] +show_behind_parent = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 72.0 +margin_right = -72.0 +color = Color( 0, 0, 0, 1 ) + +[node name="Timer" type="Node" parent="Holder/Back/VBox"] +script = ExtResource( 5 ) diff --git a/ui/Settings.gd b/ui/Settings.gd index 273de7e..192a599 100644 --- a/ui/Settings.gd +++ b/ui/Settings.gd @@ -1,14 +1,31 @@ extends Control -onready var piece_sets = Utils.walk_dir() -onready var piece_set_button = $ColorRect/HBoxContainer/VBoxContainer/PieceSet +onready var piece_sets: Array = Utils.walk_dir() +onready var piece_set_button := $ColorRect/HBoxContainer/VBoxContainer/PieceSet +onready var fullscreenbutton := $ColorRect/HBoxContainer/VBoxContainer2/FullscreenButton +onready var vsyncbutton := $ColorRect/HBoxContainer/VBoxContainer2/VsyncButton +onready var borderlessbutton := $ColorRect/HBoxContainer/VBoxContainer2/Borderless + +var settings := {"vsync": OS.vsync_enabled, "fullscreen": OS.window_fullscreen, "borderless": OS.window_borderless} setget set_settings + + +func set_settings(new_settings): + toggle_button_visuals(new_settings) + settings = new_settings func toggle(onoff): visible = onoff +func toggle_button_visuals(set = settings): + vsyncbutton.pressed = set["vsync"] + fullscreenbutton.pressed = set["fullscreen"] + borderlessbutton.pressed = !set["borderless"] + + func _ready(): + toggle_button_visuals() for i in piece_sets: piece_set_button.add_icon_item(load("res://assets/pieces/" + i + "/wP.png"), i) piece_set_button.selected = 0 @@ -25,3 +42,18 @@ func _on_BackButton_pressed(): func _on_PieceSet_item_selected(index): Globals.piece_set = piece_sets[index] + + +func _on_VsyncButton_toggled(button_pressed: bool): + OS.vsync_enabled = button_pressed + self.settings.vsync = button_pressed + + +func _on_FullscreenButton_toggled(button_pressed: bool): + OS.window_fullscreen = button_pressed + self.settings.fullscreen = button_pressed + + +func _on_Borderless_toggled(button_pressed: bool): + self.settings.borderless = !button_pressed + OS.window_borderless = !button_pressed diff --git a/ui/Settings.tscn b/ui/Settings.tscn index 131d2b3..5622ce3 100644 --- a/ui/Settings.tscn +++ b/ui/Settings.tscn @@ -16,28 +16,65 @@ anchor_bottom = 1.0 color = Color( 0, 0, 0, 0.862745 ) [node name="HBoxContainer" type="HBoxContainer" parent="ColorRect"] -margin_left = 64.0 -margin_top = 64.0 -margin_right = 736.0 -margin_bottom = 752.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +alignment = 1 [node name="VBoxContainer" type="VBoxContainer" parent="ColorRect/HBoxContainer"] -margin_right = 386.0 -margin_bottom = 688.0 +margin_left = 225.0 +margin_right = 591.0 +margin_bottom = 800.0 +alignment = 1 [node name="BackButton" type="Button" parent="ColorRect/HBoxContainer/VBoxContainer"] -margin_right = 386.0 -margin_bottom = 112.0 +margin_top = 261.0 +margin_right = 366.0 +margin_bottom = 367.0 text = "back" [node name="PieceSet" type="OptionButton" parent="ColorRect/HBoxContainer/VBoxContainer"] -margin_top = 116.0 -margin_right = 386.0 -margin_bottom = 272.0 +margin_top = 382.0 +margin_right = 366.0 +margin_bottom = 538.0 focus_mode = 0 +custom_constants/hseparation = 3 enabled_focus_mode = 0 text = "piece set" icon = ExtResource( 3 ) +[node name="VBoxContainer2" type="VBoxContainer" parent="ColorRect/HBoxContainer"] +margin_left = 606.0 +margin_right = 975.0 +margin_bottom = 800.0 +alignment = 1 + +[node name="VsyncButton" type="CheckBox" parent="ColorRect/HBoxContainer/VBoxContainer2"] +margin_top = 175.0 +margin_right = 369.0 +margin_bottom = 315.0 +focus_mode = 0 +pressed = true +enabled_focus_mode = 0 +text = "vsync" + +[node name="FullscreenButton" type="CheckBox" parent="ColorRect/HBoxContainer/VBoxContainer2"] +margin_top = 330.0 +margin_right = 369.0 +margin_bottom = 470.0 +focus_mode = 0 +enabled_focus_mode = 0 +text = "fullscreen" + +[node name="Borderless" type="CheckBox" parent="ColorRect/HBoxContainer/VBoxContainer2"] +margin_top = 485.0 +margin_right = 369.0 +margin_bottom = 625.0 +focus_mode = 0 +enabled_focus_mode = 0 +text = "borders" + [connection signal="pressed" from="ColorRect/HBoxContainer/VBoxContainer/BackButton" to="." method="_on_BackButton_pressed"] [connection signal="item_selected" from="ColorRect/HBoxContainer/VBoxContainer/PieceSet" to="." method="_on_PieceSet_item_selected"] +[connection signal="toggled" from="ColorRect/HBoxContainer/VBoxContainer2/VsyncButton" to="." method="_on_VsyncButton_toggled"] +[connection signal="toggled" from="ColorRect/HBoxContainer/VBoxContainer2/FullscreenButton" to="." method="_on_FullscreenButton_toggled"] +[connection signal="toggled" from="ColorRect/HBoxContainer/VBoxContainer2/Borderless" to="." method="_on_Borderless_toggled"] diff --git a/ui/StartMenu.gd b/ui/StartMenu.gd index efeb5a0..9081788 100644 --- a/ui/StartMenu.gd +++ b/ui/StartMenu.gd @@ -2,16 +2,41 @@ extends Control const world = preload("res://World.tscn") -onready var settings = $Settings +export(float) var timer_length := 0.0 + +onready var settings := $ColorRect/Settings +onready var colorrect := $ColorRect +onready var tween := $Tween +onready var timer := $Timer func _on_local_pressed(): get_tree().change_scene_to(world) +func _ready(): + randomize() + timer.start(timer_length) + _on_Timer_timeout() + + func _on_quit_pressed(): get_tree().quit() func _on_settings_pressed(): settings.toggle(true) + + +func _on_Timer_timeout(): + tween.interpolate_property( + colorrect, + "color", + colorrect.color, + Color(rand_range(0, 1), rand_range(0, 1), rand_range(0, 1)), + timer_length, + Tween.TRANS_ELASTIC, + Tween.EASE_IN_OUT + ) + tween.start() + timer.start(timer_length) diff --git a/ui/StartMenu.tscn b/ui/StartMenu.tscn index df6e8c3..61fca7f 100644 --- a/ui/StartMenu.tscn +++ b/ui/StartMenu.tscn @@ -9,8 +9,14 @@ anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 1 ) script = ExtResource( 2 ) +timer_length = 2.8 -[node name="MainButtons" type="VBoxContainer" parent="."] +[node name="ColorRect" type="ColorRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0, 0, 0, 1 ) + +[node name="MainButtons" type="VBoxContainer" parent="ColorRect"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -20,41 +26,55 @@ margin_top = -224.0 margin_right = 196.0 margin_bottom = 412.0 -[node name="multiplayer" type="Button" parent="MainButtons"] -margin_left = 22.0 -margin_right = 366.0 -margin_bottom = 112.0 +[node name="multiplayer" type="Button" parent="ColorRect/MainButtons"] +margin_left = 36.0 +margin_right = 351.0 +margin_bottom = 106.0 +focus_mode = 0 size_flags_horizontal = 4 +enabled_focus_mode = 0 text = "multiplayer" -[node name="settings" type="Button" parent="MainButtons"] -margin_left = 64.0 -margin_top = 116.0 -margin_right = 324.0 -margin_bottom = 228.0 +[node name="settings" type="Button" parent="ColorRect/MainButtons"] +margin_left = 75.0 +margin_top = 121.0 +margin_right = 313.0 +margin_bottom = 227.0 +focus_mode = 0 size_flags_horizontal = 4 +enabled_focus_mode = 0 text = "settings" -[node name="local" type="Button" parent="MainButtons"] -margin_left = 107.0 -margin_top = 232.0 -margin_right = 280.0 -margin_bottom = 344.0 +[node name="local" type="Button" parent="ColorRect/MainButtons"] +margin_left = 113.0 +margin_top = 242.0 +margin_right = 275.0 +margin_bottom = 348.0 rect_min_size = Vector2( 100, 0 ) +focus_mode = 0 size_flags_horizontal = 4 +enabled_focus_mode = 0 text = "local" -[node name="quit" type="Button" parent="MainButtons"] -margin_left = 118.0 -margin_top = 348.0 -margin_right = 270.0 -margin_bottom = 460.0 +[node name="quit" type="Button" parent="ColorRect/MainButtons"] +margin_left = 123.0 +margin_top = 363.0 +margin_right = 265.0 +margin_bottom = 469.0 +focus_mode = 0 size_flags_horizontal = 4 +enabled_focus_mode = 0 text = "exit" -[node name="Settings" parent="." instance=ExtResource( 3 )] +[node name="Settings" parent="ColorRect" instance=ExtResource( 3 )] visible = false -[connection signal="pressed" from="MainButtons/settings" to="." method="_on_settings_pressed"] -[connection signal="pressed" from="MainButtons/local" to="." method="_on_local_pressed"] -[connection signal="pressed" from="MainButtons/quit" to="." method="_on_quit_pressed"] +[node name="Tween" type="Tween" parent="."] + +[node name="Timer" type="Timer" parent="."] +one_shot = true + +[connection signal="pressed" from="ColorRect/MainButtons/settings" to="." method="_on_settings_pressed"] +[connection signal="pressed" from="ColorRect/MainButtons/local" to="." method="_on_local_pressed"] +[connection signal="pressed" from="ColorRect/MainButtons/quit" to="." method="_on_quit_pressed"] +[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/ui/Timer.gd b/ui/Timer.gd new file mode 100644 index 0000000..ad937ba --- /dev/null +++ b/ui/Timer.gd @@ -0,0 +1,32 @@ +extends Node + +var enabled := false +var time_elapsed := 0.0 + +var count := 0 + +onready var whitelabel := $"../WhiteTime" +onready var blacklabel := $"../BlackTime" + + +func _process(delta): + if !enabled: + return + if Globals.turn: + if !whitelabel.set_time(whitelabel.time - delta): + enabled = false + else: + if !blacklabel.set_time(blacklabel.time - delta): + enabled = false + + +func _ready(): + whitelabel.time = 10 + blacklabel.time = 10 + Events.connect("turn_over", self, "turn_over") + + +func turn_over(): + time_elapsed = 0.0 + count += 1 + enabled = count >= 2 diff --git a/ui/TimerLabels.gd b/ui/TimerLabels.gd new file mode 100644 index 0000000..cfd2c7b --- /dev/null +++ b/ui/TimerLabels.gd @@ -0,0 +1,33 @@ +extends Label + +var time := 0.0 setget set_time +var stop := false + +export(bool) var white := false + +onready var colorrect := $ColorRect + + +func set_time(newtime): + if stop: + return false + time = newtime + if time <= 0.0: + Events.emit_signal("outoftime", "white" if white else "black") + stop = true + text = "00:00.0" + return false + var use_millis := time <= 10 + text = Utils.format_seconds(time, use_millis) + return true + + +func _ready(): + _on_turn_over() + colorrect.show_behind_parent = true + colorrect.color = Globals.grid.overlay_color + Events.connect("turn_over", self, "_on_turn_over") + + +func _on_turn_over(): + colorrect.visible = Globals.turn == white diff --git a/ui/main.tres b/ui/main.tres index 601f7da..77741de 100644 --- a/ui/main.tres +++ b/ui/main.tres @@ -1,9 +1,11 @@ -[gd_resource type="Theme" load_steps=8 format=2] +[gd_resource type="Theme" load_steps=10 format=2] [ext_resource path="res://ui/verdana.tres" type="DynamicFont" id=1] [ext_resource path="res://ui/button.tres" type="StyleBox" id=2] [ext_resource path="res://assets/ui/whitespace.png" type="Texture" id=3] +[ext_resource path="res://assets/ui/button.png" type="Texture" id=4] [ext_resource path="res://ui/buttonhover.tres" type="StyleBox" id=5] +[ext_resource path="res://assets/ui/checkedbox.png" type="Texture" id=6] [ext_resource path="res://ui/flatblack.tres" type="StyleBox" id=7] [sub_resource type="StyleBoxEmpty" id=2] @@ -22,6 +24,15 @@ Button/styles/focus = ExtResource( 2 ) Button/styles/hover = ExtResource( 5 ) Button/styles/normal = ExtResource( 2 ) Button/styles/pressed = ExtResource( 2 ) +CheckBox/icons/checked = ExtResource( 6 ) +CheckBox/icons/checked_disabled = null +CheckBox/icons/radio_checked = null +CheckBox/icons/radio_checked_disabled = null +CheckBox/icons/radio_unchecked = null +CheckBox/icons/radio_unchecked_disabled = null +CheckBox/icons/unchecked = ExtResource( 4 ) +CheckBox/icons/unchecked_disabled = null +HBoxContainer/constants/separation = 15 OptionButton/colors/font_color = Color( 1, 1, 1, 1 ) OptionButton/colors/font_color_focus = Color( 1, 1, 1, 1 ) OptionButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) @@ -35,3 +46,4 @@ PopupMenu/icons/radio_checked = ExtResource( 3 ) PopupMenu/icons/radio_unchecked = ExtResource( 3 ) PopupMenu/styles/hover = SubResource( 3 ) PopupMenu/styles/panel = ExtResource( 7 ) +VBoxContainer/constants/separation = 15 diff --git a/ui/roboto.tres b/ui/roboto.tres new file mode 100644 index 0000000..7c131ca --- /dev/null +++ b/ui/roboto.tres @@ -0,0 +1,7 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://assets/ui/Roboto-Medium.ttf" type="DynamicFontData" id=1] + +[resource] +size = 70 +font_data = ExtResource( 1 ) diff --git a/ui/verdana.tres b/ui/verdana.tres index 1408371..44ebde1 100644 --- a/ui/verdana.tres +++ b/ui/verdana.tres @@ -3,5 +3,5 @@ [ext_resource path="res://assets/ui/verdana-bold.ttf" type="DynamicFontData" id=1] [resource] -size = 45 +size = 40 font_data = ExtResource( 1 ) |
