slapin/academy2-game
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Startup fixes

Browse Source
This commit is contained in:
Segey Lapin
2021-11-13 16:54:25 +03:00
parent a96673ceb6
commit 8bb1c26ecd
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
world.gd
View File

@@ -21,9 +21,9 @@ var door_sc = preload("res://scenes/door_control.tscn")
func _ready(): func _ready():
$waiting.show() $waiting.show()
characters.set_navmesh(null, Transform()) characters.set_navmesh(null, Transform())
var start_delay0 = 8.0 var start_delay0 = 2.0
var start_delay1 = 2.0 var start_delay1 = 3.0
var start_delay2 = 2.0 var start_delay2 = 9.0
var start_delay3 = 2.0 var start_delay3 = 2.0
var state = 0 var state = 0
var viewer var viewer
@@ -31,10 +31,35 @@ var viewer
func _process(delta): func _process(delta):
match state: match state:
0: 0:
start_delay0 -= delta
if start_delay0 < 0:
state = 1 state = 1
1: 1:
start_delay1 -= delta start_delay1 -= delta
if start_delay1 < 0: if start_delay1 < 0:
if has_node("Roads") && get_node("Roads") is Roads:
for site in range(RoadsData.get_site_count()):
if site == 0:
streaming.setup_first_town()
else:
streaming.setup_town(site)
streaming.setup_traffic(site)
print("towns done: ", streaming.towns)
var v = RoadsData.get_site_pos(0)
var sdf = RoadsData.get_sdf(v.x, 300, v.y)
var d = 300 - sdf
$player.global_transform.origin.x = v.x
$player.global_transform.origin.y = d + 12
$player.global_transform.origin.z = v.y
viewer = VoxelViewer.new()
$player.add_child(viewer)
state = 2
print("added viewer")
2:
start_delay2 -= delta
print("delay2 ", start_delay2)
if start_delay2 < 0:
print("start configuring player")
var player var player
var cam: Camera var cam: Camera
var fps_cam: Camera var fps_cam: Camera
@@ -46,22 +71,10 @@ func _process(delta):
var fps_cam_rot_y var fps_cam_rot_y
var fps_cam_rot_x var fps_cam_rot_x
var default_offset var default_offset
if has_node("Roads") && get_node("Roads") is Roads:
for site in range(RoadsData.get_site_count()):
if site == 0:
streaming.setup_first_town()
var v = RoadsData.get_site_pos(0)
var sdf = RoadsData.get_sdf(v.x, 300, v.y)
var d = 300 - sdf
$player.global_transform.origin.x = v.x
$player.global_transform.origin.y = d + 12
$player.global_transform.origin.z = v.y
else:
streaming.setup_town(site)
streaming.setup_traffic(site)
print("towns done: ", streaming.towns)
player = characters.replace_character($player, "male", ["player", "cmdq", "player_clothes"]) player = characters.replace_character($player, "male", ["player", "cmdq", "player_clothes"])
player.add_child(VoxelViewer.new()) $player.remove_child(viewer)
player.add_child(viewer)
# player.add_child(VoxelViewer.new())
player.set_script(load("res://characters/character.gd")) player.set_script(load("res://characters/character.gd"))
var fps_cam_pos = fps_camera_scene.instance() var fps_cam_pos = fps_camera_scene.instance()
player.add_child(fps_cam_pos) player.add_child(fps_cam_pos)
@@ -93,15 +106,13 @@ func _process(delta):
player.set_meta("fps_cam", fps_cam) player.set_meta("fps_cam", fps_cam)
print(player) print(player)
controls.switch_fps_mode(false) controls.switch_fps_mode(false)
state = 2 print("configured player")
2:
start_delay2 -= delta
if start_delay2 < 0:
state = 3 state = 3
3: 3:
start_delay2 -= delta start_delay3 -= delta
if start_delay2 < 0: if start_delay3 < 0:
$waiting.hide() $waiting.hide()
print("starting game")
state = 4 state = 4
4: 4:
RoadsData.save_json("user://world-gen.json") RoadsData.save_json("user://world-gen.json")