two player snooker

tailuge · Oct 25, 2023 · a55fe32 · a55fe32
1 parent 78e5388
commit a55fe32
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/dist/2p.html b/dist/2p.html
@@ -17,8 +17,8 @@
         src="index.html"
         title="P1"
         id="P1"
-        width="500"
-        height="396"
+        width="620"
+        height="450"
         style="float: left"
       ></iframe>
     </div>
@@ -27,8 +27,8 @@
         src="index.html"
         title="P2"
         id="P2"
-        width="500"
-        height="396"
+        width="620"
+        height="450"
         style="float: right"
       ></iframe>
     </div>
@@ -38,11 +38,9 @@
     const urlParams = new URLSearchParams(window.location.search)
     const websocketserver = urlParams.get("websocketserver")
     const ruletype = urlParams.get("ruletype")
-    document.getElementById(
-      "P1"
-    ).src = `index.html?ruletype=${ruletype}&name=P1&clientId=p1id&websocketserver=${websocketserver}`
-    document.getElementById(
-      "P2"
-    ).src = `index.html?ruletype=${ruletype}&name=P2&clientId=p2id&websocketserver=${websocketserver}`
+    const unique = Math.floor(Math.random() * 0xffff).toString(16)
+    const url = `index.html?ruletype=${ruletype}&websocketserver=${websocketserver}&tableId=${unique}`
+    document.getElementById("P1").src = `${url}&clientId=p1id&name=P1`
+    document.getElementById("P2").src = `${url}&clientId=p2id&name=P2`
   </script>
 </html>
diff --git a/dist/diagram.js b/dist/diagram.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/multi.html b/dist/multi.html
@@ -39,17 +39,17 @@ <h1>tailuge/billiards multiplayer test page</h1>
         for quick testing
       </li>
       <li>
-        <a class="addwss" href="./2p.html?ruletype=nineball"
+        <a class="addwss" href="./2p.html?ruletype=threecushion"
           >two players three cushion in single window</a
         >
       </li>
       <li>
-        <a class="addwss" href="./2p.html?ruletype=nineball"
+        <a class="addwss" href="./2p.html?ruletype=fourteenone"
           >two players 14-1 in single window</a
         >
       </li>
       <li>
-        <a class="addwss" href="./2p.html?ruletype=nineball"
+        <a class="addwss" href="./2p.html?ruletype=snooker"
           >two players snooker in single window</a
         >
       </li>

diff --git a/src/controller/placeball.ts b/src/controller/placeball.ts
@@ -24,9 +24,7 @@ export class PlaceBall extends ControllerBase {
 
   override onFirst() {
     const cueball = this.container.table.cueball
-    if (!cueball.onTable()) {
-      cueball.pos.copy(new Vector3((-R * 11) / 0.5, 0, 0))
-    }
+    cueball.pos.copy(new Vector3((-R * 11) / 0.5, 0, 0))
     cueball.setStationary()
     cueball.updateMesh(0)
     this.container.table.cue.placeBallMode()

diff --git a/src/controller/watchshot.ts b/src/controller/watchshot.ts
@@ -21,6 +21,7 @@ export class WatchShot extends ControllerBase {
   override handleWatch(event) {
     if ("rerack" in event.json) {
       this.container.table.updateFromSerialised(event.json)
+      return this
     }
     return new WatchAim(this.container)
   }