fix: improve crab spawning and net targeting
This commit is contained in:
parent
c59328b524
commit
34fcb957e9
8 changed files with 79 additions and 18 deletions
|
|
@ -22,13 +22,36 @@ func _run() -> void:
|
|||
|
||||
var wall := _make_surface(
|
||||
Vector3(2.0, 2.0, 0.1),
|
||||
Vector3(0.0, 0.9, -1.5),
|
||||
Vector3(0.0, 0.9, -1.1),
|
||||
)
|
||||
root.add_child(wall)
|
||||
await physics_frame
|
||||
controller.call("_update_marker_target")
|
||||
var marker := controller.get("_marker") as MeshInstance3D
|
||||
assert(marker != null)
|
||||
var disc := marker.mesh as CylinderMesh
|
||||
assert(disc != null)
|
||||
assert(is_equal_approx(disc.top_radius, controller.marker_radius))
|
||||
assert(is_equal_approx(disc.bottom_radius, controller.marker_radius))
|
||||
var invalid_material := controller.get(
|
||||
"_marker_invalid_material"
|
||||
) as StandardMaterial3D
|
||||
var valid_material := controller.get(
|
||||
"_marker_valid_material"
|
||||
) as StandardMaterial3D
|
||||
assert(invalid_material != null)
|
||||
assert(valid_material != null)
|
||||
assert(invalid_material.albedo_color == Color.WHITE)
|
||||
assert(is_equal_approx(invalid_material.albedo_color.a, 1.0))
|
||||
assert(is_equal_approx(valid_material.albedo_color.a, 1.0))
|
||||
assert(
|
||||
invalid_material.shading_mode
|
||||
== BaseMaterial3D.SHADING_MODE_UNSHADED
|
||||
)
|
||||
assert(
|
||||
valid_material.shading_mode
|
||||
== BaseMaterial3D.SHADING_MODE_UNSHADED
|
||||
)
|
||||
assert(bool(controller.get("_marker_has_surface")))
|
||||
assert(marker.global_basis.y.dot(Vector3.BACK) > 0.99)
|
||||
|
||||
|
|
@ -44,6 +67,16 @@ func _run() -> void:
|
|||
assert(bool(controller.get("_marker_has_surface")))
|
||||
assert(marker.global_basis.y.dot(Vector3.UP) > 0.99)
|
||||
assert(is_equal_approx(absf(marker.global_basis.determinant()), 1.0))
|
||||
var horizontal_marker_offset := Vector2(
|
||||
marker.global_position.x - player.global_position.x,
|
||||
marker.global_position.z - player.global_position.z,
|
||||
).length()
|
||||
assert(
|
||||
is_equal_approx(
|
||||
horizontal_marker_offset,
|
||||
controller.marker_distance,
|
||||
)
|
||||
)
|
||||
|
||||
floor.queue_free()
|
||||
controller.queue_free()
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@ const FishCatalog: FishPool = preload("res://fish/pools/fish_catalog.tres")
|
|||
const GatheringControllerType = preload(
|
||||
"res://gathering/gathering_controller.gd"
|
||||
)
|
||||
const WorldGatherableType = preload("res://gathering/world_gatherable.gd")
|
||||
|
||||
const REDUCED_CRAB_PIXEL_SIZE: float = 0.00025
|
||||
const CRAB_PIXEL_SIZE: float = 0.0005
|
||||
const REDUCED_CATCH_RING_RADIUS: float = 0.175
|
||||
const NET_STRIKE_MARKER_DISTANCE: float = 0.85
|
||||
|
||||
|
||||
func _initialize() -> void:
|
||||
|
|
@ -20,6 +22,7 @@ func _initialize() -> void:
|
|||
)
|
||||
assert(NetworkWorldSpawnProtocol.SNAPSHOT_ENTITIES_PER_ENVELOPE <= 4)
|
||||
_validate_catalog_statuses()
|
||||
_validate_billboard_presentation()
|
||||
_validate_envelopes()
|
||||
print("World spawn protocol validation: PASS")
|
||||
quit()
|
||||
|
|
@ -36,7 +39,7 @@ func _validate_catalog_statuses() -> void:
|
|||
assert(
|
||||
is_equal_approx(
|
||||
brown.sprite_pixel_size,
|
||||
REDUCED_CRAB_PIXEL_SIZE,
|
||||
CRAB_PIXEL_SIZE,
|
||||
)
|
||||
)
|
||||
_validate_quality_behavior(brown)
|
||||
|
|
@ -46,6 +49,7 @@ func _validate_catalog_statuses() -> void:
|
|||
assert(is_equal_approx(brown.scare_respawn_max_seconds, 90.0))
|
||||
assert(is_equal_approx(brown.minimum_respawn_spacing_seconds, 180.0))
|
||||
assert(brown.required_tool_id == &"crab_net")
|
||||
assert(is_equal_approx(brown.minimum_surface_y, -0.44))
|
||||
assert(FishCatalog.get_fish_by_id(&"crab_brown") == brown.catch_data)
|
||||
assert(not brown.catch_data.is_fishable())
|
||||
|
||||
|
|
@ -62,7 +66,7 @@ func _validate_catalog_statuses() -> void:
|
|||
assert(
|
||||
is_equal_approx(
|
||||
entry.sprite_pixel_size,
|
||||
REDUCED_CRAB_PIXEL_SIZE,
|
||||
CRAB_PIXEL_SIZE,
|
||||
)
|
||||
)
|
||||
assert(entry.catch_data.collection_method == FishData.CollectionMethod.NET)
|
||||
|
|
@ -88,9 +92,26 @@ func _validate_catalog_statuses() -> void:
|
|||
REDUCED_CATCH_RING_RADIUS,
|
||||
)
|
||||
)
|
||||
assert(
|
||||
is_equal_approx(
|
||||
gathering_controller.marker_distance,
|
||||
NET_STRIKE_MARKER_DISTANCE,
|
||||
)
|
||||
)
|
||||
gathering_controller.free()
|
||||
|
||||
|
||||
func _validate_billboard_presentation() -> void:
|
||||
var gatherable := WorldGatherableType.new()
|
||||
gatherable.call("_ensure_visual")
|
||||
var sprite := gatherable.get_node("GatherableSprite") as Sprite3D
|
||||
assert(sprite != null)
|
||||
assert(sprite.billboard == BaseMaterial3D.BILLBOARD_ENABLED)
|
||||
assert(sprite.texture_filter == BaseMaterial3D.TEXTURE_FILTER_NEAREST)
|
||||
assert(not sprite.shaded)
|
||||
gatherable.free()
|
||||
|
||||
|
||||
func _validate_quality_behavior(entry: GatherableData) -> void:
|
||||
var prior_speed: float = -1.0
|
||||
var prior_scare_radius: float = -1.0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue