update AI engine

Author: kigiri

ai-loader.js

@@ -4,22 +4,23 @@ const getShaUrl = login =>
 const getAIUrl = (login, sha, ai) =>
   `https://rawgit.com/${login}/tron/${sha}/ai/${ai || login}.js`
 
+const toBlob = r => r.blob()
+const toUrlObject = b => URL.createObjectURL(b, { "type" : "text/javascript" })
+const fetchBlob = url => fetch(url).then(toBlob).then(toUrlObject)
 const getUrl = async (login, sha) => {
-  if (!location.hostname.endsWith('.github.io')) {
-    return `${location.origin}/ai/${login}.js`
-  }
+  if (!location.hostname.endsWith('.github.io')) return `/ai/${login}.js`
 
-  if (sha) return getAIUrl(login, sha)
+  if (sha) return fetchBlob(getAIUrl(login, sha))
 
   const res = await fetch(getShaUrl(login))
-  if (res.ok) return getAIUrl(login, (await res.json()).sha)
+  if (res.ok) return fetchBlob(getAIUrl(login, (await res.json()).sha))
 
   sha = (await (await fetch(getShaUrl('nan-academy'))).json()).sha
-  return getAIUrl('nan-academy', sha, login)
+  return fetchBlob(getAIUrl('nan-academy', sha, login))
 }
 
 export default async ({ name, id, sha, seed }) => {
-  const w = new Worker(await getUrl(name, sha), { type: 'module' })
+  const w = new Worker(await getUrl(name, sha), { type: 'module', name })
 
   await new Promise((s, f) => {
     w.onmessage = e => e.data === 'loaded' ? s() : f(Error(e.data))

ai/random.js

@@ -1,4 +1,7 @@
 const SIZE = 100
+const MAP = new Int8Array(SIZE * SIZE) // L'etat de la carte
+const isFree = ({ x, y }) => MAP[y * SIZE + x] === 0 // 0 = case pleine
+const isOccupied = ({ x, y }) => MAP[y * SIZE + x] === 1 // 1 = case pleine
 
 // `inBounds` regarde si notre coordonée (n) n'est pas hors de notre carte
 const inBounds = n => n < SIZE && n >= 0
@@ -56,10 +59,7 @@ const update = state => {
 addEventListener('message', self.init = initEvent => {
   const { seed, id } = JSON.parse(initEvent.data)
   const isOwnPlayer = p => p.name === id
-  const MAP = new Int8Array(SIZE * SIZE)
-  const addToMap = ({ x, y }) => MAP[x * SIZE + y] = 1
-  const isFree = ({ x, y }) => MAP[x * SIZE + y] === 0
-  const isOccupied = ({ x, y }) => MAP[x * SIZE + y] === 1
+  const addToMap = ({ x, y }) => MAP[y * SIZE + x] = 1
 
   let _seed = seed // On utilise une seed pour pouvoir replay les games
   const _m = 0x80000000
@@ -68,7 +68,8 @@ addEventListener('message', self.init = initEvent => {
   addEventListener('message', ({ data }) => {
     const players = JSON.parse(data)
     const player = players.find(isOwnPlayer)
-    players.forEach(addToMap)
+    players.forEach(addToMap) // J'ajoute toutes les nouvelles positions
+    // des joueurs dans notre état de la carte `MAP`
 
     postMessage(JSON.stringify(update({ isFree, isOccupied, players, player })))
   })

app.js

@@ -59,6 +59,22 @@ const isStuck = ({ x, y }) =>
 const computePlayer = ({ x, y, name, coords, score, cardinal, direction }) =>
   ({ x, y, name, coords, score, cardinal, direction })
 
+const calculateCoords = player => {
+  const { x, y } = player
+  const { cardinal, direction } = player.coords
+    .find(coord => coord.x === x && coord.y === y)
+
+  player.coords = [
+    { x, y: y - 1, cardinal: 0, direction: (4 - cardinal) % 4 },
+    { x: x + 1, y, cardinal: 1, direction: (5 - cardinal) % 4 },
+    { x, y: y + 1, cardinal: 2, direction: (6 - cardinal) % 4 },
+    { x: x - 1, y, cardinal: 3, direction: (7 - cardinal) % 4 },
+  ]
+
+  player.cardinal = cardinal
+  player.direction = direction
+}
+
 const update = async forced => {
   await update.lock
   clearTimeout(update.timeout)
@@ -129,22 +145,7 @@ const update = async forced => {
 
   playersLeft
     .filter(isAlive)
-    .forEach(player => {
-      console.log(player.name, 'is not stuck at', player.x, player.y)
-      const { x, y } = player
-      const { cardinal, direction } = player.coords
-        .find(coord => coord.x === x && coord.y === y)
-
-      player.coords = [
-        { x, y: y - 1, cardinal: 0, direction: (4 - cardinal) % 4 },
-        { x: x + 1, y, cardinal: 1, direction: (5 - cardinal) % 4 },
-        { x, y: y + 1, cardinal: 2, direction: (6 - cardinal) % 4 },
-        { x: x - 1, y, cardinal: 3, direction: (7 - cardinal) % 4 },
-      ]
-
-      player.cardinal = cardinal
-      player.direction = direction
-    })
+    .forEach(calculateCoords)
 
   graphic.update(players)
   const diff = performance.now() - startTime
@@ -169,7 +170,7 @@ state.users.forEach(addPlayer)
 Promise.all(players.map(p => p.load)).then(() => {
   Math.random = rseed.float
 
-  shuffle(players.sort((a, b) => a.name - b.name))
+  players.sort((a, b) => a.name - b.name)
 
   state.map = Array(SIZE * SIZE).fill(emptyTile)
 
@@ -189,15 +190,19 @@ Promise.all(players.map(p => p.load)).then(() => {
   const max1 = max(1)
   const max2PI = max(Math.PI * 2)
   const angle = (Math.PI * 2) / players.length
-  const rate = (100 / players.length / 100)
+  const rate = (SIZE / players.length / SIZE)
   const shift = angle * rseed.float()
   const h = SIZE / 2
   const m = h * 0.8
 
   players.forEach((player, i) => {
-    player.color = hslToRgb(max1(i * rate + 0.25), 1, 0.4)
     player.cardinal = 0
     player.direction = 0
+    player.color = hslToRgb(max1(i * rate + 0.25), 1, 0.5)
+  })
+
+  // Shuffle players before calculating coords
+  shuffle(players).forEach((player, i) => {
     const x = player.x = Math.round(max2PI(Math.cos(angle * i + shift)) * m + h)
     const y = player.y = Math.round(max2PI(Math.sin(angle * i + shift)) * m + h)
     player.coords = [

state.js

@@ -3,6 +3,8 @@ import map from './izi/map.js'
 import rseed from './rseed.js'
 import qs from './izi/query-string.js'
 
+const rnd = Math.random
+
 const setRoute = obj => {
   const newQuery = '?'+ Object.keys(obj)
     .sort()
@@ -54,7 +56,7 @@ export default {
   incSpeed,
   decSpeed,
   reset: () => setRoute({
-    seed: Math.floor(Math.random() * 0x80000000),
+    seed: Math.floor(rnd() * 0x80000000),
     users: urlParams.users.sort(),
   }),
   reload: () => location.reload(),