Ilyas/PIbd-11_Valiulov_I.A._Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-11 Valiulov I.A. LabWork01 Hard #1

Closed
Ilyas wants to merge 2 commits from LabWork01 into master
pull from: LabWork01
merge into: Ilyas:master
Conversation 0 Commits 2 Files Changed 12 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf991f6eed - Show all commits

2
WarmlyShip/src/DrawingWarmlyShip.java
View File

@ -86,7 +86,7 @@ public class DrawingWarmlyShip extends JPanel {
public void DrawTransport(Graphics2D g) {
if (EntityWarmlyShip == null || _StartPosX == null || _StartPosY == null) return;
int y = _StartPosY;
if (EntityWarmlyShip.getSheepPipes()) {
if (EntityWarmlyShip.getShipPipes()) {
//трубы
g.setColor(EntityWarmlyShip.getAdditionalColor());
g.fillRect(_StartPosX + 70, _StartPosY, 12, 30);

8
WarmlyShip/src/EntityWarmlyShip.java
View File

@ -6,18 +6,18 @@ public class EntityWarmlyShip {
public Color getBodyColor() {return BodyColor;}
private Color AdditionalColor;
public Color getAdditionalColor() {return AdditionalColor;}
private boolean SheepPipes;
public boolean getSheepPipes() {return SheepPipes;}
private boolean ShipPipes;
public boolean getShipPipes() {return ShipPipes;}
private boolean FuelTank;
public boolean getFuelTank() {return FuelTank;}
public double Step;
public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, boolean sheeppipes, boolean fueltank)
public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, boolean shippipes, boolean fueltank)
{
Speed = speed;
Weight = weight;
BodyColor = bodycolor;
AdditionalColor = additionalcolor;
SheepPipes = sheeppipes;
ShipPipes = shippipes;
FuelTank = fueltank;
Step = Speed * 100 / Weight;
}