Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions git commit -m laevade pommitamine
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
diff --git a/src/teema1/Peamurdja3_laevad.java b/src/teema1/Peamurdja3_laevad.java
index 2a6d090..2c3a56a 100644
--- a/src/teema1/Peamurdja3_laevad.java
+++ b/src/teema1/Peamurdja3_laevad.java
@@ -16,4 +16,42 @@ import java.util.Scanner;
* nii vertikaalselt kui ka horisontaalselt?
*/
public class Peamurdja3_laevad {
+ public static void main(String[] args) {
+
+ int[] laud = {randLaev(), randLaev(), randLaev(), randLaev(), randLaev(), randLaev(), randLaev(), randLaev()};
+
+ Scanner kasutaja = new Scanner(System.in);
+
+ while (!gameover(laud)) {
+ System.out.println(Arrays.toString(laud));
+ System.out.println("Sisesta number 1-"+laud.length);
+ int sisestus = kasutaja.nextInt() - 1;
+
+ int hit = laud[sisestus];
+ if (hit == 0) {
+ System.out.println("haha, mööda!");
+ laud[sisestus] = 2;
+ } else if (hit == 2) {
+ System.out.println("kuule kuule, siia oled juba lasknud.");
+ } else if (hit == 1) {
+ System.out.println("Yea, pihtas!");
+ laud[sisestus] = 2;
+ }
+ }
+ System.out.println("Mäng läbi!");
+ }
+
+ public static int randLaev() {
+ int tulemus = (int) (Math.random() * 2);
+ return tulemus;
+ }
+
+ public static boolean gameover(int[] laud) {
+ for (int i = 0; i < laud.length; i++) {
+ if (laud[i] == 1) {
+ return false;
+ }
+ }
+ return true;
+ }
}
1 change: 1 addition & 0 deletions src/teema1/Harjutus1_tsyklid.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
public class Harjutus1_tsyklid {
public static void main(String[] args) {
int count = 0;

}
}
38 changes: 37 additions & 1 deletion src/teema1/Peamurdja1_foor.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package teema1;

import javafx.application.Application;
import javafx.stage.Stage;
import lib.Foor;

