#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:
@@ -139,7 +139,7 @@ func test_drawing_between_ticks_goes_from_the_last_tick_to_this_one() -> void:
|
||||
assert_eq(prediction.view_position(0.5), before.lerp(after, 0.5))
|
||||
|
||||
|
||||
func test_the_barge_ride_and_the_leap_are_predicted_from_the_same_route() -> void:
|
||||
func test_the_ship_ride_and_the_leap_are_predicted_from_the_same_route() -> void:
|
||||
sim = Simulation.new(21)
|
||||
sim.start_drop()
|
||||
server = sim.entities.find(sim.add_player())
|
||||
|
||||
@@ -2,7 +2,7 @@ extends TestCase
|
||||
|
||||
## Issue N3's numbers: two people play the start of a real match on a real island,
|
||||
## each through a link with 100 ms of latency each way, 20 ms of jitter and 2% loss.
|
||||
## They ride the barge, leap, glide down and then walk, sprint, strafe, jump and crouch
|
||||
## They ride the ship, leap, glide down and then walk, sprint, strafe, jump and crouch
|
||||
## about the middle of the island. Measures how far the server ever had to correct
|
||||
## each one's own predicted movement, and how evenly each is drawn on the other's
|
||||
## screen, against where the server really had them.
|
||||
@@ -96,13 +96,8 @@ func _play(latency_ms: float, jitter_ms: float, loss: float) -> Array[Dictionary
|
||||
var flow: Match = loop.match_flow
|
||||
assert_eq(flow.phase, Match.DROP)
|
||||
var sim: Simulation = loop.sim
|
||||
# Leap once the barge is over land.
|
||||
leap_tick = sim.drop.duration_ticks / 2
|
||||
for tick: int in range(30, sim.drop.duration_ticks):
|
||||
var under: Vector3 = sim.drop.barge_position(tick)
|
||||
if sim.ground.terrain_height(under.x, under.z) > Tuning.ISLAND_BEACH_TOP + 2.0:
|
||||
leap_tick = tick
|
||||
break
|
||||
# Fire the mortar a little way into the voyage.
|
||||
leap_tick = mini(Tuning.TICK_RATE_HZ * 4, sim.drop.duration_ticks / 2)
|
||||
# Both clients generate the island once between them: it's the same island.
|
||||
var mirror: Simulation = Simulation.new(flow.current_seed())
|
||||
clients.clear()
|
||||
@@ -131,7 +126,7 @@ func _play(latency_ms: float, jitter_ms: float, loss: float) -> Array[Dictionary
|
||||
entity.append(int(flow.entity_of[handle]))
|
||||
history[entity[index]] = [sim.entities.find(entity[index]).position]
|
||||
var planned: Drop = Drop.plan(mirror.ground, SimRng.new(flow.current_seed()), 0)
|
||||
assert_eq(planned.start, sim.drop.start, "the client plans the server's barge route")
|
||||
assert_eq(planned.start, sim.drop.start, "the client plans the server's ship route")
|
||||
assert_eq(planned.finish, sim.drop.finish)
|
||||
assert_eq(planned.duration_ticks, sim.drop.duration_ticks)
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@ func test_no_data_about_entities_outside_the_interest_area() -> void:
|
||||
|
||||
|
||||
func test_height_does_not_hide_a_player_overhead() -> void:
|
||||
var above: SimEntity = _other(viewer.position + Vector3(10.0, Tuning.BARGE_ALTITUDE, 0.0))
|
||||
var above: SimEntity = _other(viewer.position + Vector3(10.0, 150.0, 0.0))
|
||||
_send()
|
||||
assert_true(receiver.entities.has(above.id))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user