Zakharov_Rostislav/PIbd-23_ZakharovR.A._Battleship_Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab3 some minor fixes

Browse Source
This commit is contained in:
Zakharov_Rostislav 2023-11-10 00:10:09 +04:00
parent 96a9477a8f
commit 42e878848f
2 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/frames/HardFrame.java
View File

@ -32,8 +32,8 @@ public class HardFrame extends JFrame {
int size = rand.nextInt(1, 10);
generic = new HardGeneric<>(size, size, pictureBoxWidth, pictureBoxHeight);
for(int i = 0; i < size; i++){
generic.insertShip(makeRandomShip());
generic.insertBlock(makeRandomBlock());
generic.insertShip(generic.makeRandomShip());
generic.insertBlock(generic.makeRandomBlock());
}
buttonMakeObject.addActionListener(e -> {
DrawingShip drawingShip = generic.makeObject();
@ -47,29 +47,5 @@ public class HardFrame extends JFrame {
pack();
setVisible(true);
}
public EntityShip makeRandomShip(){
Random random = new Random();
EntityShip ship;
switch (random.nextInt(2)){
case 0 -> ship = new EntityShip(random.nextInt(100, 300), random.nextDouble(1000,3000),
new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
default -> ship = new EntityBattleship(random.nextInt(100, 300), random.nextDouble(1000,3000),
new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
random.nextBoolean(), random.nextBoolean());
}
return ship;
}
public IDrawBlocks makeRandomBlock(){
Random random = new Random();
IDrawBlocks block;
switch (random.nextInt(3)){
case 1 -> block = new DrawingRoundBlocks();
case 2 -> block = new DrawingCrossBlocks();
default -> block = new DrawingBlocks();
}
block.setNumber((random.nextInt(3) + 1) * 2);
return block;
}
void draw(){pictureBox.repaint();}
}

29
src/generics/HardGeneric.java
View File

@ -1,11 +1,10 @@
package generics;
import drawing_objects.DrawingBattleship;
import drawing_objects.DrawingShip;
import drawing_objects.IDrawBlocks;
import drawing_objects.*;
import entities.EntityBattleship;
import entities.EntityShip;
import java.awt.*;
import java.util.Random;
public class HardGeneric<T extends EntityShip, U extends IDrawBlocks>{
@ -52,4 +51,28 @@ public class HardGeneric<T extends EntityShip, U extends IDrawBlocks>{
((EntityBattleship) entity).getTurret(), ((EntityBattleship) entity).getRocketLauncher(), pictureBoxWidth, pictureBoxHeight, block.getType(), block.getNumber());
return new DrawingShip(entity.getSpeed(), entity.getWeight(), entity.getBodyColor(), pictureBoxWidth, pictureBoxHeight, block.getType(), block.getNumber());
}
public EntityShip makeRandomShip(){
Random random = new Random();
EntityShip ship;
switch (random.nextInt(2)){
case 0 -> ship = new EntityShip(random.nextInt(100, 300), random.nextDouble(1000,3000),
new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
default -> ship = new EntityBattleship(random.nextInt(100, 300), random.nextDouble(1000,3000),
new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)),
random.nextBoolean(), random.nextBoolean());
}
return ship;
}
public IDrawBlocks makeRandomBlock(){
Random random = new Random();
IDrawBlocks block;
switch (random.nextInt(3)){
case 1 -> block = new DrawingRoundBlocks();
case 2 -> block = new DrawingCrossBlocks();
default -> block = new DrawingBlocks();
}
block.setNumber((random.nextInt(3) + 1) * 2);
return block;
}
}