From d522205eaaca4b3cbe4f65937886fc921d6d879c Mon Sep 17 00:00:00 2001 From: Dvimer Date: Sun, 24 Jan 2016 21:48:35 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=9F=D0=B5=D1=88=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/ru/dvimer/lesson/Figurs/Pawn.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/src/ru/dvimer/lesson/Figurs/Pawn.java diff --git a/core/src/ru/dvimer/lesson/Figurs/Pawn.java b/core/src/ru/dvimer/lesson/Figurs/Pawn.java new file mode 100644 index 0000000..79bbb4d --- /dev/null +++ b/core/src/ru/dvimer/lesson/Figurs/Pawn.java @@ -0,0 +1,8 @@ +package ru.dvimer.lesson.Figurs; + +/** + * Created by Алексей on 24.01.2016. + */ +public class Pawn { + +} From 0448d579d7339eb42edbbb3df2c529a7e17ab84a Mon Sep 17 00:00:00 2001 From: Dvimer Date: Sun, 24 Jan 2016 21:52:01 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=9F=D0=B5=D1=88=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/ru/dvimer/lesson/Figurs/Pawn.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/ru/dvimer/lesson/Figurs/Pawn.java b/core/src/ru/dvimer/lesson/Figurs/Pawn.java index 79bbb4d..1166e10 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Pawn.java +++ b/core/src/ru/dvimer/lesson/Figurs/Pawn.java @@ -4,5 +4,4 @@ * Created by Алексей on 24.01.2016. */ public class Pawn { - } From 51a851a12f09c649e033988828b2d3e343d29286 Mon Sep 17 00:00:00 2001 From: Dvimer Date: Tue, 26 Jan 2016 21:12:25 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=9E=D0=BF=D0=B8=D1=81=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=A4=D0=B8=D0=B3=D1=83=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lesson/Figurs/{Rook.java => Ferz.java} | 16 ++++++----- core/src/ru/dvimer/lesson/Figurs/Figure.java | 9 +++---- core/src/ru/dvimer/lesson/Figurs/Horse.java | 16 +++++------ core/src/ru/dvimer/lesson/Figurs/King.java | 27 +++++++++++++++++++ core/src/ru/dvimer/lesson/Figurs/Quine.java | 24 +++++++++++++++++ core/src/ru/dvimer/lesson/Figurs/Slon.java | 27 +++++++++++++++++++ 6 files changed, 98 insertions(+), 21 deletions(-) rename core/src/ru/dvimer/lesson/Figurs/{Rook.java => Ferz.java} (62%) create mode 100644 core/src/ru/dvimer/lesson/Figurs/King.java create mode 100644 core/src/ru/dvimer/lesson/Figurs/Quine.java create mode 100644 core/src/ru/dvimer/lesson/Figurs/Slon.java diff --git a/core/src/ru/dvimer/lesson/Figurs/Rook.java b/core/src/ru/dvimer/lesson/Figurs/Ferz.java similarity index 62% rename from core/src/ru/dvimer/lesson/Figurs/Rook.java rename to core/src/ru/dvimer/lesson/Figurs/Ferz.java index 0b139c3..0ad752b 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Rook.java +++ b/core/src/ru/dvimer/lesson/Figurs/Ferz.java @@ -1,22 +1,26 @@ + package ru.dvimer.lesson.Figurs; /** * Created by Алексей on 23.01.2016. */ -public class Rook extends Figure { - +public class Ferz extends Figure { - - public Rook(int x, int y) { + public Ferz(int x, int y) { super(x, y); - } + @Override - public void setPosition(int x, int y) { + + public boolean setPosition(int x, int y) { if (y - this.y == x - this.x || -(y - this.y) == (x - this.x)) { this.y = y; this.x = x; + return true; } + return false; } + + } diff --git a/core/src/ru/dvimer/lesson/Figurs/Figure.java b/core/src/ru/dvimer/lesson/Figurs/Figure.java index 9c1f5d8..18ecb09 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Figure.java +++ b/core/src/ru/dvimer/lesson/Figurs/Figure.java @@ -1,5 +1,7 @@ package ru.dvimer.lesson.Figurs; +import java.util.ArrayList; + /** * Created by Алексей on 23.01.2016. */ @@ -8,7 +10,6 @@ public abstract class Figure { protected int y; - public Figure() { } @@ -18,7 +19,6 @@ public Figure(int x, int y) { } - public int getX() { return x; } @@ -35,7 +35,6 @@ public void setY(int y) { this.y = y; } - // public void setPosition(int x, int y) { // if (y - this.y == 1 && x-this.x == 1) { // this.y = y++; @@ -45,8 +44,6 @@ public void setY(int y) { // - - - public abstract void setPosition(int x, int y); + public abstract boolean setPosition(int x, int y); } diff --git a/core/src/ru/dvimer/lesson/Figurs/Horse.java b/core/src/ru/dvimer/lesson/Figurs/Horse.java index 1fddb3b..997a62e 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Horse.java +++ b/core/src/ru/dvimer/lesson/Figurs/Horse.java @@ -9,18 +9,16 @@ public Horse(int x, int y) { super(x, y); } + @Override - public void setPosition(int x, int y) { - if (y - this.y == 2 && x - this.x == 1 || - y - this.y == 2 && x - this.x == -1 || - y - this.y == -2 && x - this.x == -1 || - y - this.y == -2 && x - this.x == 1 || - y - this.y == 1 && x - this.x == 2 || - y - this.y == 1 && x - this.x == -2 || - y - this.y == -1 && x - this.x == 2 || - y - this.y == -1 && x - this.x == -2) { + public boolean setPosition(int x, int y) { + if (Math.abs(y-this.y) == 2&& Math.abs(x - this.x) == 1|| Math.abs(y-this.y) == 1&& Math.abs(x - this.x) == 2){ this.y = y; this.x = x; + return true; } + return false; } + + } diff --git a/core/src/ru/dvimer/lesson/Figurs/King.java b/core/src/ru/dvimer/lesson/Figurs/King.java new file mode 100644 index 0000000..fe317b1 --- /dev/null +++ b/core/src/ru/dvimer/lesson/Figurs/King.java @@ -0,0 +1,27 @@ +package ru.dvimer.lesson.Figurs; + +/** + * Created by Алексей on 23.01.2016. + */ +public class King extends Figure { + + + public King(int x, int y) { + super(x, y); + + } + + + @Override + public boolean setPosition(int x, int y) { + if (Math.abs(y-this.y) == 1&& Math.abs(x - this.x) == 0|| Math.abs(y-this.y) == 0&& Math.abs(x - this.x) == 1||Math.abs(y-this.y) == 1 && Math.abs(x - this.x) == 1){ + this.y = y; + this.x = x; + return true; + } + return false; + } + + + +} diff --git a/core/src/ru/dvimer/lesson/Figurs/Quine.java b/core/src/ru/dvimer/lesson/Figurs/Quine.java new file mode 100644 index 0000000..74c7c62 --- /dev/null +++ b/core/src/ru/dvimer/lesson/Figurs/Quine.java @@ -0,0 +1,24 @@ + +package ru.dvimer.lesson.Figurs; +/** + * Created by Алексей on 23.01.2016. + */ +public class Quine extends Figure { + + public Quine(int x, int y) { + super(x, y); + } + + + @Override + public boolean setPosition(int x, int y) { + if (Math.abs(y-this.y) <=8&& x - this.x == 0|| y-this.y == 0&& Math.abs(x - this.x) <=8 ||y - this.y == x - this.x || -(y - this.y) == (x - this.x) ){ + this.y = y; + this.x = x; + return true; + } + return false; + } + + +} diff --git a/core/src/ru/dvimer/lesson/Figurs/Slon.java b/core/src/ru/dvimer/lesson/Figurs/Slon.java new file mode 100644 index 0000000..73ec152 --- /dev/null +++ b/core/src/ru/dvimer/lesson/Figurs/Slon.java @@ -0,0 +1,27 @@ +package ru.dvimer.lesson.Figurs; + +/** + * Created by Алексей on 23.01.2016. + */ +public class Slon extends Figure { + + + public Slon(int x, int y) { + super(x, y); + + } + + + @Override + public boolean setPosition(int x, int y) { + if (Math.abs(y-this.y) <= 8&& x - this.x == 0|| y-this.y == 0&& Math.abs(x - this.x) <=8 ){ + this.y = y; + this.x = x; + return true; + } + return false; + } + + + +} From 254c033da6745f13a3bb29d5ee07c707d62851a7 Mon Sep 17 00:00:00 2001 From: Dvimer Date: Tue, 26 Jan 2016 21:54:39 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=A4=D0=98=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D1=8B=20=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B8=20=D1=85=D0=BE=D0=B4=20=D0=BF=D0=B5=D1=88=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lesson/Figurs/{Ferz.java => Bishop.java} | 4 +-- .../lesson/Figurs/{Horse.java => Knight.java} | 4 +-- core/src/ru/dvimer/lesson/Figurs/Pawn.java | 21 +++++++++++++-- .../lesson/Figurs/{Quine.java => Queen.java} | 4 +-- .../lesson/Figurs/{Slon.java => Rook.java} | 4 +-- core/src/ru/dvimer/lesson/GameClass.java | 27 +++++++++++-------- 6 files changed, 43 insertions(+), 21 deletions(-) rename core/src/ru/dvimer/lesson/Figurs/{Ferz.java => Bishop.java} (83%) rename core/src/ru/dvimer/lesson/Figurs/{Horse.java => Knight.java} (85%) rename core/src/ru/dvimer/lesson/Figurs/{Quine.java => Queen.java} (86%) rename core/src/ru/dvimer/lesson/Figurs/{Slon.java => Rook.java} (85%) diff --git a/core/src/ru/dvimer/lesson/Figurs/Ferz.java b/core/src/ru/dvimer/lesson/Figurs/Bishop.java similarity index 83% rename from core/src/ru/dvimer/lesson/Figurs/Ferz.java rename to core/src/ru/dvimer/lesson/Figurs/Bishop.java index 0ad752b..82c1e2f 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Ferz.java +++ b/core/src/ru/dvimer/lesson/Figurs/Bishop.java @@ -4,9 +4,9 @@ /** * Created by Алексей on 23.01.2016. */ -public class Ferz extends Figure { +public class Bishop extends Figure { - public Ferz(int x, int y) { + public Bishop(int x, int y) { super(x, y); } diff --git a/core/src/ru/dvimer/lesson/Figurs/Horse.java b/core/src/ru/dvimer/lesson/Figurs/Knight.java similarity index 85% rename from core/src/ru/dvimer/lesson/Figurs/Horse.java rename to core/src/ru/dvimer/lesson/Figurs/Knight.java index 997a62e..caa6d8a 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Horse.java +++ b/core/src/ru/dvimer/lesson/Figurs/Knight.java @@ -3,9 +3,9 @@ /** * Created by Алексей on 23.01.2016. */ -public class Horse extends Figure { +public class Knight extends Figure { - public Horse(int x, int y) { + public Knight(int x, int y) { super(x, y); } diff --git a/core/src/ru/dvimer/lesson/Figurs/Pawn.java b/core/src/ru/dvimer/lesson/Figurs/Pawn.java index 1166e10..f25c57e 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Pawn.java +++ b/core/src/ru/dvimer/lesson/Figurs/Pawn.java @@ -1,7 +1,24 @@ package ru.dvimer.lesson.Figurs; /** - * Created by Алексей on 24.01.2016. + * Created by Алексей on 23.01.2016. */ -public class Pawn { +public class Pawn extends Figure { + + public Pawn(int x, int y) { + super(x, y); + } + + + @Override + public boolean setPosition(int x, int y) { + if (y - this.y == 1 && x - this.x == 0 || y - this.y == 2 && x - this.x == 0 && this.y < 1) { + + this.y = y; + return true; + } + return false; + } + + } diff --git a/core/src/ru/dvimer/lesson/Figurs/Quine.java b/core/src/ru/dvimer/lesson/Figurs/Queen.java similarity index 86% rename from core/src/ru/dvimer/lesson/Figurs/Quine.java rename to core/src/ru/dvimer/lesson/Figurs/Queen.java index 74c7c62..59bfe42 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Quine.java +++ b/core/src/ru/dvimer/lesson/Figurs/Queen.java @@ -3,9 +3,9 @@ /** * Created by Алексей on 23.01.2016. */ -public class Quine extends Figure { +public class Queen extends Figure { - public Quine(int x, int y) { + public Queen(int x, int y) { super(x, y); } diff --git a/core/src/ru/dvimer/lesson/Figurs/Slon.java b/core/src/ru/dvimer/lesson/Figurs/Rook.java similarity index 85% rename from core/src/ru/dvimer/lesson/Figurs/Slon.java rename to core/src/ru/dvimer/lesson/Figurs/Rook.java index 73ec152..b1b0622 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Slon.java +++ b/core/src/ru/dvimer/lesson/Figurs/Rook.java @@ -3,10 +3,10 @@ /** * Created by Алексей on 23.01.2016. */ -public class Slon extends Figure { +public class Rook extends Figure { - public Slon(int x, int y) { + public Rook(int x, int y) { super(x, y); } diff --git a/core/src/ru/dvimer/lesson/GameClass.java b/core/src/ru/dvimer/lesson/GameClass.java index 7bed856..b06a1ff 100644 --- a/core/src/ru/dvimer/lesson/GameClass.java +++ b/core/src/ru/dvimer/lesson/GameClass.java @@ -6,8 +6,7 @@ import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import ru.dvimer.lesson.Figurs.Figure; -import ru.dvimer.lesson.Figurs.Rook; +import ru.dvimer.lesson.Figurs.*; public class GameClass extends ApplicationAdapter { SpriteBatch batch; @@ -17,7 +16,7 @@ public class GameClass extends ApplicationAdapter { - Figure[] white = new Figure[8]; + Figure[] white = new Figure[6]; int mouseX; @@ -35,10 +34,17 @@ public void create() { pole = new Texture("pole.png"); smile = new Texture("smile.png"); smileEnd = new Texture("smileEnd.png"); - - for (int i = 0; i < 8; i++) { - white[i] = new Rook(i, 0); - } +// +// for (int i = 0; i < 8; i++) { +// white[i] = new Queen(i, 0); +// } + + white[0] = new King(1,0); + white[1] = new Queen(2,0); + white[2] = new Rook(3,0); + white[3] = new Knight(4,0); + white[4] = new Bishop(5,0); + white[5] = new Pawn(6,0); } @Override @@ -56,19 +62,18 @@ public void render() { } } } - for (int i = 0; i < 8; i++) { + for (int i = 0; i < white.length; i++) { if (i == selectIndex) continue; batch.draw(smile, white[i].getX() * 60, white[i].getY() * 60); } if (selectIndex > -1) { - //batch.draw(smileEnd, white[selectIndex].getX() * 60, white[selectIndex].getY() * 60); + batch.draw(smileEnd, white[selectIndex].getX() * 60, white[selectIndex].getY() * 60); batch.draw(smile, mouseX - 30, mouseY - 30); } batch.end(); } - public void update() { mouseX = Gdx.input.getX(); mouseY = 480 - Gdx.input.getY(); @@ -78,7 +83,7 @@ public void update() { if (selectIndex == -1) { - for (int i = 0; i < 8; i++) { + for (int i = 0; i < white.length; i++) { if (white[i].getX() == mouseCellX && white[i].getY() == mouseCellY && Gdx.input.isButtonPressed(Input.Buttons.LEFT)) { selectIndex = i; break; From e76007bf7b5e4095b060b0a13f0eb5b1d675adf3 Mon Sep 17 00:00:00 2001 From: Dvimer Date: Tue, 26 Jan 2016 23:41:10 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9D=D0=B0=D1=80=D0=B8=D1=81=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=BF=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D1=83=20=D1=85=D0=BE=D0=B4=D0=B0=20=D1=84=D0=B8=D0=B3=D1=83?= =?UTF-8?q?=D1=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/ru/dvimer/lesson/Figurs/Bishop.java | 12 +++++-- core/src/ru/dvimer/lesson/Figurs/Figure.java | 36 +++++++++++++++----- core/src/ru/dvimer/lesson/Figurs/King.java | 12 +++++-- core/src/ru/dvimer/lesson/Figurs/Knight.java | 12 +++++-- core/src/ru/dvimer/lesson/Figurs/Pawn.java | 12 +++++-- core/src/ru/dvimer/lesson/Figurs/Queen.java | 13 +++++-- core/src/ru/dvimer/lesson/Figurs/Rook.java | 16 +++++---- core/src/ru/dvimer/lesson/GameClass.java | 7 ++++ 8 files changed, 91 insertions(+), 29 deletions(-) diff --git a/core/src/ru/dvimer/lesson/Figurs/Bishop.java b/core/src/ru/dvimer/lesson/Figurs/Bishop.java index 82c1e2f..837a751 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Bishop.java +++ b/core/src/ru/dvimer/lesson/Figurs/Bishop.java @@ -11,15 +11,21 @@ public Bishop(int x, int y) { } + @Override + public boolean proverka(int x, int y) { + if (y - this.y == x - this.x || -(y - this.y) == (x - this.x)){ + return true; + } + return false; + } - public boolean setPosition(int x, int y) { + @Override + public void setPosition(int x, int y) { if (y - this.y == x - this.x || -(y - this.y) == (x - this.x)) { this.y = y; this.x = x; - return true; } - return false; } diff --git a/core/src/ru/dvimer/lesson/Figurs/Figure.java b/core/src/ru/dvimer/lesson/Figurs/Figure.java index 18ecb09..3399421 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Figure.java +++ b/core/src/ru/dvimer/lesson/Figurs/Figure.java @@ -9,6 +9,8 @@ public abstract class Figure { protected int x; protected int y; + protected ArrayList keyX = new ArrayList(); + protected ArrayList keyY = new ArrayList(); public Figure() { } @@ -18,6 +20,14 @@ public Figure(int x, int y) { this.y = y; } + public ArrayList getKeyX() { + return keyX; + } + + public ArrayList getKeyY() { + return keyY; + } + public int getX() { return x; @@ -35,15 +45,25 @@ public void setY(int y) { this.y = y; } -// public void setPosition(int x, int y) { -// if (y - this.y == 1 && x-this.x == 1) { -// this.y = y++; -// this.x = x++; -// } -// } -// + public void light() { + for (int i = 0; i < 8; i++) { + for (int j = 0; j < 8; j++) { + if (proverka(i, j)) { + keyX.add(i); + keyY.add(j); + } + } + } + } + + + public void resetLight() { + keyX.clear(); + keyY.clear(); + } + public abstract void setPosition(int x, int y); - public abstract boolean setPosition(int x, int y); + public abstract boolean proverka(int x, int y); } diff --git a/core/src/ru/dvimer/lesson/Figurs/King.java b/core/src/ru/dvimer/lesson/Figurs/King.java index fe317b1..6c5ca9a 100644 --- a/core/src/ru/dvimer/lesson/Figurs/King.java +++ b/core/src/ru/dvimer/lesson/Figurs/King.java @@ -13,15 +13,21 @@ public King(int x, int y) { @Override - public boolean setPosition(int x, int y) { + public boolean proverka(int x, int y) { if (Math.abs(y-this.y) == 1&& Math.abs(x - this.x) == 0|| Math.abs(y-this.y) == 0&& Math.abs(x - this.x) == 1||Math.abs(y-this.y) == 1 && Math.abs(x - this.x) == 1){ - this.y = y; - this.x = x; return true; } return false; } + @Override + public void setPosition(int x, int y) { + if (Math.abs(y-this.y) == 1&& Math.abs(x - this.x) == 0|| Math.abs(y-this.y) == 0&& Math.abs(x - this.x) == 1||Math.abs(y-this.y) == 1 && Math.abs(x - this.x) == 1){ + this.y = y; + this.x = x; + } + } + } diff --git a/core/src/ru/dvimer/lesson/Figurs/Knight.java b/core/src/ru/dvimer/lesson/Figurs/Knight.java index caa6d8a..e9db3cb 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Knight.java +++ b/core/src/ru/dvimer/lesson/Figurs/Knight.java @@ -11,14 +11,20 @@ public Knight(int x, int y) { @Override - public boolean setPosition(int x, int y) { + public boolean proverka(int x, int y) { if (Math.abs(y-this.y) == 2&& Math.abs(x - this.x) == 1|| Math.abs(y-this.y) == 1&& Math.abs(x - this.x) == 2){ - this.y = y; - this.x = x; return true; } return false; } + @Override + public void setPosition(int x, int y) { + if (Math.abs(y-this.y) == 2&& Math.abs(x - this.x) == 1|| Math.abs(y-this.y) == 1&& Math.abs(x - this.x) == 2){ + this.y = y; + this.x = x; + } + } + } diff --git a/core/src/ru/dvimer/lesson/Figurs/Pawn.java b/core/src/ru/dvimer/lesson/Figurs/Pawn.java index f25c57e..50f7736 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Pawn.java +++ b/core/src/ru/dvimer/lesson/Figurs/Pawn.java @@ -11,13 +11,19 @@ public Pawn(int x, int y) { @Override - public boolean setPosition(int x, int y) { + public boolean proverka(int x, int y) { + if (y - this.y == 1 && x - this.x == 0 || y - this.y == 2 && x - this.x == 0 && this.y < 1){ + return true; + } + return false; + } + + @Override + public void setPosition(int x, int y) { if (y - this.y == 1 && x - this.x == 0 || y - this.y == 2 && x - this.x == 0 && this.y < 1) { this.y = y; - return true; } - return false; } diff --git a/core/src/ru/dvimer/lesson/Figurs/Queen.java b/core/src/ru/dvimer/lesson/Figurs/Queen.java index 59bfe42..2efa7a7 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Queen.java +++ b/core/src/ru/dvimer/lesson/Figurs/Queen.java @@ -11,13 +11,20 @@ public Queen(int x, int y) { @Override - public boolean setPosition(int x, int y) { + public boolean proverka(int x, int y) { + if (Math.abs(y-this.y) <=8&& x - this.x == 0|| y-this.y == 0&& Math.abs(x - this.x) <=8 ||y - this.y == x - this.x || -(y - this.y) == (x - this.x)){ + return true; + } + return false; + } + + @Override + public void setPosition(int x, int y) { if (Math.abs(y-this.y) <=8&& x - this.x == 0|| y-this.y == 0&& Math.abs(x - this.x) <=8 ||y - this.y == x - this.x || -(y - this.y) == (x - this.x) ){ this.y = y; this.x = x; - return true; } - return false; + } diff --git a/core/src/ru/dvimer/lesson/Figurs/Rook.java b/core/src/ru/dvimer/lesson/Figurs/Rook.java index b1b0622..ef249ed 100644 --- a/core/src/ru/dvimer/lesson/Figurs/Rook.java +++ b/core/src/ru/dvimer/lesson/Figurs/Rook.java @@ -1,5 +1,7 @@ package ru.dvimer.lesson.Figurs; +import java.util.ArrayList; + /** * Created by Алексей on 23.01.2016. */ @@ -11,17 +13,19 @@ public Rook(int x, int y) { } - @Override - public boolean setPosition(int x, int y) { + public boolean proverka(int x, int y) { if (Math.abs(y-this.y) <= 8&& x - this.x == 0|| y-this.y == 0&& Math.abs(x - this.x) <=8 ){ - this.y = y; - this.x = x; return true; } return false; } - - + @Override + public void setPosition(int x, int y) { + if (Math.abs(y-this.y) <= 8&& x - this.x == 0|| y-this.y == 0&& Math.abs(x - this.x) <=8 ){ + this.y = y; + this.x = x; + } + } } diff --git a/core/src/ru/dvimer/lesson/GameClass.java b/core/src/ru/dvimer/lesson/GameClass.java index b06a1ff..c7d01d8 100644 --- a/core/src/ru/dvimer/lesson/GameClass.java +++ b/core/src/ru/dvimer/lesson/GameClass.java @@ -13,6 +13,7 @@ public class GameClass extends ApplicationAdapter { Texture pole; Texture smile; Texture smileEnd; + Texture lightField; @@ -34,6 +35,7 @@ public void create() { pole = new Texture("pole.png"); smile = new Texture("smile.png"); smileEnd = new Texture("smileEnd.png"); + lightField = new Texture("allocation.png"); // // for (int i = 0; i < 8; i++) { // white[i] = new Queen(i, 0); @@ -68,6 +70,9 @@ public void render() { } if (selectIndex > -1) { + for (int i = 0; i < white[selectIndex].getKeyX().size() ; i++) { + batch.draw(lightField, white[selectIndex].getKeyX().get(i) * 60, white[selectIndex].getKeyY().get(i)* 60); + } batch.draw(smileEnd, white[selectIndex].getX() * 60, white[selectIndex].getY() * 60); batch.draw(smile, mouseX - 30, mouseY - 30); } @@ -85,6 +90,7 @@ public void update() { if (selectIndex == -1) { for (int i = 0; i < white.length; i++) { if (white[i].getX() == mouseCellX && white[i].getY() == mouseCellY && Gdx.input.isButtonPressed(Input.Buttons.LEFT)) { + white[i].light(); selectIndex = i; break; } @@ -93,6 +99,7 @@ public void update() { if (!Gdx.input.isButtonPressed(Input.Buttons.LEFT) && selectIndex > -1) { white[selectIndex].setPosition(mouseCellX, mouseCellY); + white[selectIndex].resetLight(); selectIndex = -1; } }