diff --git a/.gitattributes b/.gitattributes index 2ced0df..3768751 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -*.htm linguist-detectable=true +*.htm linguist-detectable=false *.gambas linguist-detectable=true *.class linguist-detectable=true diff --git a/.hidden/CHANGELOG b/.hidden/CHANGELOG index 981b2b3..dec241c 100644 --- a/.hidden/CHANGELOG +++ b/.hidden/CHANGELOG @@ -1,3 +1,6 @@ +* Mon Apr 27 2020 Junior Criste 2.0.0 +- Finish 2.0 + * Mon Apr 20 2020 Junior Criste 1.7.0 * Sat Apr 18 2020 Junior Criste 1.7.0 diff --git a/.project b/.project index 1ec84a1..5bb02d3 100644 --- a/.project +++ b/.project @@ -2,7 +2,7 @@ Title=Open Tic Tac Toe Startup=MenuG Icon=assets/Imgs/icon_v2.png -Version=1.7.0 +Version=2.0.0 Component=gb.image Component=gb.gui Component=gb.form @@ -17,9 +17,23 @@ VendorPrefix=JuniorCriste Address=informaticode@gmail.com Url=www.informaticode.com.br License=General Public License -PackageName=opentictactoe-1.7.0 +PackageName=opentictactoe-2.0.0 +PackageVersion=2 CreateEachDirectory=1 Packager=1 -Systems=ubuntu -Menus=ubuntu:"Games/Puzzles" +Systems=debian,fedora,suse,slackware,ubuntu +SameDependencies=1 +Menus=debian:"Games/Strategy" +Categories=debian:"Games" +Groups=debian:"games" +Menus=fedora:"Game/Logic Game" +Categories=fedora:"Game;Games;LogicGame" +Groups=fedora:"Amusements/Games" +Menus=slackware:"Game/Logic Game" +Categories=slackware:"Game;LogicGame" +Groups=slackware:"Amusements/Games" +Menus=suse:"Game/Logic Game" +Categories=suse:"Game;LogicGame" +Groups=suse:"Amusements/Games/Strategy" +Menus=ubuntu:"Games/Strategy" Groups=ubuntu:"games" diff --git a/.src/About.class b/.src/About.class index 6bf165f..6207e35 100644 --- a/.src/About.class +++ b/.src/About.class @@ -10,6 +10,9 @@ Public Sub Form_Open() fakelink.Mouse = Mouse.Custom fakelink.Cursor = New Cursor(Picture["./assets/Imgs/cursormini.png"]) + DONATE.Mouse = Mouse.Custom + DONATE.Cursor = New Cursor(Picture["./assets/Imgs/cursormini.png"]) + End Public Sub fakelink_MouseDown() @@ -19,3 +22,9 @@ Public Sub fakelink_MouseDown() End + +Public Sub DONATE_MouseDown() + + Shell "firefox https://opentictactoe.informaticode.com.br/2020/04/make-donation.html" + +End diff --git a/.src/About.form b/.src/About.form index 3a424fc..ffdc8ed 100644 --- a/.src/About.form +++ b/.src/About.form @@ -1,15 +1,21 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,0,85.4286,57) + MoveScaled(0,0,86,57) Icon = Picture["assets/love.png"] Resizable = False { cred PictureBox - MoveScaled(0,0,85.7143,57.1429) + MoveScaled(0,0,86,57) Picture = Picture["assets/Imgs/creditos.png"] + Mode = PictureBox.Fill } { fakelink PictureBox MoveScaled(25,49,37,5) Mouse = Mouse.Pointing } + { DONATE PictureBox + MoveScaled(2,51,17,4) + Picture = Picture["assets/Imgs/donate.png"] + Mode = PictureBox.Contain + } } diff --git a/.src/Game.class b/.src/Game.class index 2d1195c..315bfa0 100644 --- a/.src/Game.class +++ b/.src/Game.class @@ -292,6 +292,8 @@ Public Sub botoesclicados() Endif atualizador gradeatual.Visible = True + + pegafocus.SetFocus End diff --git a/.src/Game.form b/.src/Game.form index 63f58ab..031d8d5 100644 --- a/.src/Game.form +++ b/.src/Game.form @@ -159,7 +159,7 @@ Alignment = Align.Center } { !ng PictureBox - MoveScaled(72,61,15,6) + MoveScaled(72,58,15,6) #Public = True Picture = Picture["assets/Imgs/newGame.png"] Mode = PictureBox.Contain @@ -224,4 +224,8 @@ Picture = Picture["assets/Imgs/block.png"] Mode = PictureBox.Fill } + { pegafocus Button + MoveScaled(77,12,4,3) + Visible = False + } } diff --git a/.src/MakeaDonation.class b/.src/MakeaDonation.class new file mode 100644 index 0000000..46d7bad --- /dev/null +++ b/.src/MakeaDonation.class @@ -0,0 +1,35 @@ +' Gambas class file + + +Public Sub DONATE_MouseDown() + + Shell "firefox https://opentictactoe.informaticode.com.br/2020/04/make-donation.html" + +End + +Public Sub Form_Open() + + + DONATE.Mouse = Mouse.Custom + DONATE.Cursor = New Cursor(Picture["./assets/Imgs/cursormini2.png"]) + + backtogame.Mouse = Mouse.Custom + backtogame.Cursor = New Cursor(Picture["./assets/Imgs/cursormini.png"]) + + fakelink.Mouse = Mouse.Custom + fakelink.Cursor = New Cursor(Picture["./assets/Imgs/cursormini.png"]) + +End + +Public Sub backtogame_MouseDown() + + MakeaDonation.Hide + + +End + +Public Sub fakelink_MouseDown() + + Shell "firefox https://opentictactoe.informaticode.com.br/2020/04/make-donation.html" + +End diff --git a/.src/MakeaDonation.form b/.src/MakeaDonation.form new file mode 100644 index 0000000..adcf5ba --- /dev/null +++ b/.src/MakeaDonation.form @@ -0,0 +1,22 @@ +# Gambas Form File 3.0 + +{ Form Form + MoveScaled(0,0,42,37) + Background = &HE0E0E0& + Icon = Picture["assets/Imgs/Logo_love.png"] + Resizable = False + { DONATE PictureBox + MoveScaled(0,0,42,41) + Picture = Picture["assets/Imgs/donateBig.png"] + Alignment = Align.Center + } + { backtogame PictureBox + MoveScaled(26,30,15,6) + Picture = Picture["assets/Imgs/not.png"] + Mode = PictureBox.Contain + } + { fakelink PictureBox + MoveScaled(8,21,25,8) + Mouse = Mouse.Pointing + } +} diff --git a/.src/MenuG.class b/.src/MenuG.class index 63e6c93..bcabf92 100644 --- a/.src/MenuG.class +++ b/.src/MenuG.class @@ -45,6 +45,9 @@ Public Sub Form_Open() hist.Mouse = Mouse.Custom hist.Cursor = New Cursor(Picture["./assets/Imgs/cursormini.png"]) + info.Mouse = Mouse.Custom + info.Cursor = New Cursor(Picture["./assets/Imgs/cursormini.png"]) + Dadoslog primeiraVez @@ -326,11 +329,22 @@ Public Sub primeiraVez() If (Game.partidasjogadas = 0 And Game.partidasganhas = 0 And Game.partidasperdidas = 0) Then - message("WELCOME!") + Print ("PRIMEIRA VEZ!") Endif End +Public Sub alertDonation() + + History.carregarHistorico + If (Game.partidasjogadas = 5) Or (Game.partidasjogadas = 100) Or (Game.partidasjogadas = 500) Then + + Print ("ALERT DONATE") + MakeaDonation.Show + Endif + +End + Public Sub hist_MouseDown() @@ -338,3 +352,9 @@ Public Sub hist_MouseDown() History.Show End + +Public Sub info_MouseDown() + + About.Show + +End diff --git a/.src/MenuG.form b/.src/MenuG.form index 60329ca..c028785 100644 --- a/.src/MenuG.form +++ b/.src/MenuG.form @@ -1,47 +1,54 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,0,46,55) + MoveScaled(0,0,46,56) Background = &H073140& Text = ("Open Tic Tac Toe") Icon = Picture["assets/Imgs/mini_icon_v2.png"] Resizable = False { op1 PictureBox - MoveScaled(1,3,43.7143,21.4286) + MoveScaled(1,4,43.7143,21.4286) Mouse = Mouse.Pointing Picture = Picture["assets/Players/ctrl1.png"] } { op2 PictureBox - MoveScaled(1,29,43.7143,21.4286) + MoveScaled(1,30,43.7143,21.4286) Mouse = Mouse.Pointing Picture = Picture["assets/Players/ctrl2.png"] } { infp1 Label - MoveScaled(7,24,35,5) + MoveScaled(7,25,35,5) Font = Font["Geometos,+2"] Foreground = &HC0C0C0& Text = ("PLAYER X PLAYER") Alignment = Align.Center } { infp2 Label - MoveScaled(5,50,35,5) + MoveScaled(5,51,35,5) Font = Font["Geometos,+2"] Foreground = &HC0C0C0& Text = ("PLAYER X COMPUTER") Alignment = Align.Center } { !sett PictureBox - MoveScaled(43,0,3,4) + MoveScaled(42,0,3,4) #Public = True Mouse = Mouse.Pointing Picture = Picture["assets/Imgs/sett.png"] Mode = PictureBox.Contain } { !hist PictureBox - MoveScaled(39,0,3,4) + MoveScaled(5,0,3,4) #Public = True Mouse = Mouse.Pointing Picture = Picture["assets/Imgs/hist.png"] Mode = PictureBox.Contain } + { !info PictureBox + MoveScaled(1,0,3,4) + #Public = True + Mouse = Mouse.Pointing + Picture = Picture["assets/Imgs/info.png"] + Mode = PictureBox.Contain + } } diff --git a/.src/WinnerAlert.class b/.src/WinnerAlert.class index 440c0a1..fb71ee4 100644 --- a/.src/WinnerAlert.class +++ b/.src/WinnerAlert.class @@ -4,6 +4,7 @@ Public Sub backtogame_MouseDown() WinnerAlert.Hide + MenuG.alertDonation Game.ng.Enabled = True End @@ -48,5 +49,14 @@ Public Sub definecursor() backtogame.Mouse = Mouse.Custom backtogame.Cursor = New Cursor(Picture["./assets/Imgs/cursormed.png"]) + + DONATE.Mouse = Mouse.Custom + DONATE.Cursor = New Cursor(Picture["./assets/Imgs/cursormed.png"]) End + +Public Sub DONATE_MouseDown() + + Shell "firefox https://opentictactoe.informaticode.com.br/2020/04/make-donation.html" + +End diff --git a/.src/WinnerAlert.form b/.src/WinnerAlert.form index 7efe467..b1ae259 100644 --- a/.src/WinnerAlert.form +++ b/.src/WinnerAlert.form @@ -23,4 +23,9 @@ Picture = Picture["assets/Imgs/ok.png"] Mode = PictureBox.Contain } + { DONATE PictureBox + MoveScaled(1,19,17,4) + Picture = Picture["assets/Imgs/donate.png"] + Mode = PictureBox.Contain + } } diff --git a/.src/shell/e-configBG.sh b/.src/shell/e-configBG.sh new file mode 100644 index 0000000..580f82b --- /dev/null +++ b/.src/shell/e-configBG.sh @@ -0,0 +1 @@ + clear && cd ~ && cd .opentictactoe-cfg/configure && if [ -e configBG.txt ]; then echo arquivo existe; else echo Arquivo nao existe; fi diff --git a/.src/shell/fullScript.sh b/.src/shell/fullScript.sh index b0166ff..f0a81ff 100644 --- a/.src/shell/fullScript.sh +++ b/.src/shell/fullScript.sh @@ -1 +1 @@ -clear && cd ~ && if [ -e .opentictactoe-cfg/configure ]; then echo DIRETORIO JA EXISTE; else echo CRIANDO DIRETORIO; mkdir .opentictactoe-cfg; cd .opentictactoe-cfg && mkdir configure; echo AGORA DIRETORIO JA EXISTE; fi; cd ~ && cd .opentictactoe-cfg/configure && if [ -e configApp.txt ]; then echo ARQUIVO JA EXISTE; else touch configApp.txt; echo mus3 > configApp.txt; echo AGORA ARQUIVO JA EXISTE; fi +clear && cd ~ && if [ -e .opentictactoe-cfg/configure ]; then echo DIRETORIO JA EXISTE; else echo CRIANDO DIRETORIO; mkdir .opentictactoe-cfg; cd .opentictactoe-cfg && mkdir configure; echo AGORA DIRETORIO JA EXISTE; fi; cd ~ && cd .opentictactoe-cfg/configure && if [ -e configApp.txt ]; then echo ARQUIVO JA EXISTE; else touch configApp.txt; echo mus3 > configApp.txt; echo AGORA ARQUIVO JA EXISTE; fi && cd ~ && cd .opentictactoe-cfg/configure && if [ -e configBG.txt ]; then echo ARQUIVO JA EXISTE; else touch configBG.txt; echo BG1 > configBG.txt; echo AGORA ARQUIVO JA EXISTE; fi diff --git a/README.md b/README.md index ee9a736..4ff6fa3 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,7 @@ ###### _pt-br_ ### Open Tic Tac Toe é um "jogo da velha" gratuito e de código aberto desenvolvido por Junior Criste para rodar em sistemas Linux. ###### Relatório de Versões - + + +### Downloads +###### Confira os pacotes para Download aqui. diff --git a/assets/EditImg/creditos.xcf b/assets/EditImg/creditos.xcf index 0f4a85b..f5c6cac 100644 Binary files a/assets/EditImg/creditos.xcf and b/assets/EditImg/creditos.xcf differ diff --git a/assets/EditImg/rewardsmodel.xcf b/assets/EditImg/rewardsmodel.xcf new file mode 100644 index 0000000..dc6e731 Binary files /dev/null and b/assets/EditImg/rewardsmodel.xcf differ diff --git a/assets/Imgs/abo.png b/assets/Imgs/abo.png new file mode 100644 index 0000000..5907e44 Binary files /dev/null and b/assets/Imgs/abo.png differ diff --git a/assets/Imgs/creditos.png b/assets/Imgs/creditos.png index 792a7e5..28cfc7a 100644 Binary files a/assets/Imgs/creditos.png and b/assets/Imgs/creditos.png differ diff --git a/assets/Imgs/donate.png b/assets/Imgs/donate.png new file mode 100644 index 0000000..5de74f3 Binary files /dev/null and b/assets/Imgs/donate.png differ diff --git a/assets/Imgs/donateBig.png b/assets/Imgs/donateBig.png new file mode 100644 index 0000000..3fda9a4 Binary files /dev/null and b/assets/Imgs/donateBig.png differ diff --git a/assets/Imgs/info.png b/assets/Imgs/info.png new file mode 100644 index 0000000..c4232c4 Binary files /dev/null and b/assets/Imgs/info.png differ diff --git a/assets/Imgs/not.png b/assets/Imgs/not.png new file mode 100644 index 0000000..cecfb6d Binary files /dev/null and b/assets/Imgs/not.png differ diff --git a/assets/Imgs/yes.png b/assets/Imgs/yes.png new file mode 100644 index 0000000..a35984b Binary files /dev/null and b/assets/Imgs/yes.png differ diff --git a/assets/Printscreen/Print1.png b/assets/Printscreen/Print1.png index 044c600..d50c859 100644 Binary files a/assets/Printscreen/Print1.png and b/assets/Printscreen/Print1.png differ diff --git a/assets/Printscreen/Print10.png b/assets/Printscreen/Print10.png new file mode 100644 index 0000000..e4f07e4 Binary files /dev/null and b/assets/Printscreen/Print10.png differ diff --git a/assets/Printscreen/Print11.png b/assets/Printscreen/Print11.png new file mode 100644 index 0000000..69876f7 Binary files /dev/null and b/assets/Printscreen/Print11.png differ diff --git a/assets/Printscreen/Print2.png b/assets/Printscreen/Print2.png index b796176..373cb5b 100644 Binary files a/assets/Printscreen/Print2.png and b/assets/Printscreen/Print2.png differ diff --git a/assets/Printscreen/Print3.png b/assets/Printscreen/Print3.png index 1737aad..acde60f 100644 Binary files a/assets/Printscreen/Print3.png and b/assets/Printscreen/Print3.png differ diff --git a/assets/Printscreen/Print4.png b/assets/Printscreen/Print4.png new file mode 100644 index 0000000..2230257 Binary files /dev/null and b/assets/Printscreen/Print4.png differ diff --git a/assets/Printscreen/Print5.png b/assets/Printscreen/Print5.png new file mode 100644 index 0000000..554a14b Binary files /dev/null and b/assets/Printscreen/Print5.png differ diff --git a/assets/Printscreen/Print6.png b/assets/Printscreen/Print6.png new file mode 100644 index 0000000..79645ca Binary files /dev/null and b/assets/Printscreen/Print6.png differ diff --git a/assets/Printscreen/Print8.png b/assets/Printscreen/Print8.png new file mode 100644 index 0000000..dfe7fb3 Binary files /dev/null and b/assets/Printscreen/Print8.png differ diff --git a/assets/Printscreen/Print9.png b/assets/Printscreen/Print9.png new file mode 100644 index 0000000..3b902b9 Binary files /dev/null and b/assets/Printscreen/Print9.png differ diff --git a/assets/Printscreen/windows.png b/assets/Printscreen/windows.png index 54b2154..e730a07 100644 Binary files a/assets/Printscreen/windows.png and b/assets/Printscreen/windows.png differ diff --git a/assets/dates/RelatorioDeAtualizacao.htm b/assets/dates/RelatorioDeAtualizacao.htm index e3c9065..c0488c6 100644 --- a/assets/dates/RelatorioDeAtualizacao.htm +++ b/assets/dates/RelatorioDeAtualizacao.htm @@ -55,6 +55,14 @@

Versão 1.70

  • Reconhecimento da primeira sessão jogável.
  • Ícone atualizado.
  • Adicionada tela com placar histórico.

    • +

    Versão 2.0

    +
  • Adicionado troca de background junto a música.
    • +
  • Adicionado mais um arquivo shell as configurações, para definição dos fundos.
    • +
  • Bug que permitia marcar uma área já marcada usando o teclado foi resolvido.
    • +
  • Adição da tela e links de Donate.
    • +
  • Atualização de Interface da tela de créditos.
    • +
  • Criação de pacote de instalação para versão 2.0 compativeis com Ubuntu, Mint, Debian, RedHat, OpenSuse, Slackware, Fedora, CentOS e baseados nessas distros.
    • +
  • Atualização do Readme e das capturas de tela na documentação do GitHub e do site.

    • diff --git a/assets/dates/premios.txt b/assets/dates/premios.txt new file mode 100644 index 0000000..be46aa5 --- /dev/null +++ b/assets/dates/premios.txt @@ -0,0 +1,13 @@ +10 Vitórias do Player 1 x Computador +100 Vitórias do Player 1 x Computador +1000 Vitórias do Player 1 x Computador + +100 Empates + +100 Partidas +250 Partidas +500 Partidas +1000 Partidas + + +NÃO EM PRATICA! diff --git a/assets/dates/rascunho.txt b/assets/dates/rascunho.txt deleted file mode 100644 index 739d3e1..0000000 --- a/assets/dates/rascunho.txt +++ /dev/null @@ -1,26 +0,0 @@ -## Jogo da Velha - - - -Comments--Anotações - -.Matrix 3x3 -.Dois Jogadores -.Possiveis combinacoes = A1 * B1 * C1 v - A1 * A2 * A3 v - A1 * B2 * C3 v - A2 * B2 * C2 v - A3 * B3 * C3 v - B1 * B2 * B3 v - C1 * C2 * C3 v - C1 * B2 * A3 v - - -Cores Buttons... - -Jogador 1 = &H2FC02F& -Jogador 2 = &HFF3FFF& - - - - diff --git a/assets/rewards/back.png b/assets/rewards/back.png new file mode 100644 index 0000000..724d26a Binary files /dev/null and b/assets/rewards/back.png differ diff --git a/assets/rewards/progress.png b/assets/rewards/progress.png new file mode 100644 index 0000000..79abe3c Binary files /dev/null and b/assets/rewards/progress.png differ diff --git a/assets/rewards/welcome.png b/assets/rewards/welcome.png new file mode 100644 index 0000000..ea82164 Binary files /dev/null and b/assets/rewards/welcome.png differ diff --git a/bin/Debian/opentictactoe.deb b/bin/Debian/opentictactoe.deb new file mode 100644 index 0000000..0744e91 Binary files /dev/null and b/bin/Debian/opentictactoe.deb differ diff --git a/bin/Fedora - RedHat - CentOS/opentictactoe.rpm b/bin/Fedora - RedHat - CentOS/opentictactoe.rpm new file mode 100644 index 0000000..da5dceb Binary files /dev/null and b/bin/Fedora - RedHat - CentOS/opentictactoe.rpm differ diff --git a/bin/Suse/opentictactoe.rpm b/bin/Suse/opentictactoe.rpm new file mode 100644 index 0000000..c6c85d2 Binary files /dev/null and b/bin/Suse/opentictactoe.rpm differ diff --git a/bin/Ubuntu & Mint/opentictactoe.deb b/bin/Ubuntu & Mint/opentictactoe.deb deleted file mode 100644 index f238fa3..0000000 Binary files a/bin/Ubuntu & Mint/opentictactoe.deb and /dev/null differ diff --git a/bin/slackware/opentictactoe.tgz b/bin/slackware/opentictactoe.tgz new file mode 100644 index 0000000..f33888c Binary files /dev/null and b/bin/slackware/opentictactoe.tgz differ diff --git a/bin/ubuntu - Mint - Bodhi - Kubuntu/opentictactoe.deb b/bin/ubuntu - Mint - Bodhi - Kubuntu/opentictactoe.deb new file mode 100644 index 0000000..a99c10f Binary files /dev/null and b/bin/ubuntu - Mint - Bodhi - Kubuntu/opentictactoe.deb differ