olshab/PIbd-22_Shabunov_O.A._AirBomber_Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22. Shabunov O.A. Lab work 02 (Hard) #2

Closed
olshab wants to merge 4 commits from Lab2 into Lab1
pull from: Lab2
merge into: olshab:Lab1
Conversation 0 Commits 4 Files Changed 18 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5a1a44785 - Show all commits

6
src/AirBomber/BomberForm.java
View File

@ -85,7 +85,7 @@ public class BomberForm extends JFrame
break;
case 1:
_strategy = new MoveToCenterStrategy();
_strategy = new MoveToDownRightStrategy();
break;
default:
@ -165,7 +165,7 @@ public class BomberForm extends JFrame
// ButtonCreateBomberBase
//
ButtonCreateBomberBase.setName("ButtonCreateBomberBase");
ButtonCreateBomberBase.setBounds(177, 407, 159, 42);
ButtonCreateBomberBase.setBounds(12, 383, 260, 30);
ButtonCreateBomberBase.setText("Создать бомбардировщик");
ButtonCreateBomberBase.setBackground(new Color(225, 225, 225));
ButtonCreateBomberBase.setFont(new Font("Segoe UI", Font.PLAIN, 11));
@ -221,7 +221,7 @@ public class BomberForm extends JFrame
// ButtonCreateBomber
//
ButtonCreateBomber.setName("ButtonCreateBomber");
ButtonCreateBomber.setBounds(12, 407, 159, 42);
ButtonCreateBomber.setBounds(12, 419, 260, 30);
ButtonCreateBomber.setText("Создать продвинутый бомбардировщик");
ButtonCreateBomber.setBackground(new Color(225, 225, 225));
ButtonCreateBomber.setFont(new Font("Segoe UI", Font.PLAIN, 11));

4
src/AirBomber/MovementStrategy/MoveToCenterStrategy.java
View File

@ -25,7 +25,7 @@ public class MoveToCenterStrategy extends AbstractStrategy
return;
float diffX = ObjParams.ObjectMiddleHorizontal() - FieldWidth / 2;
if (Math.abs(diffX) > GetStep())
if (Math.abs(diffX) >= GetStep())
{
if (diffX > 0)
MoveLeft();
@ -34,7 +34,7 @@ public class MoveToCenterStrategy extends AbstractStrategy
}
float diffY = ObjParams.ObjectMiddleVertical() - FieldHeight / 2;
if (Math.abs(diffY) > GetStep())
if (Math.abs(diffY) >= GetStep())
{
if (diffY > 0)
MoveUp();

4
src/AirBomber/MovementStrategy/MoveToDownRightStrategy.java
View File

@ -24,7 +24,7 @@ public class MoveToDownRightStrategy extends AbstractStrategy
return;
float diffX = ObjParams.RightBorder() - FieldWidth;
if (Math.abs(diffX) > GetStep())
if (Math.abs(diffX) >= GetStep())
{
if (diffX > 0)
MoveLeft();
@ -33,7 +33,7 @@ public class MoveToDownRightStrategy extends AbstractStrategy
}
float diffY = ObjParams.BottomBorder() - FieldHeight;
if (Math.abs(diffY) > GetStep())
if (Math.abs(diffY) >= GetStep())
{
if (diffY > 0)
MoveUp();