Skip to content

Commit dd185f6

Browse files
PlatanePlatane
committed
🚀
1 parent 6d0ae64 commit dd185f6

File tree

3 files changed

+81
-26
lines changed

3 files changed

+81
-26
lines changed

‎game/src/1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
39,7,5,254,252,167,242,255,187,131,187,225,41,233,128,204,154,149,60,130,158,37,188,10,223,206,234,68,84,172,201,187,211,37,81,4,231,252,247,4,244,39,43,39,238,71,179,212,201,161,110,92,197,232,252,53,90,106,201,163,154,67,61,178,176,95,33,116,156,163,186,91,33,132,213,173,0,168,42,200,204,145,169,86,249,8,4,0,104,138,4,96,173,36,244,171,3,32,211,24,8,193,90,241,34,94,72,170,192,82,30,234,239,179,134,118,145,89,162,210,68,240,25,225,26,91,49,198,5,49,136,141,122,8,98
1+
12,225,80,83,254,119,48,153,41,129,243,43,233,156,225,104,118,183,17,136,255,63,203,229,234,223,128,164,11,169,250,210,82,125,111,150,106,195,100,144,188,226,14,32,191,83,214,104,35,114,14,100,197,179,222,121,168,115,44,134,220,10,155,84,2,106,148,200,128,137,196,98,121,56,137,224,96,35,98,70,117,25,8,217,240,90,83,77,231,16,106,105,137,1,0,129,193,17,56,79,1,144,182,57,128,112,79,48,157,69,84,31,102,147,215,31,48,192,117,2,198,96,28,139,139,78,58,144,104,96,0,40,144,69,0

‎game/src/2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12,225,80,83,254,119,48,153,41,129,243,43,233,156,225,104,118,183,17,136,255,63,203,229,234,223,128,164,11,169,250,210,82,125,111,150,106,195,100,144,188,226,14,32,191,83,214,104,35,114,14,100,197,179,222,121,168,115,44,134,220,10,155,84,2,106,148,200,128,137,196,98,121,56,137,224,96,35,98,70,117,25,8,217,240,90,83,77,231,16,106,105,137,1,0,129,193,17,56,79,1,144,182,57,128,112,79,48,157,69,84,31,102,147,215,31,48,192,117,2,198,96,28,139,139,78,58,144,104,96,0,40,144,69,0
1+
228,198,36,14,255,103,240,255,187,131,77,1,210,216,146,7,86,215,80,171,33,43,226,250,52,225,85,192,210,102,62,78,242,156,9,150,86,170,23,177,164,85,228,154,200,84,178,240,139,146,78,79,9,64,102,65,4,58,158,4,205,221,157,46,249,139,40,164,93,99,22,139,40,0,248,135,235,130,122,8,98,26,158,172,193,126,133,208,56,143,128,254,129,204,248,67,100,1,175,76,100,192,89,41,192,24,2,53,60,72,168,33,44,17,168,173,24,227,62,226,4,32,178,34,182,207,16,214,220,252,25,163,1,25,34

‎game/src/a.js‎

Lines changed: 79 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -132,52 +132,105 @@ const texts = [
132132
['Find "Starry nigth"'],
133133
['by Van Gogh'],
134134
['in the room to your'],
135+
['left'],
136+
],
137+
[
138+
['Great!'],
139+
[],
140+
['Find "Scream"'],
141+
['by Munch'],
142+
['in the room to your'],
135143
['right'],
136144
],
145+
[
146+
['OK!'],
147+
[],
148+
['Next:'],
149+
['"The Great Wave"'],
150+
['by Hokusai'],
151+
['in this room'],
152+
],
153+
[
154+
['Nice!'],
155+
[],
156+
['Next:'],
157+
['"La liberté"'],
158+
['by Delacroix'],
159+
['in the next room'],
160+
],
161+
[['Nice!'], [], ["it's 12h30"], ['no more time'], ["let's say you win"]],
137162
]
138163

