diff --git a/examples/commandery-rts/main.nut b/examples/commandery-rts/main.nut index bcb31584..03d01516 100644 --- a/examples/commandery-rts/main.nut +++ b/examples/commandery-rts/main.nut @@ -282,8 +282,9 @@ function issueMove(x, y) { group[i].orderId = requireResult(replaced, "replace move order"); local order = group[i].queue.find(group[i].orderId); if (order != null) { - order.getPayload().setNumber("x", group[i].tx); - order.getPayload().setNumber("y", group[i].ty); + local payload = order.getPayload(); + requireResult(payload.setJson("x", group[i].tx.tostring()), "move payload x"); + requireResult(payload.setJson("y", group[i].ty.tostring()), "move payload y"); } } game.message = "已向 "+group.len()+" 个单位下达编队移动命令。"; diff --git a/test/orders.cpp b/test/orders.cpp index fecba255..703e85b2 100644 --- a/test/orders.cpp +++ b/test/orders.cpp @@ -202,9 +202,8 @@ TEST_CASE("orders.script.ownedQueueReplace") { local order = queue.current(); if (order != null && order.getId() == replaced.value && order.getKind() == "move" && order.getState() == "active") { - order.getPayload().setNumber("x", 400.0); - order.getPayload().setNumber("y", 360.0); - if (order.getPayload().has("x") && order.getPayload().has("y")) + local payloadResult = order.getPayload().setJson("x", "400"); + if (payloadResult.ok && order.getPayload().has("x")) result = "replaced"; } )"));