/**
Expand All @@ -17,5 +19,39 @@
* NB! Kui kirjutad new Foor(); siis IDE pakub sulle Foori importimise võimalust.
* Kliki punase teksti peale ja vajuta alt+enter.
*/
public class Peamurdja1_foor {
public class Peamurdja1_foor extends Application {
public void start(Stage primaryStage) throws Exception {
Foor foor = new Foor();

int count = 0;
while (count < 4) {

foor.vahetaPunast();
foor.paus(1.5);
foor.vahetaKollast();
foor.paus(1.5);
foor.vahetaPunast();
foor.vahetaKollast();
foor. vahetaRohelist();
foor.paus(1.5);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaRohelist();
foor.vahetaKollast();
foor.paus(1.5);
foor.vahetaKollast();

count = count + 1;
}

}

}


48 changes: 46 additions & 2 deletions src/teema1/Peamurdja2_ristmik.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,52 @@
package teema1;

import javafx.application.Application;
import javafx.stage.Stage;
import lib.Foor;

/**
* Täpselt nagu oli fooriga, on nüüd ristmikuga. Kuidas esiteks
* ristmik üles ehitada loe Foori README.md-st: https://github.com/KristerV/javaHarjutused
*/
public class Peamurdja2_ristmik {
}
public class Peamurdja2_ristmik extends Application {
@Override
public void start(Stage primaryStage) throws Exception {
Foor foor1 = new Foor(Foor.YLEMINE, primaryStage);
Foor foor2 = new Foor(Foor.ALUMINE, primaryStage);
Foor foor3 = new Foor(Foor.PAREM, primaryStage);
Foor foor4 = new Foor(Foor.VASAK, primaryStage);

tsykkel(foor1, 0);
tsykkel(foor2, 0);
tsykkel(foor3, 1);
tsykkel(foor4, 1);
}

public void tsykkel(Foor foor, int suund) {
int count = suund;
while(count < 10) {
if (count != 0) {
foor.vahetaPunast();
foor.paus(6);
foor.vahetaKollast();
foor.paus(0.6);
foor.vahetaPunast();
foor.vahetaKollast();
}
foor.vahetaRohelist();
foor.paus(2);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaRohelist();
foor.paus(0.5);
foor.vahetaKollast();
foor.paus(0.5);
foor.vahetaKollast();

count++;
}

}
}
38 changes: 38 additions & 0 deletions src/teema1/Peamurdja3_laevad.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,42 @@
* nii vertikaalselt kui ka horisontaalselt?
*/
public class Peamurdja3_laevad {
public static void main(String[] args) {

int[] laud = {randLaev(), randLaev(), randLaev(), randLaev(), randLaev(), randLaev(), randLaev(), randLaev()};

Scanner kasutaja = new Scanner(System.in);

while (!gameover(laud)) {
System.out.println(Arrays.toString(laud));
System.out.println("Sisesta number 1-"+laud.length);
int sisestus = kasutaja.nextInt() - 1;

int hit = laud[sisestus];
if (hit == 0) {
System.out.println("haha, mööda!");
laud[sisestus] = 2;
} else if (hit == 2) {
System.out.println("kuule kuule, siia oled juba lasknud.");
} else if (hit == 1) {
System.out.println("Yea, pihtas!");
laud[sisestus] = 2;
}
}
System.out.println("Mäng läbi!");
}

public static int randLaev() {
int tulemus = (int) (Math.random() * 2);
return tulemus;
}

public static boolean gameover(int[] laud) {
for (int i = 0; i < laud.length; i++) {
if (laud[i] == 1) {
return false;
}
}
return true;
}
}
8 changes: 8 additions & 0 deletions src/teema2/Harjutus1_lipud.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package teema2;

/**
* 1. Joonista eesti lipp kasutades kolme Rectangle
* 2. Joonista Jaapani lipp kasutades Rectangle ja Circle
*/
public class Harjutus1_lipud {
}
9 changes: 9 additions & 0 deletions src/teema2/Harjutus2_ringid.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package teema2;

/**
* 1. Joonista kast kasutades jooni
* 2. Joonista spiraal kasutades jooni (vaata ringi meetodi)
* 3. Joonista propeller (nagu propeller.png) kasutades jooni
*/
public class Harjutus2_ringid {
}
21 changes: 21 additions & 0 deletions src/teema2/Harjutus3_logisisse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package teema2;

import javafx.application.Application;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
import javafx.scene.input.KeyCode;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.stage.Stage;

/**
* 1. Loo sisse logimise ekraan (ainult visuaal)
* 2. Määra üks võimalik kasutaja ja parool (andmebaasi veel ei kasuta)
* 3. Ebaõnnestunud katse näitab kasutajale errorit
* 4. Õnnestunud katse puhul vaheta pilt uue vastu (kasvõi roheline ring), .
*/
public class Harjutus3_logisisse {
}
64 changes: 64 additions & 0 deletions src/teema2/Kordamine1_laevad_maatriksil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package teema2;

import java.util.Arrays;
import java.util.Scanner;

/**
* Loo laevade pommitamine, kus on vaid 1x1 laevad ja kasutaja saab arvuti laevasid pommitada 9x9 maatriksil.
*/
public class Kordamine1_laevad_maatriksil {
static int[][] laud;
static int lauaKorgus = 4;
static int lauaLaius = 4;


public static void main(String [] args){
genereeriLaud();
laevaGenereerimine();
int [] xy = kysiPommitamiseAsukohta();
kontrolliTabamust(xy);
//kasOnVeelAllesLaevu();
//gameover();
}

private static void kontrolliTabamust(int[] xy) {
int x = xy [0];
int y = xy [1];
int sihtpunkt = laud [y][x];
if (sihtpunkt == 1) {
System.out.println("Pihtas!");
laud [y] [x] = 2;
} else if (sihtpunkt == 0) {
System.out.println("Möödas!");
}
}

private static int[] kysiPommitamiseAsukohta() {
try {
Scanner sc = new Scanner(System.in);
System.out.println("Ütle veeru number");
int x = sc.nextInt() - 1;
System.out.println("Ütle rea number");
int y = sc.nextInt() - 1;
int[] xy = {x, y};
return xy;
} catch (Exception e) {
System.out.println("Kirjuta number!");
}
return kysiPommitamiseAsukohta();
}

private static void laevaGenereerimine() {
for (int i = 0; i < lauaKorgus; i++) {
for (int j = 0; j < lauaLaius; j++) {
laud [i][j] = (int) (Math.random() * 2);
}
System.out.println(Arrays.toString(laud[i]));
}
}

private static void genereeriLaud() {
laud = new int [lauaKorgus][lauaLaius];
}
}

19 changes: 19 additions & 0 deletions src/teema2/Peamurdja1_laevad_fx.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package teema2;

import javafx.application.Application;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.StackPane;
import javafx.scene.paint.Color;
import javafx.scene.paint.ImagePattern;
import javafx.scene.shape.Rectangle;
import javafx.stage.Stage;

/**
* Joonista laevade pommitamine kasutades JavaFXi.
*/
public class Peamurdja1_laevad_fx {
}
Binary file added src/teema2/pirate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/teema2/propeller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.