139164
const worldMap =
140-
'# \n' +
141-
' # \n' +
142-
' ################### \n' +
143-
' # \n' +
144-
' ################# # \n' +
145-
' # # # \n' +
146-
' # # # \n' +
147-
' ################# #### \n' +
148-
' ## # # # \n' +
149-
' ## r l # \n' +
150-
' # # # \n' +
151-
' ########### ####### # # # \n' +
152-
' #### #### # l l 2 \n' +
165+
' \n' +
166+
' ########################### \n' +
167+
' # ########################### \n' +
168+
' # # ########## \n' +
169+
' # ##b# ##5# ##b# # # # \n' +
170+
' #6#7#8## r r 3 ##### # \n' +
171+
' # \n' +
172+
' # # \n' +
173+
' # 4 r r ########## \n' +
174+
' # ##t# ##t# ##t# # # \n' +
175+
' # # # \n' +
176+
' # ###################### ### \n' +
177+
' #################### ###### # # \n' +
178+
' # ################### #### \n' +
179+
' # ## # # # \n' +
180+
' # # # ## r l 2 \n' +
181+
' # # # # \n' +
182+
' # ########### ####### # # # \n' +
183+
' #### #### # l l # \n' +
153184
' # # # # # ###### \n' +
154185
' # # # # # # \n' +
155-
' r t 1 l # l l #### # \n' +
186+
' r l # l l #### # \n' +
156187
' # #### # # # # # \n' +
157-
' # # # # # # \n' +
188+
' # 1 # # # # # \n' +
158189
' # #### r l # # # \n' +
159-
' r b b l # # # # # # \n' +
190+
' r l # # # # # # \n' +
160191
' # # ################ ####### # \n' +
161-
' # # # # \n' +
192+
' # # # # \n' +
162193
' #### ###### ########### \n' +
163-
' # # \n' +
194+
' # # \n' +
164195
' # # '
165196

166197
const getCell = x => {
167198
switch (x) {
199+
// mona lisa
168200
case '1':
169201
return [null, 1, null, null]
202+
203+
/// starry night
170204
case '2':
171205
return [null, null, 2, null]
172206

207+
// scream
208+
case '3':
209+
return [3, null, null, null]
210+
211+
// the great wave
212+
case '4':
213+
return [4, null, null, null]
214+
215+
// delacroix
216+
case '5':
217+
return [null, 5, null, null]
218+
219+
case '6':
220+
return [null, 6, null, null]
221+
case '7':
222+
return [null, 7, null, null]
223+
case '8':
224+
return [null, 8, null, null]
225+
173226
case 'l':
174227
return [null, null, Math.floor(Math.random() * 10) + 20, null]
175228
case 't':
176-
return [null, Math.floor(Math.random() * 10) + 20, null, null]
229+
return [null, null, null, Math.floor(Math.random() * 10) + 20]
177230
case 'r':
178231
return [Math.floor(Math.random() * 10) + 20, null, null, null]
179232
case 'b':
180-
return [null, null, null, Math.floor(Math.random() * 10) + 20]
233+
return [null, Math.floor(Math.random() * 10) + 20, null, null]
181234

182235
default:
183236
return [null, null, null, null]
@@ -190,7 +243,7 @@ const world = {
190243
.map(line => line.split('').map(c => (c === ' ' ? 0 : getCell(c)))),
191244

192245
tim: {
193-
position: { x: 24.5, y: 31.5 },
246+
position: { x: 30.5, y: 31.5 },
194247
direction: { x: 0, y: 1 },
195248
},
196249

@@ -643,7 +696,7 @@ const generateMazeObject = world => {
643696

644697
const object = new THREE.Object3D()
645698

646-
object.position.set(24, 1.2, 30)
699+
object.position.set(30, 1.2, 30)
647700

648701
object.rotation.y = 0
649702

@@ -697,9 +750,11 @@ AFRAME.registerComponent('museum', {
697750
container.add(generateMazeObject(world.worldGrid))
698751

699752
Promise.all(
700-
'12'
753+
'12345678'
701754
.split('')
702-
.map((x, i) => readPainting(x).then(p => (paintings[i] = p)))
755+
.map((x, i) =>
756+
readPainting(x).then(p => (paintings[i + 1] = p))
757+
)
703758
).then(() => {
704759
this.p = generatePaintings(world.worldGrid)
705760
container.add(this.p.object)

0 commit comments

Comments
 (0)