#72: The packet ship, the lifeline mortar and the gull-kite
Eric chose option B on #72. The drop is now the GDD's launch: - A packet ship sails a seeded straight line past the island, offshore, as close in as it can while keeping 45 m of open water from any land (eight-way probes; up to 32 headings, then the four world sides). - Jump fires the lifeline mortar along the look heading. How high the player aims sets the charge (-10 to 45 degrees: 16 to 110 m/s over the ground; every shot climbs at 75 m/s). The climb can't be steered and the kite can't open until the arc tops out. Riders still aboard at the end are fired towards the middle of the island. - Drop.reach() mirrors the fall for both ways down (kite at the top, or a fall with the kite opening by itself); bots, the soak and autoplay clients and the tutorial pilot aim with Drop.aim_charge(). - Bots fire at their landing spot once abeam of it, when in easy reach at their own staggered moment, or just before the route ends, and open the kite early only when the spot is beyond the rest of a fall. - Art: VesselModels.ship() (two-masted packet, tanned square sails, a salt-white boot-top, a bowsprit and the mortar on its bed, mirrored to face the island), the figure's gull-kite (figure.py), and a lifeline cord from the muzzle to each player still climbing. - Renamed barge to ship and wing-sail to gull-kite throughout code, tests, captures, docs and the tutorial text. make match now defaults to seed 2, where the scripted player still harvests and builds. Closes #72 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+2
-2
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Server: runs the headless server with 24 bots, unthrottled, for BENCH_TICKS ticks on
|
||||
# each of BENCH_SEEDS seeds, and reads its p50/p99/max tick time.
|
||||
# Client: renders the moments of the match `make match` saved (whole island, barge,
|
||||
# Client: renders the moments of the match `make match` saved (whole island, ship,
|
||||
# landed, a build, the final players) and a crowded pine forest in the capture
|
||||
# container, and reads each frame's draw calls, primitives, objects and memory.
|
||||
#
|
||||
@@ -48,7 +48,7 @@ if [[ "$client" == "1" ]]; then
|
||||
echo "bench: no saved match yet; playing one (make match)" >&2
|
||||
tools/match.sh >/dev/null || { echo "bench FAIL: make match failed"; exit 1; }
|
||||
fi
|
||||
for stage in match_lobby match_barge match_landed match_built match_final props_forest; do
|
||||
for stage in match_lobby match_ship match_landed match_built match_final props_forest; do
|
||||
echo "bench: client, $stage" >&2
|
||||
if ! report="$(tools/capture.sh "$stage" "captures/bench_$stage.png" 2>/dev/null)"; then
|
||||
echo "bench FAIL: the $stage capture failed"
|
||||
|
||||
+2
-2
@@ -4,12 +4,12 @@
|
||||
# checks the replay ends in the same state. Prints one JSON line per event and the
|
||||
# verdict. See tools/match.gd.
|
||||
#
|
||||
# tools/match.sh seed 29, where the scripted player also builds
|
||||
# tools/match.sh seed 2, where the scripted player also builds
|
||||
# MATCH_SEED=7 tools/match.sh
|
||||
set -uo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")/.."
|
||||
|
||||
seed="${MATCH_SEED:-29}"
|
||||
seed="${MATCH_SEED:-2}"
|
||||
[[ "$seed" =~ ^[0-9]+$ ]] || { echo "match FAIL: bad MATCH_SEED '$seed'"; exit 2; }
|
||||
raw="$(timeout --signal=KILL 900 nice -n 15 tools/godot.sh --script res://tools/match.gd -- --seed="$seed" 2>&1)"
|
||||
code=$?
|
||||
|
||||
@@ -10,11 +10,11 @@ if [[ ! -f build/match/match.tclog ]]; then
|
||||
exit 1
|
||||
fi
|
||||
status=0
|
||||
for stage in lobby barge glide landed built final tide results; do
|
||||
for stage in lobby ship launch glide landed built final tide results; do
|
||||
if ! tools/capture.sh "match_$stage" "captures/match_$stage.png"; then
|
||||
echo "match-captures FAIL: stage $stage"
|
||||
status=1
|
||||
fi
|
||||
done
|
||||
[[ "$status" -eq 0 ]] && echo "match-captures: ok (8 stages in captures/match_*.png)"
|
||||
[[ "$status" -eq 0 ]] && echo "match-captures: ok (9 stages in captures/match_*.png)"
|
||||
exit "$status"
|
||||
|
||||
+63
-22
@@ -3,7 +3,7 @@
|
||||
blender --background --factory-startup --python tools/models/figure.py
|
||||
|
||||
A low-poly islander in an oilskin coat and a sou'wester, with sea boots, a rolled
|
||||
bedding bundle on the back and a canvas wing-sail for the glide. Writes:
|
||||
bedding bundle on the back and a gull-kite for the glide. Writes:
|
||||
|
||||
assets/models/figure/<part>.obj one model per moving part, with <part>.mtl
|
||||
assets/models/figure/figure.json the joints, which part hangs from which, and
|
||||
@@ -47,7 +47,7 @@ JOINTS = {
|
||||
"hip_l": (0.11, 0.90, 0.0),
|
||||
"knee_r": (-0.11, 0.49, 0.0),
|
||||
"knee_l": (0.11, 0.49, 0.0),
|
||||
"sail": (0.0, 1.46, -0.2),
|
||||
"kite": (0.0, 1.46, -0.2),
|
||||
}
|
||||
# Part -> (the joint it turns about, the joint it hangs from or None for the root).
|
||||
PARTS = {
|
||||
@@ -62,7 +62,7 @@ PARTS = {
|
||||
"thigh_l": ("hip_l", "hips"),
|
||||
"shin_r": ("knee_r", "hip_r"),
|
||||
"shin_l": ("knee_l", "hip_l"),
|
||||
"sail": ("sail", None),
|
||||
"kite": ("kite", None),
|
||||
}
|
||||
# Where the right hand closes on a grip, and the left on a support, in Godot axes.
|
||||
HAND_R = (-0.24, 0.86, 0.03)
|
||||
@@ -165,26 +165,67 @@ def shin(side):
|
||||
items.box((0.13, 0.25, 0.08), b(x, 0.04, 0.05), "TAR_WEATHERED", bevel=0.02)
|
||||
|
||||
|
||||
def sail():
|
||||
# A canvas wing on two spars, swept back and bowed up at the tips, hung from a
|
||||
# yoke over the shoulders.
|
||||
def kite():
|
||||
# A gull-kite: a gull's wings in sailcloth on spars, the inner half of each wing
|
||||
# raised and the outer half drooping, as a gull holds them on the wind, with tarred
|
||||
# tips, an ochre leading edge and a short fanned tail, hung from a yoke over the
|
||||
# shoulders.
|
||||
base = 2.06
|
||||
for side in (-1.0, 1.0):
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(side * 0.66, 2.06, -0.08))
|
||||
# Inner wing: from the body out to the bend, raised 20 degrees.
|
||||
inner_up = math.radians(20)
|
||||
inner_len = 0.82
|
||||
ix = side * (0.06 + inner_len * 0.5 * math.cos(inner_up))
|
||||
iy = base + inner_len * 0.5 * math.sin(inner_up)
|
||||
bend_x = side * (0.06 + inner_len * math.cos(inner_up))
|
||||
bend_y = base + inner_len * math.sin(inner_up)
|
||||
rot_in = (math.radians(3), side * -inner_up, side * math.radians(6))
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(ix, iy, -0.06))
|
||||
panel = bpy.context.active_object
|
||||
panel.scale = (1.3, 0.85, 0.012)
|
||||
panel.rotation_euler = (math.radians(4), math.radians(side * -9), math.radians(side * 12))
|
||||
items.finish(panel, "CANVAS")
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(side * 0.62, 2.065, -0.1))
|
||||
band = bpy.context.active_object
|
||||
band.scale = (1.2, 0.12, 0.016)
|
||||
band.rotation_euler = (math.radians(4), math.radians(side * -9), math.radians(side * 12))
|
||||
items.finish(band, "OCHRE_RED")
|
||||
items.tube(0.02, 1.36, b(side * 0.66, 2.1, 0.33), "PLANK", axis="X", sides=6,
|
||||
rot_extra=(0.0, math.radians(side * -9), math.radians(side * 12)))
|
||||
# The lines from the wing down to the yoke.
|
||||
items.tube(0.007, 0.62, b(side * 0.3, 1.78, -0.12), "TAR", axis="Z", sides=4,
|
||||
rot_extra=(0.0, math.radians(side * 30), 0.0))
|
||||
items.tube(0.024, 0.95, b(0.0, 2.08, -0.1), "PLANK", axis="Y", sides=6)
|
||||
panel.scale = (inner_len, 0.78, 0.012)
|
||||
panel.rotation_euler = rot_in
|
||||
items.finish(panel, "SALT")
|
||||
# Outer wing: from the bend to the tip, drooping 16 degrees and swept back.
|
||||
outer_down = math.radians(16)
|
||||
outer_len = 0.78
|
||||
ox = bend_x + side * outer_len * 0.5 * math.cos(outer_down)
|
||||
oy = bend_y - outer_len * 0.5 * math.sin(outer_down)
|
||||
rot_out = (math.radians(3), side * outer_down, side * math.radians(16))
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(ox, oy, -0.16))
|
||||
panel = bpy.context.active_object
|
||||
panel.scale = (outer_len, 0.56, 0.012)
|
||||
panel.rotation_euler = rot_out
|
||||
items.finish(panel, "SALT")
|
||||
# Tarred wingtip, like a gull's black primaries.
|
||||
tx = bend_x + side * outer_len * 0.92 * math.cos(outer_down)
|
||||
ty = bend_y - outer_len * 0.92 * math.sin(outer_down)
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(tx, ty + 0.004, -0.24))
|
||||
tip = bpy.context.active_object
|
||||
tip.scale = (0.2, 0.44, 0.016)
|
||||
tip.rotation_euler = rot_out
|
||||
items.finish(tip, "TAR")
|
||||
# Ochre leading edges on both halves.
|
||||
for (cx, cy, z, length, rot) in ((ix, iy, 0.3, inner_len, rot_in), (ox, oy, 0.1, outer_len, rot_out)):
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(cx, cy + 0.006, z))
|
||||
band = bpy.context.active_object
|
||||
band.scale = (length, 0.1, 0.018)
|
||||
band.rotation_euler = rot
|
||||
items.finish(band, "OCHRE_RED")
|
||||
# Spars along each half, and the bridle lines down to the yoke.
|
||||
items.tube(0.02, inner_len, b(ix, iy + 0.02, 0.28), "PLANK", axis="X", sides=6,
|
||||
rot_extra=(0.0, side * -inner_up, side * math.radians(6)))
|
||||
items.tube(0.018, outer_len, b(ox, oy + 0.02, 0.08), "PLANK", axis="X", sides=6,
|
||||
rot_extra=(0.0, side * outer_down, side * math.radians(16)))
|
||||
items.tube(0.007, 0.66, b(side * 0.32, 1.80, -0.12), "TAR", axis="Z", sides=4,
|
||||
rot_extra=(0.0, math.radians(side * 32), 0.0))
|
||||
items.tube(0.007, 0.80, b(side * 0.5, 1.84, -0.12), "TAR", axis="Z", sides=4,
|
||||
rot_extra=(0.0, math.radians(side * 48), 0.0))
|
||||
# The body: a spindle of canvas down the middle, and a fanned tail behind it.
|
||||
items.tube(0.07, 0.9, b(0.0, base + 0.02, -0.08), "CANVAS", axis="Y", sides=8, radius2=0.03)
|
||||
bpy.ops.mesh.primitive_cube_add(size=1.0, location=b(0.0, base, -0.68))
|
||||
tail = bpy.context.active_object
|
||||
tail.scale = (0.42, 0.3, 0.012)
|
||||
items.finish(tail, "SALT")
|
||||
items.box((0.36, 0.05, 0.05), b(0.0, 1.5, -0.2), "PLANK", bevel=0.008)
|
||||
|
||||
|
||||
@@ -200,7 +241,7 @@ BUILDERS = {
|
||||
"thigh_l": lambda: thigh(1.0),
|
||||
"shin_r": lambda: shin(-1.0),
|
||||
"shin_l": lambda: shin(1.0),
|
||||
"sail": sail,
|
||||
"kite": kite,
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ is sampled, recorded, downloaded or taken from a third party. How each kind of a
|
||||
made is described in [assets/PROVENANCE.md](../assets/PROVENANCE.md); the licence is
|
||||
CC BY-SA 4.0 ([LICENSE-ASSETS](../LICENSE-ASSETS)).
|
||||
|
||||
Code-built art (terrain, sea, points of interest, props, build pieces, the barge, sea
|
||||
Code-built art (terrain, sea, points of interest, props, build pieces, the ship, sea
|
||||
chests and effects) isn't a file here: it's drawn by the scripts under `src/client/`.
|
||||
|
||||
This file is written by `tools/godot.sh --script res://tools/provenance.gd`, and
|
||||
|
||||
@@ -39,7 +39,7 @@ func _init() -> void:
|
||||
for problem: String in problems:
|
||||
print("tutorial-check FAIL: %s" % problem)
|
||||
if problems.is_empty():
|
||||
print("tutorial-check: ok (%d seeds played from the barge to the end)" % seeds)
|
||||
print("tutorial-check: ok (%d seeds played from the ship to the end)" % seeds)
|
||||
quit(0 if problems.is_empty() else 1)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user