Skip to content

Commit 0e094f9

Browse files
davidsgrogandavidsgrogan
committed
fix indent
1 parent 22ef8b7 commit 0e094f9

1 file changed

Lines changed: 170 additions & 177 deletions

File tree

‎den-ctf.html‎

Lines changed: 170 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
let y2 = 0;
1111
let span = 500;
1212
let flagx = span / 2;
13-
let flag1y = span -30;
13+
let flag1y = span - 30;
1414
let flag2y = 30;
1515
let tag1 = false;
1616
let tag2 = false;
@@ -20,197 +20,190 @@
2020
let player2win = false;
2121

2222
function setup() {
23-
createCanvas(span, span);
24-
x1 = 250;
25-
y1 = span - 100;
26-
x2 = 250;
27-
y2 = 100;
28-
frameRate(60);
23+
createCanvas(span, span);
24+
x1 = 250;
25+
y1 = span - 100;
26+
x2 = 250;
27+
y2 = 100;
28+
frameRate(60);
2929
}
3030

3131
function draw() {
32-
background(220);
33-
//tag physics
34-
{
35-
//Blue Get tagged
36-
if (x1 - x2 < 30 && x1 - x2 > -30) {
37-
if (y1 - y2 < 30 && y1 - y2 > -30) {
38-
if (y1 < span / 2) {
39-
tag1 = true;
40-
} else {
41-
tag1 = false;
42-
}
43-
} else {
44-
tag1 = false;
45-
}
46-
} else {
47-
tag1 = false;
48-
}
49-
//Red Get tagged
50-
if (x1 - x2 < 30 && x1 - x2 > -30) {
51-
if (y1 - y2 < 30 && y1 - y2 > -30) {
52-
if (y2 > span / 2) {
53-
tag2 = true;
54-
} else {
55-
tag2 = false;
56-
}
57-
} else {
58-
tag2 = false;
59-
}
60-
} else {
61-
tag2 = false;
62-
}
63-
//respawn
64-
65-
if (tag2 === true) {
66-
x2 = span / 2;
67-
y2 = span / 5;
68-
}
69-
if (tag1 === true) {
70-
x1 = span / 2;
71-
y1 = span - span / 5;
72-
}
32+
background(220);
33+
//tag physics
34+
{
35+
//Blue Get tagged
36+
if (x1 - x2 < 30 && x1 - x2 > -30) {
37+
if (y1 - y2 < 30 && y1 - y2 > -30) {
38+
if (y1 < span / 2) {
39+
tag1 = true;
40+
} else {
41+
tag1 = false;
7342
}
74-
//flag physics
75-
{
76-
if(tag2){
77-
flag1pickup=false
78-
}
79-
//blue flag taken
80-
if (x2 - flagx < 30 && x2 - flagx > -30) {
81-
if (y2 - flag1y>-30 && y2-flag1y<30){
82-
flag1pickup = true;
83-
84-
}
85-
}
86-
43+
} else {
44+
tag1 = false;
45+
}
46+
} else {
47+
tag1 = false;
48+
}
49+
//Red Get tagged
50+
if (x1 - x2 < 30 && x1 - x2 > -30) {
51+
if (y1 - y2 < 30 && y1 - y2 > -30) {
52+
if (y2 > span / 2) {
53+
tag2 = true;
54+
} else {
55+
tag2 = false;
56+
}
57+
} else {
58+
tag2 = false;
59+
}
60+
} else {
61+
tag2 = false;
62+
}
63+
//respawn
64+
65+
if (tag2 === true) {
66+
x2 = span / 2;
67+
y2 = span / 5;
68+
}
69+
if (tag1 === true) {
70+
x1 = span / 2;
71+
y1 = span - span / 5;
72+
}
73+
}
74+
//flag physics
75+
{
76+
if (tag2) {
77+
flag1pickup = false;
78+
}
79+
//blue flag taken
80+
if (x2 - flagx < 30 && x2 - flagx > -30) {
81+
if (y2 - flag1y > -30 && y2 - flag1y < 30) {
82+
flag1pickup = true;
83+
}
84+
}
85+
86+
if (flag1pickup) {
87+
if (y2 < span / 2) {
88+
player2win = true;
89+
}
90+
}
91+
if (player2win) {
92+
textSize(85);
93+
text("RED WINS!!!", 0, span / 2 + 30);
94+
return;
95+
}
8796

88-
if (flag1pickup) {
89-
if (y2 < span / 2) {
90-
player2win = true
91-
92-
}
93-
}
94-
if(player2win){
95-
textSize(85)
96-
text("RED WINS!!!", 0, span / 2 + 30);
97-
return
98-
}
99-
100-
if(tag1){
101-
flag2pickup=false
102-
}
103-
//blue flag taken
104-
if (x1 - flagx < 30 && x1 - flagx > -30) {
105-
if (y1 - flag2y>-30 && y1-flag2y<30){
106-
flag2pickup = true;
107-
108-
}
109-
}
110-
97+
if (tag1) {
98+
flag2pickup = false;
99+
}
100+
//blue flag taken
101+
if (x1 - flagx < 30 && x1 - flagx > -30) {
102+
if (y1 - flag2y > -30 && y1 - flag2y < 30) {
103+
flag2pickup = true;
104+
}
105+
}
111106

112-
if (flag2pickup) {
113-
if (y1 > span / 2) {
114-
player1win = true
115-
116-
}
117-
}
118-
if(player1win){
119-
fill(0,0,255)
120-
textSize(80)
121-
text("BLUE WINS!!!", 0, span / 2 + 30);
122-
return
123-
}
124-
}
125-
//Bush pyhsics
126-
127-
square(flagx - 15, flag2y - 15, 30);
128-
line(0, span / 2, span, span / 2);
107+
if (flag2pickup) {
108+
if (y1 > span / 2) {
109+
player1win = true;
110+
}
111+
}
112+
if (player1win) {
113+
fill(0, 0, 255);
114+
textSize(80);
115+
text("BLUE WINS!!!", 0, span / 2 + 30);
116+
return;
117+
}
118+
}
119+
//Bush pyhsics
129120

121+
square(flagx - 15, flag2y - 15, 30);
122+
line(0, span / 2, span, span / 2);
130123

131-
fill(0, 0, 255);
132-
square(flagx - 15, flag1y -15, 30);
124+
fill(0, 0, 255);
125+
square(flagx - 15, flag1y - 15, 30);
133126

134-
//Player 1
127+
//Player 1
128+
{
129+
fill(0, 0, 255);
130+
//Movement
135131
{
136-
fill(0, 0, 255);
137-
//Movement
138-
{
139-
if (keyIsDown(65) === true) {
140-
x1 -= 5;
141-
}
142-
if (keyIsDown(68) === true) {
143-
x1 += 5;
144-
}
145-
if (keyIsDown(87) === true) {
146-
y1 -= 5;
147-
}
148-
if (keyIsDown(83) === true) {
149-
y1 += 5;
150-
}
151-
}
152-
translate(x1, y1);
132+
if (keyIsDown(65) === true) {
133+
x1 -= 5;
134+
}
135+
if (keyIsDown(68) === true) {
136+
x1 += 5;
137+
}
138+
if (keyIsDown(87) === true) {
139+
y1 -= 5;
140+
}
141+
if (keyIsDown(83) === true) {
142+
y1 += 5;
143+
}
144+
}
145+
translate(x1, y1);
153146

154-
//Borders
155-
{
156-
if (x1 > span) {
157-
x1 = span;
158-
}
159-
if (x1 < span - span) {
160-
x1 = span - span;
161-
}
162-
if (y1 > span) {
163-
y1 = span;
164-
}
165-
if (y1 < span - span) {
166-
y1 = span - span;
167-
}
168-
}
169-
}
147+
//Borders
148+
{
149+
if (x1 > span) {
150+
x1 = span;
151+
}
152+
if (x1 < span - span) {
153+
x1 = span - span;
154+
}
155+
if (y1 > span) {
156+
y1 = span;
157+
}
158+
if (y1 < span - span) {
159+
y1 = span - span;
160+
}
161+
}
162+
}
170163

171-
circle(0, 0, 30);
172-
rect(-5, -30, 10, 15);
173-
translate(-x1, -y1);
164+
circle(0, 0, 30);
165+
rect(-5, -30, 10, 15);
166+
translate(-x1, -y1);
174167

175-
//Player 2
168+
//Player 2
169+
{
170+
fill(255, 0, 0);
171+
translate(x2, y2);
172+
rotate(78.548);
173+
//Movement
176174
{
177-
fill(255, 0, 0);
178-
translate(x2, y2);
179-
rotate(78.548);
180-
//Movement
181-
{
182-
if (keyIsDown(74) === true) {
183-
x2 -= 5;
184-
}
185-
if (keyIsDown(76) === true) {
186-
x2 += 5;
187-
}
188-
if (keyIsDown(73) === true) {
189-
y2 -= 5;
190-
}
191-
if (keyIsDown(75) === true) {
192-
y2 += 5;
193-
}
194-
}
175+
if (keyIsDown(74) === true) {
176+
x2 -= 5;
177+
}
178+
if (keyIsDown(76) === true) {
179+
x2 += 5;
180+
}
181+
if (keyIsDown(73) === true) {
182+
y2 -= 5;
183+
}
184+
if (keyIsDown(75) === true) {
185+
y2 += 5;
186+
}
187+
}
195188

196-
//Borders
197-
{
198-
if (x2 > span) {
199-
x2 = span;
200-
}
201-
if (x2 < span - span) {
202-
x2 = span - span;
203-
}
204-
if (y2 > span) {
205-
y2 = span;
206-
}
207-
if (y2 < span - span) {
208-
y2 = span - span;
209-
}
210-
}
211-
}
189+
//Borders
190+
{
191+
if (x2 > span) {
192+
x2 = span;
193+
}
194+
if (x2 < span - span) {
195+
x2 = span - span;
196+
}
197+
if (y2 > span) {
198+
y2 = span;
199+
}
200+
if (y2 < span - span) {
201+
y2 = span - span;
202+
}
203+
}
204+
}
212205

213-
circle(0, 0, 30);
214-
rect(-5, -30, 10, 15);
206+
circle(0, 0, 30);
207+
rect(-5, -30, 10, 15);
215208
}
216209
</script>

0 commit comments

Comments
 (0)