From 9e3a29cae050673dd5743d66cab83efcfeef63d9 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Tue, 29 Jan 2019 14:57:00 -0500 Subject: [PATCH 01/62] Updated from Brython Server: 1/29/2019 2:56:58 PM --- picture.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 6e2a3e23..10351930 100644 --- a/picture.py +++ b/picture.py @@ -27,7 +27,23 @@ from ggame import App, Color, LineStyle, Sprite, RectangleAsset, CircleAsset, EllipseAsset, PolygonAsset # add your code here \/ \/ \/ - +lightblue = Color(0xBFEFFF,0.8) +brown = Color(0x8B4726, 0.9) +grey = Color(0xCDC9C9, 1.0) +black = Color(0x000000, 1.0) + +thinline = LineStyle(1, black) + +tank = RectangleAsset(900,600, thinline, lightblue) +pebbles = RectangleAsset(900, 45, thinline, brown) +castle = RectangleAsset(350, 200, thinline, grey) +castletop = PolygonAsset([(40,60), (127.5,-75), (215,60)],thinline, grey) +tower = RectangleAsset(325, 200, thinline, grey) + +Sprite(tank, (100,110)) +Sprite(pebbles, (100,665)) +Sprite(castle, (600,475)) +Sprite(castletop, (600,195)) # add your code here /\ /\ /\ From 0a6eab69e69aa8ec649c75084d7638459758ddc7 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 10:01:20 -0500 Subject: [PATCH 02/62] Updated from Brython Server: 1/30/2019 10:01:18 AM --- picture.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/picture.py b/picture.py index 10351930..b260b0b9 100644 --- a/picture.py +++ b/picture.py @@ -32,18 +32,21 @@ grey = Color(0xCDC9C9, 1.0) black = Color(0x000000, 1.0) -thinline = LineStyle(1, black) +thinline = LineStyle(1, brown) tank = RectangleAsset(900,600, thinline, lightblue) pebbles = RectangleAsset(900, 45, thinline, brown) -castle = RectangleAsset(350, 200, thinline, grey) -castletop = PolygonAsset([(40,60), (127.5,-75), (215,60)],thinline, grey) -tower = RectangleAsset(325, 200, thinline, grey) +castle = RectangleAsset(350, 190, thinline, grey) +castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) +tower = RectangleAsset(80, 100, thinline, grey) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) -Sprite(castle, (600,475)) -Sprite(castletop, (600,195)) +Sprite(castle, (600,480)) +Sprite(tower, (600,390)) +Sprite(castletop, (600,285)) +Sprite(tower, (870,390)) +Sprite(castletop, (870,285)) # add your code here /\ /\ /\ From 4af1bc6035cb8208908723d1d2c55d8636d1072f Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 10:01:23 -0500 Subject: [PATCH 03/62] Updated from Brython Server: 1/30/2019 10:01:21 AM From bf4e71b505bee2f2b31e36cfe478d87e2a1c3fbc Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 12:47:22 -0500 Subject: [PATCH 04/62] Updated from Brython Server: 1/30/2019 12:47:19 PM --- picture.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/picture.py b/picture.py index b260b0b9..52e303b6 100644 --- a/picture.py +++ b/picture.py @@ -33,12 +33,14 @@ black = Color(0x000000, 1.0) thinline = LineStyle(1, brown) +thinline1 = LineStyle(1,grey) tank = RectangleAsset(900,600, thinline, lightblue) pebbles = RectangleAsset(900, 45, thinline, brown) castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) tower = RectangleAsset(80, 100, thinline, grey) +centertower = RectangleAsset(100, 100, thinline, grey) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -47,6 +49,7 @@ Sprite(castletop, (600,285)) Sprite(tower, (870,390)) Sprite(castletop, (870,285)) +Sprite(centertower, (750,365)) # add your code here /\ /\ /\ From c52d54b221cf3f00c4850e8ea45923dee094c395 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 12:47:24 -0500 Subject: [PATCH 05/62] Updated from Brython Server: 1/30/2019 12:47:23 PM From 6ef7aa4bfa450a685ac072eac93a6ec59e66d6fc Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:34:03 -0500 Subject: [PATCH 06/62] Updated from Brython Server: 1/30/2019 1:34:00 PM --- picture.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index 52e303b6..c234ac80 100644 --- a/picture.py +++ b/picture.py @@ -32,15 +32,17 @@ grey = Color(0xCDC9C9, 1.0) black = Color(0x000000, 1.0) -thinline = LineStyle(1, brown) +thinline = LineStyle(1, grey) thinline1 = LineStyle(1,grey) tank = RectangleAsset(900,600, thinline, lightblue) pebbles = RectangleAsset(900, 45, thinline, brown) castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) +castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) tower = RectangleAsset(80, 100, thinline, grey) -centertower = RectangleAsset(100, 100, thinline, grey) +centertower = RectangleAsset(150, 140, thinline, grey) +centertower2 = RectangleAsset(45, 50, thinline, grey) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -49,7 +51,10 @@ Sprite(castletop, (600,285)) Sprite(tower, (870,390)) Sprite(castletop, (870,285)) -Sprite(centertower, (750,365)) +Sprite(centertower, (700,350)) +Sprite(tower, (735,280)) +Sprite(castletop2, (750,140)) +Sprite(centertower2, (750,230)) # add your code here /\ /\ /\ From efcb6e3b7e634be10969430b35e599e7b99e8d6c Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:34:04 -0500 Subject: [PATCH 07/62] Updated from Brython Server: 1/30/2019 1:34:03 PM From 51b0b002b891a8ab4b6cd98595c779e52182ba96 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:49:57 -0500 Subject: [PATCH 08/62] Updated from Brython Server: 1/30/2019 1:49:56 PM --- picture.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index c234ac80..93f03ed3 100644 --- a/picture.py +++ b/picture.py @@ -32,7 +32,7 @@ grey = Color(0xCDC9C9, 1.0) black = Color(0x000000, 1.0) -thinline = LineStyle(1, grey) +thinline = LineStyle(1, black) thinline1 = LineStyle(1,grey) tank = RectangleAsset(900,600, thinline, lightblue) @@ -43,6 +43,7 @@ tower = RectangleAsset(80, 100, thinline, grey) centertower = RectangleAsset(150, 140, thinline, grey) centertower2 = RectangleAsset(45, 50, thinline, grey) +ridge = RectangleAsset(10, 25, thinline, lightblue) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -55,6 +56,12 @@ Sprite(tower, (735,280)) Sprite(castletop2, (750,140)) Sprite(centertower2, (750,230)) +Sprite(ridge, (710,340)) +Sprite(ridge, (750,230)) +Sprite(ridge, (750,230)) +Sprite(ridge, (750,230)) +Sprite(ridge, (750,230)) +Sprite(ridge, (750,230)) # add your code here /\ /\ /\ From c70fd617088f46a7a87253a6d2c4c941513eac2e Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:55:49 -0500 Subject: [PATCH 09/62] Updated from Brython Server: 1/30/2019 1:55:48 PM --- picture.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/picture.py b/picture.py index 93f03ed3..4538e69c 100644 --- a/picture.py +++ b/picture.py @@ -56,12 +56,13 @@ Sprite(tower, (735,280)) Sprite(castletop2, (750,140)) Sprite(centertower2, (750,230)) -Sprite(ridge, (710,340)) -Sprite(ridge, (750,230)) -Sprite(ridge, (750,230)) -Sprite(ridge, (750,230)) -Sprite(ridge, (750,230)) -Sprite(ridge, (750,230)) +Sprite(ridge, (708,350)) +Sprite(ridge, (738,350)) +Sprite(ridge, (768,350)) +Sprite(ridge, (798,350)) +Sprite(ridge, (828,350)) + + # add your code here /\ /\ /\ From 397149805a4ff4b2b234fca3761bc2778b3d64e2 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:59:17 -0500 Subject: [PATCH 10/62] Updated from Brython Server: 1/30/2019 1:59:16 PM --- picture.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 4538e69c..9b18a42f 100644 --- a/picture.py +++ b/picture.py @@ -44,6 +44,7 @@ centertower = RectangleAsset(150, 140, thinline, grey) centertower2 = RectangleAsset(45, 50, thinline, grey) ridge = RectangleAsset(10, 25, thinline, lightblue) +ridge1 = RectangleAsset(8, 20, thinline, lightblue) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -61,7 +62,7 @@ Sprite(ridge, (768,350)) Sprite(ridge, (798,350)) Sprite(ridge, (828,350)) - +Sprite(ridge1, (745,280)) # add your code here /\ /\ /\ From 199aa91d5ab90b11758fd82b7caa816ee84e9179 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:59:26 -0500 Subject: [PATCH 11/62] Updated from Brython Server: 1/30/2019 1:59:25 PM --- picture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 9b18a42f..c80aae01 100644 --- a/picture.py +++ b/picture.py @@ -62,7 +62,7 @@ Sprite(ridge, (768,350)) Sprite(ridge, (798,350)) Sprite(ridge, (828,350)) -Sprite(ridge1, (745,280)) +Sprite(ridge1, (740,280)) # add your code here /\ /\ /\ From 6450e3e5697aad22acae6ca8cdaa1cbc9c6853a5 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:00:49 -0500 Subject: [PATCH 12/62] Updated from Brython Server: 1/30/2019 2:00:48 PM --- picture.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/picture.py b/picture.py index c80aae01..83b3222f 100644 --- a/picture.py +++ b/picture.py @@ -63,6 +63,9 @@ Sprite(ridge, (798,350)) Sprite(ridge, (828,350)) Sprite(ridge1, (740,280)) +Sprite(ridge1, (760,280)) +Sprite(ridge1, (780,280)) +Sprite(ridge1, (800,280)) # add your code here /\ /\ /\ From 13e9422e35c8f8870c4e17cf5a0af897cb2ce7a5 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:01:04 -0500 Subject: [PATCH 13/62] Updated from Brython Server: 1/30/2019 2:01:03 PM From 4a4c101cb3e7f3b5750774d41e1fa56e88f62e1c Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:03:22 -0500 Subject: [PATCH 14/62] Updated from Brython Server: 1/30/2019 2:03:20 PM --- picture.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index 83b3222f..f792c8f2 100644 --- a/picture.py +++ b/picture.py @@ -32,7 +32,7 @@ grey = Color(0xCDC9C9, 1.0) black = Color(0x000000, 1.0) -thinline = LineStyle(1, black) +thinline = LineStyle(1, grey) thinline1 = LineStyle(1,grey) tank = RectangleAsset(900,600, thinline, lightblue) @@ -41,10 +41,11 @@ castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) tower = RectangleAsset(80, 100, thinline, grey) -centertower = RectangleAsset(150, 140, thinline, grey) -centertower2 = RectangleAsset(45, 50, thinline, grey) +centertower = RectangleAsset(150, 140, thinline, black) +centertower2 = RectangleAsset(45, 50, thinline, black) ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) +ridge2 = RectangleAsset(8, 20, thinline, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) From 111761f289376f80881eaec1c8c096bb7c87ff5a Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:07:27 -0500 Subject: [PATCH 15/62] Updated from Brython Server: 1/30/2019 2:07:25 PM --- picture.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/picture.py b/picture.py index f792c8f2..8e32651a 100644 --- a/picture.py +++ b/picture.py @@ -33,19 +33,19 @@ black = Color(0x000000, 1.0) thinline = LineStyle(1, grey) -thinline1 = LineStyle(1,grey) +thinline1 = LineStyle(1,black) tank = RectangleAsset(900,600, thinline, lightblue) pebbles = RectangleAsset(900, 45, thinline, brown) castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) -tower = RectangleAsset(80, 100, thinline, grey) -centertower = RectangleAsset(150, 140, thinline, black) -centertower2 = RectangleAsset(45, 50, thinline, black) +tower = RectangleAsset(80, 100, thinline, black) +centertower = RectangleAsset(150, 140, thinline, grey) +centertower2 = RectangleAsset(45, 50, thinline, grey) ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) -ridge2 = RectangleAsset(8, 20, thinline, black) +ridge2 = RectangleAsset(8, 20, thinline1, lightblue) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -59,9 +59,9 @@ Sprite(castletop2, (750,140)) Sprite(centertower2, (750,230)) Sprite(ridge, (708,350)) -Sprite(ridge, (738,350)) -Sprite(ridge, (768,350)) -Sprite(ridge, (798,350)) +Sprite(ridge2, (738,350)) +Sprite(ridge2, (768,350)) +Sprite(ridge2, (798,350)) Sprite(ridge, (828,350)) Sprite(ridge1, (740,280)) Sprite(ridge1, (760,280)) From 606267ceb095943e59d31063a8f52c315d08e2d2 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:09:13 -0500 Subject: [PATCH 16/62] Updated from Brython Server: 1/30/2019 2:09:11 PM --- picture.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index 8e32651a..2a69ac86 100644 --- a/picture.py +++ b/picture.py @@ -30,7 +30,7 @@ lightblue = Color(0xBFEFFF,0.8) brown = Color(0x8B4726, 0.9) grey = Color(0xCDC9C9, 1.0) -black = Color(0x000000, 1.0) +black = Color(0x000000, 0.5) thinline = LineStyle(1, grey) thinline1 = LineStyle(1,black) @@ -42,7 +42,7 @@ castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) tower = RectangleAsset(80, 100, thinline, black) centertower = RectangleAsset(150, 140, thinline, grey) -centertower2 = RectangleAsset(45, 50, thinline, grey) +centertower1 = RectangleAsset(45, 50, thinline, grey) ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) ridge2 = RectangleAsset(8, 20, thinline1, lightblue) @@ -57,7 +57,7 @@ Sprite(centertower, (700,350)) Sprite(tower, (735,280)) Sprite(castletop2, (750,140)) -Sprite(centertower2, (750,230)) +Sprite(centertower1, (750,230)) Sprite(ridge, (708,350)) Sprite(ridge2, (738,350)) Sprite(ridge2, (768,350)) From 1a32cf1e25c7adeb759008819b3f20720ab41f9b Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:12:01 -0500 Subject: [PATCH 17/62] Updated from Brython Server: 1/30/2019 2:11:59 PM --- picture.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index 2a69ac86..faeb722c 100644 --- a/picture.py +++ b/picture.py @@ -29,7 +29,8 @@ # add your code here \/ \/ \/ lightblue = Color(0xBFEFFF,0.8) brown = Color(0x8B4726, 0.9) -grey = Color(0xCDC9C9, 1.0) +grey = Color(0x8B8989, 1.0) +lightgrey = Color(0x969696, 1.0) black = Color(0x000000, 0.5) thinline = LineStyle(1, grey) @@ -40,7 +41,7 @@ castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) -tower = RectangleAsset(80, 100, thinline, black) +tower = RectangleAsset(80, 100, thinline, lightgrey) centertower = RectangleAsset(150, 140, thinline, grey) centertower1 = RectangleAsset(45, 50, thinline, grey) ridge = RectangleAsset(10, 25, thinline, lightblue) From 0dd29fdf231a576b526859c5fbd205298660cfeb Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 14:12:44 -0500 Subject: [PATCH 18/62] Updated from Brython Server: 1/30/2019 2:12:43 PM --- picture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picture.py b/picture.py index faeb722c..9d9cfeef 100644 --- a/picture.py +++ b/picture.py @@ -41,9 +41,9 @@ castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) -tower = RectangleAsset(80, 100, thinline, lightgrey) centertower = RectangleAsset(150, 140, thinline, grey) centertower1 = RectangleAsset(45, 50, thinline, grey) +tower = RectangleAsset(80, 100, thinline, lightgrey) ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) ridge2 = RectangleAsset(8, 20, thinline1, lightblue) From 4d0fbfb02127346f0060b7c4029de4e43681823a Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 16:28:18 -0500 Subject: [PATCH 19/62] Updated from Brython Server: 1/30/2019 4:28:16 PM --- picture.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/picture.py b/picture.py index 9d9cfeef..c64e1982 100644 --- a/picture.py +++ b/picture.py @@ -27,26 +27,27 @@ from ggame import App, Color, LineStyle, Sprite, RectangleAsset, CircleAsset, EllipseAsset, PolygonAsset # add your code here \/ \/ \/ -lightblue = Color(0xBFEFFF,0.8) -brown = Color(0x8B4726, 0.9) +lightblue = Color(0xBFEFFF,1.0) +brown = Color(0x8B4726, 1.0) grey = Color(0x8B8989, 1.0) -lightgrey = Color(0x969696, 1.0) -black = Color(0x000000, 0.5) +red = Color(0xCD2626, 1.0) +black = Color(0x000000, 1.0) thinline = LineStyle(1, grey) -thinline1 = LineStyle(1,black) +thinline1 = LineStyle(1, black) tank = RectangleAsset(900,600, thinline, lightblue) pebbles = RectangleAsset(900, 45, thinline, brown) castle = RectangleAsset(350, 190, thinline, grey) -castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, grey) -castletop2 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, grey) +castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, red) +castletop1 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, red) centertower = RectangleAsset(150, 140, thinline, grey) centertower1 = RectangleAsset(45, 50, thinline, grey) -tower = RectangleAsset(80, 100, thinline, lightgrey) +tower = RectangleAsset(80, 100, thinline, grey) ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) -ridge2 = RectangleAsset(8, 20, thinline1, lightblue) +windows = RectangleAsset(130, 130, thinline, black) +windows2 = EllipseAsset(60, 80, thinline1, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -57,18 +58,19 @@ Sprite(castletop, (870,285)) Sprite(centertower, (700,350)) Sprite(tower, (735,280)) -Sprite(castletop2, (750,140)) +Sprite(castletop1, (750,140)) Sprite(centertower1, (750,230)) Sprite(ridge, (708,350)) -Sprite(ridge2, (738,350)) -Sprite(ridge2, (768,350)) -Sprite(ridge2, (798,350)) +Sprite(ridge, (738,350)) +Sprite(ridge, (768,350)) +Sprite(ridge, (798,350)) Sprite(ridge, (828,350)) Sprite(ridge1, (740,280)) Sprite(ridge1, (760,280)) Sprite(ridge1, (780,280)) Sprite(ridge1, (800,280)) - +Sprite(windows, (710,540)) +Sprite(windows2, (714,505)) # add your code here /\ /\ /\ From 60a38614539dfe6251822e19be16047cf1a3fdf2 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 16:36:28 -0500 Subject: [PATCH 20/62] Updated from Brython Server: 1/30/2019 4:36:26 PM --- picture.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/picture.py b/picture.py index c64e1982..b484d25f 100644 --- a/picture.py +++ b/picture.py @@ -28,16 +28,17 @@ # add your code here \/ \/ \/ lightblue = Color(0xBFEFFF,1.0) -brown = Color(0x8B4726, 1.0) +brown = Color(0x5D3909, 1.0) +tan = Color(0xFFE4B5, 1.0) grey = Color(0x8B8989, 1.0) red = Color(0xCD2626, 1.0) black = Color(0x000000, 1.0) thinline = LineStyle(1, grey) -thinline1 = LineStyle(1, black) +thinline1 = LineStyle(1, brown) tank = RectangleAsset(900,600, thinline, lightblue) -pebbles = RectangleAsset(900, 45, thinline, brown) +pebbles = RectangleAsset(900, 45, thinline, tan) castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, red) castletop1 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, red) @@ -46,8 +47,8 @@ tower = RectangleAsset(80, 100, thinline, grey) ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) -windows = RectangleAsset(130, 130, thinline, black) -windows2 = EllipseAsset(60, 80, thinline1, black) +windows = RectangleAsset(130, 130, thinline, brown) +windows2 = EllipseAsset(63, 80, thinline1, brown) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -70,7 +71,7 @@ Sprite(ridge1, (780,280)) Sprite(ridge1, (800,280)) Sprite(windows, (710,540)) -Sprite(windows2, (714,505)) +Sprite(windows2, (711,505)) # add your code here /\ /\ /\ From db7de5a7ab502386f5a313f2c3b72730efa9b02a Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 16:43:06 -0500 Subject: [PATCH 21/62] Updated from Brython Server: 1/30/2019 4:43:05 PM --- picture.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index b484d25f..3d78dd75 100644 --- a/picture.py +++ b/picture.py @@ -32,7 +32,7 @@ tan = Color(0xFFE4B5, 1.0) grey = Color(0x8B8989, 1.0) red = Color(0xCD2626, 1.0) -black = Color(0x000000, 1.0) +black = Color(0x000000, 0.7) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) @@ -48,7 +48,9 @@ ridge = RectangleAsset(10, 25, thinline, lightblue) ridge1 = RectangleAsset(8, 20, thinline, lightblue) windows = RectangleAsset(130, 130, thinline, brown) +windows1 = RectangleAsset(40, 50, thinline, black) windows2 = EllipseAsset(63, 80, thinline1, brown) +windows3 = RectangleAsset(20, 30, thinline1, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -71,7 +73,10 @@ Sprite(ridge1, (780,280)) Sprite(ridge1, (800,280)) Sprite(windows, (710,540)) +Sprite(windows1, (620,410)) +Sprite(windows1, (890,410)) Sprite(windows2, (711,505)) +Sprite(windows3, (762.5,238)) # add your code here /\ /\ /\ From 4a0e61a593f6f9f3e3e5148093348dde41e289f8 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 16:52:33 -0500 Subject: [PATCH 22/62] Updated from Brython Server: 1/30/2019 4:52:31 PM --- picture.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/picture.py b/picture.py index 3d78dd75..def82477 100644 --- a/picture.py +++ b/picture.py @@ -36,6 +36,7 @@ thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) +thinline2 = LineStyle(1, black) tank = RectangleAsset(900,600, thinline, lightblue) pebbles = RectangleAsset(900, 45, thinline, tan) @@ -51,6 +52,8 @@ windows1 = RectangleAsset(40, 50, thinline, black) windows2 = EllipseAsset(63, 80, thinline1, brown) windows3 = RectangleAsset(20, 30, thinline1, black) +line = PolygonAsset([(40,60), (40,-105), (40,60)],thinline2, black) +doorknob = EllipseAsset(8, 8, thinline1, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -77,6 +80,8 @@ Sprite(windows1, (890,410)) Sprite(windows2, (711,505)) Sprite(windows3, (762.5,238)) +Sprite(line, (773,505)) + # add your code here /\ /\ /\ From b6c9ebcd36499dc2e8a65a9988642cfadd8cd821 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 16:53:54 -0500 Subject: [PATCH 23/62] Updated from Brython Server: 1/30/2019 4:53:52 PM --- picture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picture.py b/picture.py index def82477..4c314a99 100644 --- a/picture.py +++ b/picture.py @@ -27,7 +27,7 @@ from ggame import App, Color, LineStyle, Sprite, RectangleAsset, CircleAsset, EllipseAsset, PolygonAsset # add your code here \/ \/ \/ -lightblue = Color(0xBFEFFF,1.0) +lightblue = Color(0x7ec0ee,1.0) brown = Color(0x5D3909, 1.0) tan = Color(0xFFE4B5, 1.0) grey = Color(0x8B8989, 1.0) From 5a800e6574e82103d0e3129708d70592b43f61e9 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 17:08:50 -0500 Subject: [PATCH 24/62] Updated from Brython Server: 1/30/2019 5:08:48 PM --- picture.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index 4c314a99..2d427be3 100644 --- a/picture.py +++ b/picture.py @@ -33,13 +33,17 @@ grey = Color(0x8B8989, 1.0) red = Color(0xCD2626, 1.0) black = Color(0x000000, 0.7) +green = Color(0x228B22, 1.0) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) thinline2 = LineStyle(1, black) +thinline3 = LineStyle(1, green) +thickline = LineStyle(2, black) -tank = RectangleAsset(900,600, thinline, lightblue) -pebbles = RectangleAsset(900, 45, thinline, tan) + +tank = RectangleAsset(900,600, thickline, lightblue) +pebbles = RectangleAsset(900, 45, thinline2, tan) castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, red) castletop1 = PolygonAsset([(40,60), (62.5,-30), (85,60)],thinline, red) @@ -54,6 +58,9 @@ windows3 = RectangleAsset(20, 30, thinline1, black) line = PolygonAsset([(40,60), (40,-105), (40,60)],thinline2, black) doorknob = EllipseAsset(8, 8, thinline1, black) +plant = RectangleAsset(10, 280, thinline3, green) +leaves = EllipseAsset(8, 20, thinline3, green) + Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -81,7 +88,8 @@ Sprite(windows2, (711,505)) Sprite(windows3, (762.5,238)) Sprite(line, (773,505)) - +Sprite(plant, (175,386)) +Sprite(leaves, (175,370)) # add your code here /\ /\ /\ From e85e24357b79776b63a04abf9456ba5c66de3865 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 17:08:53 -0500 Subject: [PATCH 25/62] Updated from Brython Server: 1/30/2019 5:08:51 PM From 803641507d0d044e0cbe53acefd45b9316aa4b5b Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 17:08:59 -0500 Subject: [PATCH 26/62] Updated from Brython Server: 1/30/2019 5:08:58 PM From 185b43593fb6847c424bece70344560067921575 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 23:19:32 -0500 Subject: [PATCH 27/62] Updated from Brython Server: 1/30/2019 11:19:31 PM From f7ef2784fa706691902aa771ef21968762ce473d Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 23:19:34 -0500 Subject: [PATCH 28/62] Updated from Brython Server: 1/30/2019 11:19:34 PM From bbbff6016909708c7b4e172dc08b6802fb027bae Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Wed, 30 Jan 2019 23:19:53 -0500 Subject: [PATCH 29/62] Updated from Brython Server: 1/30/2019 11:19:52 PM From 425b1b44536b7c109b352b4345585d14fcbbe506 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:24:34 -0500 Subject: [PATCH 30/62] Updated from Brython Server: 1/31/2019 10:24:33 AM --- picture.py | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/picture.py b/picture.py index 2d427be3..6716744a 100644 --- a/picture.py +++ b/picture.py @@ -33,16 +33,15 @@ grey = Color(0x8B8989, 1.0) red = Color(0xCD2626, 1.0) black = Color(0x000000, 0.7) +black1 = Color(0x000000, 0.7) green = Color(0x228B22, 1.0) - thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) -thinline2 = LineStyle(1, black) +thinline2 = LineStyle(1, black1) thinline3 = LineStyle(1, green) -thickline = LineStyle(2, black) -tank = RectangleAsset(900,600, thickline, lightblue) +tank = RectangleAsset(900,600, thinline2, lightblue) pebbles = RectangleAsset(900, 45, thinline2, tan) castle = RectangleAsset(350, 190, thinline, grey) castletop = PolygonAsset([(40,60), (80,-45), (120,60)],thinline, red) @@ -58,7 +57,7 @@ windows3 = RectangleAsset(20, 30, thinline1, black) line = PolygonAsset([(40,60), (40,-105), (40,60)],thinline2, black) doorknob = EllipseAsset(8, 8, thinline1, black) -plant = RectangleAsset(10, 280, thinline3, green) +plant = RectangleAsset(10, 250, thinline3, green) leaves = EllipseAsset(8, 20, thinline3, green) @@ -88,8 +87,33 @@ Sprite(windows2, (711,505)) Sprite(windows3, (762.5,238)) Sprite(line, (773,505)) -Sprite(plant, (175,386)) -Sprite(leaves, (175,370)) +Sprite(plant, (175,417)) +a = Sprite(leaves, (186,445)) +a.rotation = 2.2 +a = Sprite(leaves, (185,445)) +a.rotation = 3.9 +a = Sprite(leaves, (185,475)) +a.rotation = 2.2 +a = Sprite(leaves, (185,485)) +a.rotation = 3.9 +a = Sprite(leaves, (185,510)) +a.rotation = 2.2 +a = Sprite(leaves, (185,520)) +a.rotation = 3.9 +a = Sprite(leaves, (185,545)) +a.rotation = 2.2 +a = Sprite(leaves, (185,555)) +a.rotation = 3.9 +a = Sprite(leaves, (185,580)) +a.rotation = 2.2 +a = Sprite(leaves, (185,590)) +a.rotation = 3.9 +a = Sprite(leaves, (185,615)) +a.rotation = 2.2 +a = Sprite(leaves, (185,625)) +a.rotation = 3.9 +a = Sprite(leaves, (185,650)) +a.rotation = 2.2 # add your code here /\ /\ /\ From 6de68bb3be436c595d77c46a39d83c995150e24c Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:24:37 -0500 Subject: [PATCH 31/62] Updated from Brython Server: 1/31/2019 10:24:36 AM From 6f06b466c79e3b290c4ff18381981e52f7f2c412 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:26:02 -0500 Subject: [PATCH 32/62] Updated from Brython Server: 1/31/2019 10:26:01 AM --- picture.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/picture.py b/picture.py index 6716744a..708f44c7 100644 --- a/picture.py +++ b/picture.py @@ -88,31 +88,31 @@ Sprite(windows3, (762.5,238)) Sprite(line, (773,505)) Sprite(plant, (175,417)) -a = Sprite(leaves, (186,445)) +a = Sprite(leaves, (186,448)) a.rotation = 2.2 -a = Sprite(leaves, (185,445)) +a = Sprite(leaves, (185,450)) a.rotation = 3.9 -a = Sprite(leaves, (185,475)) +a = Sprite(leaves, (185,480)) a.rotation = 2.2 -a = Sprite(leaves, (185,485)) +a = Sprite(leaves, (185,490)) a.rotation = 3.9 -a = Sprite(leaves, (185,510)) +a = Sprite(leaves, (185,515)) a.rotation = 2.2 -a = Sprite(leaves, (185,520)) +a = Sprite(leaves, (185,525)) a.rotation = 3.9 -a = Sprite(leaves, (185,545)) +a = Sprite(leaves, (185,550)) a.rotation = 2.2 -a = Sprite(leaves, (185,555)) +a = Sprite(leaves, (185,560)) a.rotation = 3.9 -a = Sprite(leaves, (185,580)) +a = Sprite(leaves, (185,585)) a.rotation = 2.2 -a = Sprite(leaves, (185,590)) +a = Sprite(leaves, (185,595)) a.rotation = 3.9 -a = Sprite(leaves, (185,615)) +a = Sprite(leaves, (185,620)) a.rotation = 2.2 -a = Sprite(leaves, (185,625)) +a = Sprite(leaves, (185,630)) a.rotation = 3.9 -a = Sprite(leaves, (185,650)) +a = Sprite(leaves, (185,655)) a.rotation = 2.2 # add your code here /\ /\ /\ From bdab51be31b74866033b7dad04cdd1f9d1eec5f0 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:32:16 -0500 Subject: [PATCH 33/62] Updated from Brython Server: 1/31/2019 10:32:15 AM --- picture.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index 708f44c7..f5eb6b74 100644 --- a/picture.py +++ b/picture.py @@ -58,8 +58,9 @@ line = PolygonAsset([(40,60), (40,-105), (40,60)],thinline2, black) doorknob = EllipseAsset(8, 8, thinline1, black) plant = RectangleAsset(10, 250, thinline3, green) +plant1 = RectangleAsset(5, 110, thinline3, green) leaves = EllipseAsset(8, 20, thinline3, green) - +leaves1 = RectangleAsset(2, 30, thinline3, green) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -114,7 +115,15 @@ a.rotation = 3.9 a = Sprite(leaves, (185,655)) a.rotation = 2.2 - +Sprite(plant1, (280,556)) +b = Sprite(leaves1, (282,630)) +b.rotation = 3.9 +b = Sprite(leaves1, (282,655)) +b.rotation = 2.2 +b = Sprite(leaves1, (282,590)) +b.rotation = 3.9 +b = Sprite(leaves1, (282,615)) +b.rotation = 2.2 # add your code here /\ /\ /\ From 90c0b09e3880bc5162b734dacb40b1b0a94b9bee Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:32:19 -0500 Subject: [PATCH 34/62] Updated from Brython Server: 1/31/2019 10:32:18 AM From b53ebaf8e99a49dc32a2f0d06866f19a0719f29d Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:33:00 -0500 Subject: [PATCH 35/62] Updated from Brython Server: 1/31/2019 10:32:59 AM --- picture.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/picture.py b/picture.py index f5eb6b74..8c5366b8 100644 --- a/picture.py +++ b/picture.py @@ -124,6 +124,8 @@ b.rotation = 3.9 b = Sprite(leaves1, (282,615)) b.rotation = 2.2 +b = Sprite(leaves1, (282,575)) +b.rotation = 2.2 # add your code here /\ /\ /\ From 59549cbd6f2eb3a2c64e37dac6f2b75f166ac8ef Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:35:33 -0500 Subject: [PATCH 36/62] Updated from Brython Server: 1/31/2019 10:35:31 AM --- picture.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/picture.py b/picture.py index 8c5366b8..3130a02d 100644 --- a/picture.py +++ b/picture.py @@ -61,6 +61,7 @@ plant1 = RectangleAsset(5, 110, thinline3, green) leaves = EllipseAsset(8, 20, thinline3, green) leaves1 = RectangleAsset(2, 30, thinline3, green) +fish = EllipseAsset(45, 25, thinline3, green) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -126,6 +127,7 @@ b.rotation = 2.2 b = Sprite(leaves1, (282,575)) b.rotation = 2.2 +Sprite(fish, (190,200)) # add your code here /\ /\ /\ From a63726c74cabc518c5769c5e6370559fdcbf79bd Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:44:44 -0500 Subject: [PATCH 37/62] Updated from Brython Server: 1/31/2019 10:44:43 AM --- picture.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index 3130a02d..e3e8b179 100644 --- a/picture.py +++ b/picture.py @@ -35,11 +35,13 @@ black = Color(0x000000, 0.7) black1 = Color(0x000000, 0.7) green = Color(0x228B22, 1.0) +orange = Color(0xF5920F, 1.0) +darkorange = Color(0xD07702, 1.0) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) thinline2 = LineStyle(1, black1) thinline3 = LineStyle(1, green) - +thinline4 = LineStyle(1, darkorange) tank = RectangleAsset(900,600, thinline2, lightblue) pebbles = RectangleAsset(900, 45, thinline2, tan) @@ -61,7 +63,8 @@ plant1 = RectangleAsset(5, 110, thinline3, green) leaves = EllipseAsset(8, 20, thinline3, green) leaves1 = RectangleAsset(2, 30, thinline3, green) -fish = EllipseAsset(45, 25, thinline3, green) +fish = EllipseAsset(45, 25, thinline4, orange) +fins = PolygonAsset([(40,40), (75,15), (75,65)],thinline4, darkorange) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -128,6 +131,7 @@ b = Sprite(leaves1, (282,575)) b.rotation = 2.2 Sprite(fish, (190,200)) +Sprite(fins, (278,198)) # add your code here /\ /\ /\ From a3547d6eb0d0b767a7df8c41752c55c770ac2820 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 10:58:30 -0500 Subject: [PATCH 38/62] Updated from Brython Server: 1/31/2019 10:58:27 AM --- picture.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index e3e8b179..991e2e42 100644 --- a/picture.py +++ b/picture.py @@ -37,6 +37,7 @@ green = Color(0x228B22, 1.0) orange = Color(0xF5920F, 1.0) darkorange = Color(0xD07702, 1.0) +darkorange1 = Color(0xD07702, 0) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) thinline2 = LineStyle(1, black1) @@ -63,8 +64,10 @@ plant1 = RectangleAsset(5, 110, thinline3, green) leaves = EllipseAsset(8, 20, thinline3, green) leaves1 = RectangleAsset(2, 30, thinline3, green) -fish = EllipseAsset(45, 25, thinline4, orange) -fins = PolygonAsset([(40,40), (75,15), (75,65)],thinline4, darkorange) +fish = EllipseAsset(45, 27, thinline4, orange) +tail = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, darkorange) +fins = PolygonAsset([(40,40), (60,30), (60,50)],thinline4, darkorange) + Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -131,7 +134,9 @@ b = Sprite(leaves1, (282,575)) b.rotation = 2.2 Sprite(fish, (190,200)) -Sprite(fins, (278,198)) +Sprite(tail, (278,204)) +Sprite(fins, (235,215)) + # add your code here /\ /\ /\ From 9d483d233eed3ed1571a21c6d58b9ceff68dd0b7 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 11:02:53 -0500 Subject: [PATCH 39/62] Updated from Brython Server: 1/31/2019 11:02:50 AM --- picture.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 991e2e42..1e8250e1 100644 --- a/picture.py +++ b/picture.py @@ -67,7 +67,7 @@ fish = EllipseAsset(45, 27, thinline4, orange) tail = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, darkorange) fins = PolygonAsset([(40,40), (60,30), (60,50)],thinline4, darkorange) - +fish2 = RectangleAsset(80, 80, thinline3, green) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -136,6 +136,7 @@ Sprite(fish, (190,200)) Sprite(tail, (278,204)) Sprite(fins, (235,215)) +Sprite(fish2, (235,215)) # add your code here /\ /\ /\ From 75a5b3b6900bc336a0b3729893134dfbb947b2f4 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:07:21 -0500 Subject: [PATCH 40/62] Updated from Brython Server: 1/31/2019 2:07:20 PM From 3a5072f052e82f4ccfa921c0d7de08a0be8b3631 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:07:41 -0500 Subject: [PATCH 41/62] Updated from Brython Server: 1/31/2019 2:07:40 PM --- picture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 1e8250e1..0437729b 100644 --- a/picture.py +++ b/picture.py @@ -1,6 +1,6 @@ """ picture.py -Author: +Author: Rain Credit: Assignment: From 24f3686885163a78e7186044369a61510cd24db6 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:24:14 -0500 Subject: [PATCH 42/62] Updated from Brython Server: 1/31/2019 2:24:13 PM --- picture.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 0437729b..51707224 100644 --- a/picture.py +++ b/picture.py @@ -136,7 +136,9 @@ Sprite(fish, (190,200)) Sprite(tail, (278,204)) Sprite(fins, (235,215)) -Sprite(fish2, (235,215)) +c = Sprite(fish2, (260,395)) +c.rotation = 2.35 + # add your code here /\ /\ /\ From 258408350c46a16cf86d89c744a0460f115b3e80 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:24:17 -0500 Subject: [PATCH 43/62] Updated from Brython Server: 1/31/2019 2:24:16 PM From 7c19d36d448c3f3701292009556d9c39876a155b Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:41:51 -0500 Subject: [PATCH 44/62] Updated from Brython Server: 1/31/2019 2:41:50 PM --- picture.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/picture.py b/picture.py index 51707224..ccda426c 100644 --- a/picture.py +++ b/picture.py @@ -65,9 +65,11 @@ leaves = EllipseAsset(8, 20, thinline3, green) leaves1 = RectangleAsset(2, 30, thinline3, green) fish = EllipseAsset(45, 27, thinline4, orange) -tail = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, darkorange) -fins = PolygonAsset([(40,40), (60,30), (60,50)],thinline4, darkorange) +tail = EllipseAsset(20,10, thinline4, darkorange) +fins = EllipseAsset(15,7, thinline4, darkorange) fish2 = RectangleAsset(80, 80, thinline3, green) +tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, darkorange) +line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -134,10 +136,19 @@ b = Sprite(leaves1, (282,575)) b.rotation = 2.2 Sprite(fish, (190,200)) -Sprite(tail, (278,204)) -Sprite(fins, (235,215)) -c = Sprite(fish2, (260,395)) -c.rotation = 2.35 +c = Sprite(tail, (272,215)) +c.rotation = 0.4 +c = Sprite(tail, (310.5,252)) +c.rotation = 2.75 +d = Sprite(fins, (225,218)) +d.rotation = 0.3 +d = Sprite(fins, (255,243)) +d.rotation = 2.8 +e = Sprite(fish2, (435,425)) +e.rotation = 2.35 +f = Sprite(tail2, (380,389)) +f.rotation = 3.12 +Sprite(line1, (215,202)) # add your code here /\ /\ /\ From fcdc89f2892d22ef83ad40c61f1d0d932220cd19 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:43:35 -0500 Subject: [PATCH 45/62] Updated from Brython Server: 1/31/2019 2:43:34 PM --- picture.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/picture.py b/picture.py index ccda426c..d2f8dcec 100644 --- a/picture.py +++ b/picture.py @@ -70,6 +70,7 @@ fish2 = RectangleAsset(80, 80, thinline3, green) tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, darkorange) line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) +eye = EllipseAsset(3,3, thinline2, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -149,6 +150,7 @@ f = Sprite(tail2, (380,389)) f.rotation = 3.12 Sprite(line1, (215,202)) +Sprite(eye, (200,215)) # add your code here /\ /\ /\ From 734e74d80deb9c87c36670fc2c084ca9722976e1 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:45:16 -0500 Subject: [PATCH 46/62] Updated from Brython Server: 1/31/2019 2:45:15 PM --- picture.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/picture.py b/picture.py index d2f8dcec..0475fa05 100644 --- a/picture.py +++ b/picture.py @@ -38,6 +38,9 @@ orange = Color(0xF5920F, 1.0) darkorange = Color(0xD07702, 1.0) darkorange1 = Color(0xD07702, 0) +blue = Color(0x0285D0, 1.0) + + thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) thinline2 = LineStyle(1, black1) From dde56736646df54135e015a3af12962e875a3baa Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:49:42 -0500 Subject: [PATCH 47/62] Updated from Brython Server: 1/31/2019 2:49:41 PM --- picture.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index 0475fa05..9dd1eb6f 100644 --- a/picture.py +++ b/picture.py @@ -39,6 +39,7 @@ darkorange = Color(0xD07702, 1.0) darkorange1 = Color(0xD07702, 0) blue = Color(0x0285D0, 1.0) +white = Color(0xFFFFFF, 1.0) thinline = LineStyle(1, grey) @@ -46,6 +47,7 @@ thinline2 = LineStyle(1, black1) thinline3 = LineStyle(1, green) thinline4 = LineStyle(1, darkorange) +thinline5 = LineStyle(1, darkorange1) tank = RectangleAsset(900,600, thinline2, lightblue) pebbles = RectangleAsset(900, 45, thinline2, tan) @@ -71,9 +73,10 @@ tail = EllipseAsset(20,10, thinline4, darkorange) fins = EllipseAsset(15,7, thinline4, darkorange) fish2 = RectangleAsset(80, 80, thinline3, green) -tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, darkorange) +tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, blue) line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) -eye = EllipseAsset(3,3, thinline2, black) +eye = EllipseAsset(2,2, thinline5, black) +eye1 = EllipseAsset(5,5, thinline5, white) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -153,7 +156,9 @@ f = Sprite(tail2, (380,389)) f.rotation = 3.12 Sprite(line1, (215,202)) -Sprite(eye, (200,215)) +Sprite(eye1, (200,213)) +Sprite(eye, (201.5,216)) + # add your code here /\ /\ /\ From 9d219b332b7e24017267db64093d6904c13def55 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:51:37 -0500 Subject: [PATCH 48/62] Updated from Brython Server: 1/31/2019 2:51:36 PM --- picture.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index 9dd1eb6f..7fac0fbe 100644 --- a/picture.py +++ b/picture.py @@ -75,8 +75,8 @@ fish2 = RectangleAsset(80, 80, thinline3, green) tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, blue) line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) -eye = EllipseAsset(2,2, thinline5, black) -eye1 = EllipseAsset(5,5, thinline5, white) +eye = EllipseAsset(2,2, thinline5, white) +eye1 = EllipseAsset(5,5, thinline5, black) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -157,7 +157,7 @@ f.rotation = 3.12 Sprite(line1, (215,202)) Sprite(eye1, (200,213)) -Sprite(eye, (201.5,216)) +Sprite(eye, (202,215)) From 7822f0ae551e5423d768344b221b89a8ec93a9d3 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:08:44 -0500 Subject: [PATCH 49/62] Updated from Brython Server: 1/31/2019 3:08:43 PM --- picture.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/picture.py b/picture.py index 7fac0fbe..01b6ca55 100644 --- a/picture.py +++ b/picture.py @@ -38,7 +38,7 @@ orange = Color(0xF5920F, 1.0) darkorange = Color(0xD07702, 1.0) darkorange1 = Color(0xD07702, 0) -blue = Color(0x0285D0, 1.0) +blue = Color(0x0631F1, 1.0) white = Color(0xFFFFFF, 1.0) @@ -72,11 +72,11 @@ fish = EllipseAsset(45, 27, thinline4, orange) tail = EllipseAsset(20,10, thinline4, darkorange) fins = EllipseAsset(15,7, thinline4, darkorange) -fish2 = RectangleAsset(80, 80, thinline3, green) -tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline4, blue) +fish2 = RectangleAsset(80, 80, thinline5, blue) +tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline5, blue) line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) -eye = EllipseAsset(2,2, thinline5, white) -eye1 = EllipseAsset(5,5, thinline5, black) +eye = EllipseAsset(3,3, thinline5, black) +eye1 = EllipseAsset(7,7, thinline5, white) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -155,9 +155,9 @@ e.rotation = 2.35 f = Sprite(tail2, (380,389)) f.rotation = 3.12 -Sprite(line1, (215,202)) -Sprite(eye1, (200,213)) -Sprite(eye, (202,215)) +Sprite(line1, (215.5,202)) +Sprite(eye1, (198,213)) +Sprite(eye, (200.5,215)) From 14567773d1924d370a0d199d5f0cf68e099af650 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:38:35 -0500 Subject: [PATCH 50/62] Updated from Brython Server: 1/31/2019 3:38:33 PM --- picture.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 01b6ca55..0264c2bc 100644 --- a/picture.py +++ b/picture.py @@ -40,7 +40,7 @@ darkorange1 = Color(0xD07702, 0) blue = Color(0x0631F1, 1.0) white = Color(0xFFFFFF, 1.0) - +yellow = Color(0xFCE604, 1.0) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) @@ -77,6 +77,7 @@ line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) eye = EllipseAsset(3,3, thinline5, black) eye1 = EllipseAsset(7,7, thinline5, white) +stripe = PolygonAsset([(50,50), (20,90), (4,40)],thinline5, yellow) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -158,6 +159,7 @@ Sprite(line1, (215.5,202)) Sprite(eye1, (198,213)) Sprite(eye, (200.5,215)) +Sprite(stripe, (406,336)) From 96553212ac317bf770c31ab237c3978e29cb7f54 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:41:46 -0500 Subject: [PATCH 51/62] Updated from Brython Server: 1/31/2019 3:41:44 PM --- picture.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index 0264c2bc..deca2d30 100644 --- a/picture.py +++ b/picture.py @@ -77,7 +77,7 @@ line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) eye = EllipseAsset(3,3, thinline5, black) eye1 = EllipseAsset(7,7, thinline5, white) -stripe = PolygonAsset([(50,50), (20,90), (4,40)],thinline5, yellow) +stripe = PolygonAsset([(50,50), (55.5,90), (60,40)],thinline5, yellow) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -159,7 +159,7 @@ Sprite(line1, (215.5,202)) Sprite(eye1, (198,213)) Sprite(eye, (200.5,215)) -Sprite(stripe, (406,336)) +Sprite(stripe, (406,328.5)) From 7fafdf268a24ab56d348211a9b61131ad8f1cb23 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:50:50 -0500 Subject: [PATCH 52/62] Updated from Brython Server: 1/31/2019 3:50:48 PM --- picture.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index deca2d30..8bc95322 100644 --- a/picture.py +++ b/picture.py @@ -78,6 +78,7 @@ eye = EllipseAsset(3,3, thinline5, black) eye1 = EllipseAsset(7,7, thinline5, white) stripe = PolygonAsset([(50,50), (55.5,90), (60,40)],thinline5, yellow) +tail3 = PolygonAsset([(40,40), (60,30), (60,50)],thinline5, yellow) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -160,8 +161,12 @@ Sprite(eye1, (198,213)) Sprite(eye, (200.5,215)) Sprite(stripe, (406,328.5)) - - +g = Sprite(stripe, (455,416.5)) +g.rotation = 3.1 +h = Sprite(tail3, (369.5,378.5)) +h.rotation = 3.1 +Sprite(eye1, (455,350)) +Sprite(eye, (461,355)) # add your code here /\ /\ /\ From 95f9b38c11fe342de2be14ab163123e74324b547 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 16:51:56 -0500 Subject: [PATCH 53/62] Updated from Brython Server: 1/31/2019 4:51:55 PM --- picture.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 8bc95322..a987a97c 100644 --- a/picture.py +++ b/picture.py @@ -41,6 +41,8 @@ blue = Color(0x0631F1, 1.0) white = Color(0xFFFFFF, 1.0) yellow = Color(0xFCE604, 1.0) +lightblue1 = Color(0xAAF3FF, 1.0) +black2 = Color(0x000000, 0.3) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) @@ -48,6 +50,7 @@ thinline3 = LineStyle(1, green) thinline4 = LineStyle(1, darkorange) thinline5 = LineStyle(1, darkorange1) +thinline6 = LineStyle(1, black2) tank = RectangleAsset(900,600, thinline2, lightblue) pebbles = RectangleAsset(900, 45, thinline2, tan) @@ -79,6 +82,9 @@ eye1 = EllipseAsset(7,7, thinline5, white) stripe = PolygonAsset([(50,50), (55.5,90), (60,40)],thinline5, yellow) tail3 = PolygonAsset([(40,40), (60,30), (60,50)],thinline5, yellow) +bubble = EllipseAsset(7,7, thinline6, lightblue1) +bubble1 = EllipseAsset(5,5, thinline6, lightblue1) +bubble2 = EllipseAsset(4,4, thinline6, lightblue1) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -167,7 +173,9 @@ h.rotation = 3.1 Sprite(eye1, (455,350)) Sprite(eye, (461,355)) - +Sprite(bubble, (190,170)) +Sprite(bubble1, (180,150)) +Sprite(bubble2, (195,125)) # add your code here /\ /\ /\ From f23d17f58dbccbcb6251743edfea04ee561a320f Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 16:59:12 -0500 Subject: [PATCH 54/62] Updated from Brython Server: 1/31/2019 4:59:11 PM --- picture.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/picture.py b/picture.py index a987a97c..fb7250b1 100644 --- a/picture.py +++ b/picture.py @@ -85,6 +85,7 @@ bubble = EllipseAsset(7,7, thinline6, lightblue1) bubble1 = EllipseAsset(5,5, thinline6, lightblue1) bubble2 = EllipseAsset(4,4, thinline6, lightblue1) +bubble3 = EllipseAsset(3,3, thinline6, lightblue1) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) @@ -173,9 +174,14 @@ h.rotation = 3.1 Sprite(eye1, (455,350)) Sprite(eye, (461,355)) -Sprite(bubble, (190,170)) -Sprite(bubble1, (180,150)) -Sprite(bubble2, (195,125)) +Sprite(bubble, (190,162.5)) +Sprite(bubble1, (180,140)) +Sprite(bubble2, (195,120)) +Sprite(bubble3, (180,190)) +Sprite(bubble, (480,330)) +Sprite(bubble1, (470,300)) +Sprite(bubble2, (485,280)) +Sprite(bubble3, (475,260)) # add your code here /\ /\ /\ From e8d25817029c52dae83bd3a12e067e2ac0e29f01 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:05:50 -0500 Subject: [PATCH 55/62] Updated from Brython Server: 1/31/2019 5:05:50 PM --- picture.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/picture.py b/picture.py index fb7250b1..afb04ac2 100644 --- a/picture.py +++ b/picture.py @@ -27,14 +27,15 @@ from ggame import App, Color, LineStyle, Sprite, RectangleAsset, CircleAsset, EllipseAsset, PolygonAsset # add your code here \/ \/ \/ -lightblue = Color(0x7ec0ee,1.0) +lightblue = Color(0x24D0FE,1.0) brown = Color(0x5D3909, 1.0) tan = Color(0xFFE4B5, 1.0) grey = Color(0x8B8989, 1.0) red = Color(0xCD2626, 1.0) black = Color(0x000000, 0.7) black1 = Color(0x000000, 0.7) -green = Color(0x228B22, 1.0) +green = Color(0x1ABE0A, 1.0) +green1 = Color(0x169709, 0.2) orange = Color(0xF5920F, 1.0) darkorange = Color(0xD07702, 1.0) darkorange1 = Color(0xD07702, 0) @@ -51,6 +52,7 @@ thinline4 = LineStyle(1, darkorange) thinline5 = LineStyle(1, darkorange1) thinline6 = LineStyle(1, black2) +thinline7 = LineStyle(1, green1) tank = RectangleAsset(900,600, thinline2, lightblue) pebbles = RectangleAsset(900, 45, thinline2, tan) @@ -68,10 +70,10 @@ windows3 = RectangleAsset(20, 30, thinline1, black) line = PolygonAsset([(40,60), (40,-105), (40,60)],thinline2, black) doorknob = EllipseAsset(8, 8, thinline1, black) -plant = RectangleAsset(10, 250, thinline3, green) -plant1 = RectangleAsset(5, 110, thinline3, green) -leaves = EllipseAsset(8, 20, thinline3, green) -leaves1 = RectangleAsset(2, 30, thinline3, green) +plant = RectangleAsset(10, 250, thinline7, green) +plant1 = RectangleAsset(5, 110, thinline7, green) +leaves = EllipseAsset(8, 20, thinline7, green) +leaves1 = RectangleAsset(2, 30, thinline7, green) fish = EllipseAsset(45, 27, thinline4, orange) tail = EllipseAsset(20,10, thinline4, darkorange) fins = EllipseAsset(15,7, thinline4, darkorange) From 4ae8843277750eecec9e70b02d734d0fdfbf8dab Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:07:18 -0500 Subject: [PATCH 56/62] Updated from Brython Server: 1/31/2019 5:07:17 PM --- picture.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index afb04ac2..7fb9ad4b 100644 --- a/picture.py +++ b/picture.py @@ -34,7 +34,7 @@ red = Color(0xCD2626, 1.0) black = Color(0x000000, 0.7) black1 = Color(0x000000, 0.7) -green = Color(0x1ABE0A, 1.0) +green = Color(0x12B402, 1.0) green1 = Color(0x169709, 0.2) orange = Color(0xF5920F, 1.0) darkorange = Color(0xD07702, 1.0) @@ -178,7 +178,7 @@ Sprite(eye, (461,355)) Sprite(bubble, (190,162.5)) Sprite(bubble1, (180,140)) -Sprite(bubble2, (195,120)) +Sprite(bubble2, (195,122)) Sprite(bubble3, (180,190)) Sprite(bubble, (480,330)) Sprite(bubble1, (470,300)) From 4d7d88361cfbe72f16be1cfcde0203787e37e240 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:08:46 -0500 Subject: [PATCH 57/62] Updated from Brython Server: 1/31/2019 5:08:45 PM --- picture.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picture.py b/picture.py index 7fb9ad4b..eb96404e 100644 --- a/picture.py +++ b/picture.py @@ -175,7 +175,7 @@ h = Sprite(tail3, (369.5,378.5)) h.rotation = 3.1 Sprite(eye1, (455,350)) -Sprite(eye, (461,355)) +Sprite(eye, (461,354)) Sprite(bubble, (190,162.5)) Sprite(bubble1, (180,140)) Sprite(bubble2, (195,122)) From 4bbd97c952f25e620fe70f4e7d4ec0000f844d84 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:09:12 -0500 Subject: [PATCH 58/62] Updated from Brython Server: 1/31/2019 5:09:12 PM From 168f5c12dc7d1e8f99518e50c187ed4f8f3b4125 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:14:10 -0500 Subject: [PATCH 59/62] Updated from Brython Server: 1/31/2019 5:14:10 PM --- picture.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/picture.py b/picture.py index eb96404e..44ed1fc7 100644 --- a/picture.py +++ b/picture.py @@ -1,7 +1,7 @@ """ picture.py Author: Rain -Credit: +Credit: https://htmlcolorcodes.com/, https://www.color-hex.com/color-names.html Assignment: @@ -28,22 +28,22 @@ # add your code here \/ \/ \/ lightblue = Color(0x24D0FE,1.0) +lightblue1 = Color(0xAAF3FF, 1.0) +blue = Color(0x0631F1, 1.0) brown = Color(0x5D3909, 1.0) tan = Color(0xFFE4B5, 1.0) grey = Color(0x8B8989, 1.0) red = Color(0xCD2626, 1.0) black = Color(0x000000, 0.7) black1 = Color(0x000000, 0.7) +black2 = Color(0x000000, 0.3) green = Color(0x12B402, 1.0) green1 = Color(0x169709, 0.2) orange = Color(0xF5920F, 1.0) darkorange = Color(0xD07702, 1.0) darkorange1 = Color(0xD07702, 0) -blue = Color(0x0631F1, 1.0) white = Color(0xFFFFFF, 1.0) yellow = Color(0xFCE604, 1.0) -lightblue1 = Color(0xAAF3FF, 1.0) -black2 = Color(0x000000, 0.3) thinline = LineStyle(1, grey) thinline1 = LineStyle(1, brown) @@ -80,14 +80,14 @@ fish2 = RectangleAsset(80, 80, thinline5, blue) tail2 = PolygonAsset([(40,40), (70,20), (70,60)],thinline5, blue) line1 = PolygonAsset([(40,60), (40,12), (40,60)],thinline2, black) -eye = EllipseAsset(3,3, thinline5, black) -eye1 = EllipseAsset(7,7, thinline5, white) +eye = CircleAsset(3, thinline5, black) +eye1 = CircleAsset(7, thinline5, white) stripe = PolygonAsset([(50,50), (55.5,90), (60,40)],thinline5, yellow) tail3 = PolygonAsset([(40,40), (60,30), (60,50)],thinline5, yellow) -bubble = EllipseAsset(7,7, thinline6, lightblue1) -bubble1 = EllipseAsset(5,5, thinline6, lightblue1) -bubble2 = EllipseAsset(4,4, thinline6, lightblue1) -bubble3 = EllipseAsset(3,3, thinline6, lightblue1) +bubble = CircleAsset(7, thinline6, lightblue1) +bubble1 = CircleAsset(5, thinline6, lightblue1) +bubble2 = CircleAsset(4, thinline6, lightblue1) +bubble3 = CircleAsset(3, thinline6, lightblue1) Sprite(tank, (100,110)) Sprite(pebbles, (100,665)) From c988ef1ea912e988bc170301f74c2dffe56ebe38 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:14:27 -0500 Subject: [PATCH 60/62] Updated from Brython Server: 1/31/2019 5:14:27 PM From 1c8904e22258f979264dc26cfdb97a5541ba5141 Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 18:30:53 -0500 Subject: [PATCH 61/62] Updated from Brython Server: 1/31/2019 6:30:52 PM From 6a6d63f6bd457463ac83cdc136ded56fe480ca4b Mon Sep 17 00:00:00 2001 From: raLiinu30 <46948627+raLiinu30@users.noreply.github.com> Date: Thu, 31 Jan 2019 18:31:56 -0500 Subject: [PATCH 62/62] Updated from Brython Server: 1/31/2019 6:31:56 PM