From ea02e79a563b9790a9da6583fa38b66e260c5559 Mon Sep 17 00:00:00 2001 From: apeterescam1982 Date: Mon, 20 May 2019 15:20:48 -0500 Subject: [PATCH 1/7] Test commit --- src/project/Colors.java | 1 + src/project/Main.java | 6 +++--- src/project/Sprites/colorsTemp.java | 13 +++++++++++++ src/project/Sprites/player.java | 10 +++++++--- 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 src/project/Sprites/colorsTemp.java diff --git a/src/project/Colors.java b/src/project/Colors.java index ef4c1f2..a21c0e2 100644 --- a/src/project/Colors.java +++ b/src/project/Colors.java @@ -8,4 +8,5 @@ public class Colors { static final Color lineYellow = new Color(218, 190, 93); static final Color startGreen = new Color(13, 255, 0); static final Color startBlue = new Color(112, 113, 255); + static final Color playerBody = new Color(247, 17, 17); } diff --git a/src/project/Main.java b/src/project/Main.java index 77de0ec..44d2af0 100644 --- a/src/project/Main.java +++ b/src/project/Main.java @@ -7,9 +7,9 @@ import java.awt.*; public class Main extends Applet { public void paint(Graphics g){ Expo.drawHeading(g, "Quentin Snow and Alekkai", "Final Project"); - Draw.startScreen(g); - // Draw.road(g); - // project.Sprites.player.make(g); + //Draw.startScreen(g); + //Draw.road(g); + project.Sprites.player.make(g); } } diff --git a/src/project/Sprites/colorsTemp.java b/src/project/Sprites/colorsTemp.java new file mode 100644 index 0000000..a03effa --- /dev/null +++ b/src/project/Sprites/colorsTemp.java @@ -0,0 +1,13 @@ +package project.Sprites; + +import java.awt.*; + +public class colorsTemp { + static final Color roadGrey = new Color(68,68,68); + static final Color lineWhite = new Color(235, 235, 235); + static final Color lineYellow = new Color(218, 190, 93); + static final Color startGreen = new Color(13, 255, 0); + static final Color startBlue = new Color(112, 113, 255); + static final Color playerBody = new Color(247, 17, 17); + static final Color Tires = new Color(0, 0, 0); +} diff --git a/src/project/Sprites/player.java b/src/project/Sprites/player.java index f2100c9..6a705d7 100644 --- a/src/project/Sprites/player.java +++ b/src/project/Sprites/player.java @@ -1,12 +1,16 @@ package project.Sprites; +import project.Colors; import project.Expo; import java.applet.Applet; import java.awt.*; public class player extends Applet { - public static void make(Graphics g){ - Expo.fillRectangle(g,100,100,125,150); - Expo.fillRectangle(g,105,110,95,120); + public static void make(Graphics g) { + Expo.setColor(g,colorsTemp.playerBody); + Expo.fillRectangle(g, 100, 100, 135, 160); + Expo.setColor(g,colorsTemp.Tires); + Expo.fillRectangle(g, 105, 108, 90, 128); + Expo.fillRectangle(g, 105, 108, 90, 128); } } From 1bcac96066cd309d80016a0ab8455ef19f672238 Mon Sep 17 00:00:00 2001 From: qsnow1845 Date: Mon, 20 May 2019 15:25:25 -0500 Subject: [PATCH 2/7] added movement test and it works Signed-off-by: qsnow1845 --- src/project/Colors.java | 3 ++- src/project/Draw.java | 22 ++++++++++++++++++++++ src/project/Main.java | 22 +++++++++++++++++++--- src/project/Sprites/player.java | 1 + 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/project/Colors.java b/src/project/Colors.java index ef4c1f2..1d561eb 100644 --- a/src/project/Colors.java +++ b/src/project/Colors.java @@ -1,3 +1,5 @@ +// This module was created by Quentin Snow + package project; import java.awt.*; @@ -7,5 +9,4 @@ public class Colors { static final Color lineWhite = new Color(235, 235, 235); static final Color lineYellow = new Color(218, 190, 93); static final Color startGreen = new Color(13, 255, 0); - static final Color startBlue = new Color(112, 113, 255); } diff --git a/src/project/Draw.java b/src/project/Draw.java index e37102c..d1b7483 100644 --- a/src/project/Draw.java +++ b/src/project/Draw.java @@ -1,3 +1,5 @@ +// This module was created by Quentin Snow + package project; import java.applet.Applet; @@ -15,6 +17,26 @@ public class Draw extends Applet { } + public static void begin(Graphics g){ + road(g); + moveTest(g); + } + public static void moveTest(Graphics g){ + int x = 0; + while (true){ + player(g,x,200); + Expo.delay(1); + x ++; + } + } + public static void player(Graphics g, int x, int y){ + Expo.drawPoint(g,x,y); + } + + + + + public static void road(Graphics g){ Expo.fillRoundedRectangle(g,100,100,410,500,6); Expo.setColor(g,Colors.roadGrey); diff --git a/src/project/Main.java b/src/project/Main.java index 77de0ec..e4d2d25 100644 --- a/src/project/Main.java +++ b/src/project/Main.java @@ -5,11 +5,27 @@ import java.awt.*; public class Main extends Applet { + public static boolean start = false; + private Rectangle startBtn = new Rectangle(100,100,340,600); + public void paint(Graphics g){ Expo.drawHeading(g, "Quentin Snow and Alekkai", "Final Project"); - Draw.startScreen(g); - // Draw.road(g); - // project.Sprites.player.make(g); + + if (start){ + Draw.begin(g); + } + else{ + Draw.startScreen(g); + } } + + public boolean mouseDown(Event e, int x, int y){ + if (startBtn.inside(x,y)){ + start = true; + repaint(); + } + + return true; + } } diff --git a/src/project/Sprites/player.java b/src/project/Sprites/player.java index f2100c9..5656695 100644 --- a/src/project/Sprites/player.java +++ b/src/project/Sprites/player.java @@ -8,5 +8,6 @@ public class player extends Applet { public static void make(Graphics g){ Expo.fillRectangle(g,100,100,125,150); Expo.fillRectangle(g,105,110,95,120); + } } From debd6803b71755e421609bff9096cd169e55b18c Mon Sep 17 00:00:00 2001 From: qsnow1845 Date: Tue, 21 May 2019 14:44:31 -0500 Subject: [PATCH 3/7] added test method for team Signed-off-by: qsnow1845 --- src/project/Main.java | 10 +++++++--- src/project/Sprites/player.java | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/project/Main.java b/src/project/Main.java index e4d2d25..9eb07bc 100644 --- a/src/project/Main.java +++ b/src/project/Main.java @@ -9,15 +9,14 @@ public class Main extends Applet { private Rectangle startBtn = new Rectangle(100,100,340,600); public void paint(Graphics g){ + test(g); Expo.drawHeading(g, "Quentin Snow and Alekkai", "Final Project"); - if (start){ Draw.begin(g); } else{ Draw.startScreen(g); } - } public boolean mouseDown(Event e, int x, int y){ @@ -25,7 +24,12 @@ public class Main extends Applet { start = true; repaint(); } - return true; } + + + public static void test(Graphics g){ + // put testing code and calls here + + } } diff --git a/src/project/Sprites/player.java b/src/project/Sprites/player.java index 6a705d7..3d4b3f1 100644 --- a/src/project/Sprites/player.java +++ b/src/project/Sprites/player.java @@ -12,5 +12,7 @@ public class player extends Applet { Expo.setColor(g,colorsTemp.Tires); Expo.fillRectangle(g, 105, 108, 90, 128); Expo.fillRectangle(g, 105, 108, 90, 128); + + } } From 322bc0c97b057a8b9a5b6652778be6f4bac08dc0 Mon Sep 17 00:00:00 2001 From: apeterescam1982 Date: Tue, 21 May 2019 14:53:04 -0500 Subject: [PATCH 4/7] Usable player sprite --- src/project/Sprites/player.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/project/Sprites/player.java b/src/project/Sprites/player.java index 3d4b3f1..aa2c641 100644 --- a/src/project/Sprites/player.java +++ b/src/project/Sprites/player.java @@ -10,9 +10,9 @@ public class player extends Applet { Expo.setColor(g,colorsTemp.playerBody); Expo.fillRectangle(g, 100, 100, 135, 160); Expo.setColor(g,colorsTemp.Tires); - Expo.fillRectangle(g, 105, 108, 90, 128); - Expo.fillRectangle(g, 105, 108, 90, 128); - - - } + Expo.fillRectangle(g, 105, 108, 95, 128); + Expo.fillRectangle(g, 105, 135, 95, 155); + Expo.fillRectangle(g, 130, 108, 140, 128); + Expo.fillRectangle(g, 130, 135, 140, 155); +} } From a586fd40db3d68cd560616bcae598692327be91e Mon Sep 17 00:00:00 2001 From: qsnow1845 Date: Tue, 21 May 2019 15:19:55 -0500 Subject: [PATCH 5/7] push for team Signed-off-by: qsnow1845 --- src/project/Colors.java | 2 ++ src/project/Draw.java | 25 ++++++++----------------- src/project/Main.java | 9 +++++++++ src/project/Sprites/player.java | 21 ++++++++++++++------- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/project/Colors.java b/src/project/Colors.java index ef4c1f2..ec18e11 100644 --- a/src/project/Colors.java +++ b/src/project/Colors.java @@ -1,3 +1,5 @@ +// This module was made by Quentin Snow + package project; import java.awt.*; diff --git a/src/project/Draw.java b/src/project/Draw.java index d1b7483..bb64d18 100644 --- a/src/project/Draw.java +++ b/src/project/Draw.java @@ -13,28 +13,19 @@ public class Draw extends Applet { Expo.setFont(g,"Default",1,100-i); Expo.drawString(g,"START",100+i*5,200+i*7); } - - - } + public static void begin(Graphics g){ road(g); - moveTest(g); - } - public static void moveTest(Graphics g){ - int x = 0; - while (true){ - player(g,x,200); - Expo.delay(1); - x ++; - } - } - public static void player(Graphics g, int x, int y){ - Expo.drawPoint(g,x,y); + LRbtn(g); } - - + public static void LRbtn(Graphics g){ + Expo.setFont(g,"Default",1,100); + Expo.setColor(g,Colors.startBlue); + Expo.drawString(g,"<=",480,300); + Expo.drawString(g,"=>",620,300); + } public static void road(Graphics g){ diff --git a/src/project/Main.java b/src/project/Main.java index 9eb07bc..bcc6eeb 100644 --- a/src/project/Main.java +++ b/src/project/Main.java @@ -7,23 +7,32 @@ import java.awt.*; public class Main extends Applet { public static boolean start = false; private Rectangle startBtn = new Rectangle(100,100,340,600); + private Rectangle Lbtn = new Rectangle(100,100,340,600); + private Rectangle Rbtn = new Rectangle(100,100,340,600); public void paint(Graphics g){ test(g); Expo.drawHeading(g, "Quentin Snow and Alekkai", "Final Project"); if (start){ Draw.begin(g); + playerLocomotion(g); } else{ Draw.startScreen(g); } } + public static void playerLocomotion(Graphics g){ + project.Sprites.player.make(g,124,427); + } + public boolean mouseDown(Event e, int x, int y){ if (startBtn.inside(x,y)){ start = true; repaint(); } + if (Lbtn.inside(x,y)) + System.out.println(x+" "+y); return true; } diff --git a/src/project/Sprites/player.java b/src/project/Sprites/player.java index aa2c641..1b980f8 100644 --- a/src/project/Sprites/player.java +++ b/src/project/Sprites/player.java @@ -6,13 +6,20 @@ import java.applet.Applet; import java.awt.*; public class player extends Applet { - public static void make(Graphics g) { + public static void make(Graphics g, int x, int y) { Expo.setColor(g,colorsTemp.playerBody); - Expo.fillRectangle(g, 100, 100, 135, 160); + Expo.fillRectangle(g, x, y, x+35, y+60); Expo.setColor(g,colorsTemp.Tires); - Expo.fillRectangle(g, 105, 108, 95, 128); - Expo.fillRectangle(g, 105, 135, 95, 155); - Expo.fillRectangle(g, 130, 108, 140, 128); - Expo.fillRectangle(g, 130, 135, 140, 155); -} + Expo.fillRectangle(g, x+5, y+8, x-5, y+28); + Expo.fillRectangle(g, x+5, y+35, x-5, y+55); + Expo.fillRectangle(g, x+30, y+8, x+40, y+28); + Expo.fillRectangle(g, x+30, y+35, x+40, y+55); + } } +// Expo.setColor(g,colorsTemp.playerBody); +// Expo.fillRectangle(g, 100, 100, 135, 160); +// Expo.setColor(g,colorsTemp.Tires); +// Expo.fillRectangle(g, 105, 108, 95, 128); +// Expo.fillRectangle(g, 105, 135, 95, 155); +// Expo.fillRectangle(g, 130, 108, 140, 128); +// Expo.fillRectangle(g, 130, 135, 140, 155); \ No newline at end of file From a7ef5d3ded46b0aa551aa2d6199abd72c5ac6bb1 Mon Sep 17 00:00:00 2001 From: qsnow1845 Date: Tue, 21 May 2019 15:25:21 -0500 Subject: [PATCH 6/7] almost done with locomotion Signed-off-by: qsnow1845 --- src/project/Main.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/project/Main.java b/src/project/Main.java index bcc6eeb..4361f52 100644 --- a/src/project/Main.java +++ b/src/project/Main.java @@ -7,8 +7,8 @@ import java.awt.*; public class Main extends Applet { public static boolean start = false; private Rectangle startBtn = new Rectangle(100,100,340,600); - private Rectangle Lbtn = new Rectangle(100,100,340,600); - private Rectangle Rbtn = new Rectangle(100,100,340,600); + private Rectangle Lbtn = new Rectangle(480,220,120,80); + private Rectangle Rbtn = new Rectangle(530,220,120,80); public void paint(Graphics g){ test(g); @@ -31,7 +31,9 @@ public class Main extends Applet { start = true; repaint(); } - if (Lbtn.inside(x,y)) + if (Lbtn.inside(x,y)){ + System.out.println("inside lbtn"); + } System.out.println(x+" "+y); return true; } From 83feeb11b97fa81c45141288f6e5c544e15c2afc Mon Sep 17 00:00:00 2001 From: apeterescam1982 Date: Tue, 21 May 2019 15:26:43 -0500 Subject: [PATCH 7/7] Random NPC spawns --- src/project/Draw.java | 1 + src/project/Main.java | 3 +-- src/project/Sprites/NPC1.java | 25 +++++++++++++++++++++++++ src/project/Sprites/NPC2.java | 18 ++++++++++++++++++ src/project/Sprites/NPC3.java | 18 ++++++++++++++++++ src/project/Sprites/NPC4.java | 18 ++++++++++++++++++ src/project/Sprites/NPC5.java | 18 ++++++++++++++++++ src/project/Sprites/colorsTemp.java | 5 +++++ 8 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 src/project/Sprites/NPC1.java create mode 100644 src/project/Sprites/NPC2.java create mode 100644 src/project/Sprites/NPC3.java create mode 100644 src/project/Sprites/NPC4.java create mode 100644 src/project/Sprites/NPC5.java diff --git a/src/project/Draw.java b/src/project/Draw.java index bb64d18..fd9f55d 100644 --- a/src/project/Draw.java +++ b/src/project/Draw.java @@ -18,6 +18,7 @@ public class Draw extends Applet { public static void begin(Graphics g){ road(g); LRbtn(g); + //project.Sprites.NPC1.NPC1(g,Expo.random(110,390)); } public static void LRbtn(Graphics g){ diff --git a/src/project/Main.java b/src/project/Main.java index bcc6eeb..c0b1a8e 100644 --- a/src/project/Main.java +++ b/src/project/Main.java @@ -38,7 +38,6 @@ public class Main extends Applet { public static void test(Graphics g){ - // put testing code and calls here - + project.Sprites.NPC1.NPC1(g,Expo.random(100,400)); } } diff --git a/src/project/Sprites/NPC1.java b/src/project/Sprites/NPC1.java new file mode 100644 index 0000000..85e9070 --- /dev/null +++ b/src/project/Sprites/NPC1.java @@ -0,0 +1,25 @@ +package project.Sprites; + +import project.Colors; +import project.Expo; +import java.applet.Applet; +import java.awt.*; + +public class NPC1 extends Applet { + public static void NPC1(Graphics g, int x) { + Expo.setColor(g,colorsTemp.NPC1Body); + Expo.fillRectangle(g, x, 110, x+35, 170); + Expo.setColor(g,colorsTemp.Tires); + Expo.fillRectangle(g, x+5, 118, x-5, 138); + Expo.fillRectangle(g, x+5, 145, x-5, 165); + Expo.fillRectangle(g, x+30, 118, x+40, 138); + Expo.fillRectangle(g, x+30, 145, x+40, 165); + } +} +// Expo.setColor(g,colorsTemp.NPC1Body); + // Expo.fillRectangle(g, 100, 100, 135, 160); + // Expo.setColor(g,colorsTemp.Tires); + // Expo.fillRectangle(g, 105, 108, 95, 128); + // Expo.fillRectangle(g, 105, 135, 95, 155); +// Expo.fillRectangle(g, 130, 108, 140, 128); +// Expo.fillRectangle(g, 130, 135, 140, 155); \ No newline at end of file diff --git a/src/project/Sprites/NPC2.java b/src/project/Sprites/NPC2.java new file mode 100644 index 0000000..2ae9424 --- /dev/null +++ b/src/project/Sprites/NPC2.java @@ -0,0 +1,18 @@ +package project.Sprites; + +import project.Colors; +import project.Expo; +import java.applet.Applet; +import java.awt.*; + +public class NPC2 extends Applet { + public static void NPC2(Graphics g) { + Expo.setColor(g,colorsTemp.NPC2Body); + Expo.fillRectangle(g, 100, 100, 135, 160); + Expo.setColor(g,colorsTemp.Tires); + Expo.fillRectangle(g, 105, 108, 95, 128); + Expo.fillRectangle(g, 105, 135, 95, 155); + Expo.fillRectangle(g, 130, 108, 140, 128); + Expo.fillRectangle(g, 130, 135, 140, 155); + } +} diff --git a/src/project/Sprites/NPC3.java b/src/project/Sprites/NPC3.java new file mode 100644 index 0000000..39f7046 --- /dev/null +++ b/src/project/Sprites/NPC3.java @@ -0,0 +1,18 @@ +package project.Sprites; + +import project.Colors; +import project.Expo; +import java.applet.Applet; +import java.awt.*; + +public class NPC3 extends Applet { + public static void NPC3(Graphics g) { + Expo.setColor(g,colorsTemp.NPC3Body); + Expo.fillRectangle(g, 100, 100, 135, 160); + Expo.setColor(g,colorsTemp.Tires); + Expo.fillRectangle(g, 105, 108, 95, 128); + Expo.fillRectangle(g, 105, 135, 95, 155); + Expo.fillRectangle(g, 130, 108, 140, 128); + Expo.fillRectangle(g, 130, 135, 140, 155); + } +} diff --git a/src/project/Sprites/NPC4.java b/src/project/Sprites/NPC4.java new file mode 100644 index 0000000..27eb2d6 --- /dev/null +++ b/src/project/Sprites/NPC4.java @@ -0,0 +1,18 @@ +package project.Sprites; + +import project.Colors; +import project.Expo; +import java.applet.Applet; +import java.awt.*; + +public class NPC4 extends Applet { + public static void NPC4(Graphics g) { + Expo.setColor(g,colorsTemp.NPC4Body); + Expo.fillRectangle(g, 100, 100, 135, 160); + Expo.setColor(g,colorsTemp.Tires); + Expo.fillRectangle(g, 105, 108, 95, 128); + Expo.fillRectangle(g, 105, 135, 95, 155); + Expo.fillRectangle(g, 130, 108, 140, 128); + Expo.fillRectangle(g, 130, 135, 140, 155); + } +} diff --git a/src/project/Sprites/NPC5.java b/src/project/Sprites/NPC5.java new file mode 100644 index 0000000..ef3c440 --- /dev/null +++ b/src/project/Sprites/NPC5.java @@ -0,0 +1,18 @@ +package project.Sprites; + +import project.Colors; +import project.Expo; +import java.applet.Applet; +import java.awt.*; + +public class NPC5 extends Applet { + public static void NPC5(Graphics g) { + Expo.setColor(g,colorsTemp.NPC5Body); + Expo.fillRectangle(g, 100, 100, 135, 160); + Expo.setColor(g,colorsTemp.Tires); + Expo.fillRectangle(g, 105, 108, 95, 128); + Expo.fillRectangle(g, 105, 135, 95, 155); + Expo.fillRectangle(g, 130, 108, 140, 128); + Expo.fillRectangle(g, 130, 135, 140, 155); + } +} diff --git a/src/project/Sprites/colorsTemp.java b/src/project/Sprites/colorsTemp.java index a03effa..20aee72 100644 --- a/src/project/Sprites/colorsTemp.java +++ b/src/project/Sprites/colorsTemp.java @@ -10,4 +10,9 @@ public class colorsTemp { static final Color startBlue = new Color(112, 113, 255); static final Color playerBody = new Color(247, 17, 17); static final Color Tires = new Color(0, 0, 0); + static final Color NPC1Body = new Color(0, 247, 0); + static final Color NPC2Body = new Color(221, 247, 0); + static final Color NPC3Body = new Color(247, 113, 0); + static final Color NPC4Body = new Color(0, 11, 247); + static final Color NPC5Body = new Color(247, 0, 182); }