M6 B1

Lots of bug fixes that were reported by game testers and me.

maps/base_map.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://2qsccmko8yl8"]
+[gd_scene load_steps=4 format=3 uid="uid://2qsccmko8yl8"]
 
 [ext_resource type="PackedScene" uid="uid://4mhcwvn365ki" path="res://objects/computer.tscn" id="2_28qhl"]
 [ext_resource type="PackedScene" uid="uid://bldbqjmabjemn" path="res://objects/freezer.tscn" id="2_ty8su"]
@@ -6,17 +6,6 @@
 [sub_resource type="BoxShape3D" id="BoxShape3D_34oyu"]
 size = Vector3(50, 1, 50)
 
-[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_ttw18"]
-
-[sub_resource type="Sky" id="Sky_05rcq"]
-sky_material = SubResource("PhysicalSkyMaterial_ttw18")
-
-[sub_resource type="Environment" id="Environment_3mjgt"]
-background_mode = 2
-sky = SubResource("Sky_05rcq")
-ambient_light_color = Color(1, 1, 1, 1)
-ambient_light_energy = 16.0
-
 [node name="map" type="Node3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2, 0)
 
@@ -28,11 +17,6 @@ size = Vector3(50, 1, 50)
 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 shape = SubResource("BoxShape3D_34oyu")
 
-[node name="light" type="DirectionalLight3D" parent="."]
-transform = Transform3D(0.472305, 0.759315, 0.447625, 0.272686, -0.608795, 0.744991, 0.838195, -0.229802, -0.494591, 0, 10.2747, 0)
-shadow_enabled = true
-directional_shadow_mode = 1
-
 [node name="computers" parent="." instance=ExtResource("2_28qhl")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, 1, 3)
 
@@ -42,8 +26,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 3)
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 0.984808, 0.173648, 0, -0.173648, 0.984808, 0, 5, 29)
 
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_3mjgt")
-
 [node name="freezer" parent="." instance=ExtResource("2_ty8su")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.6627, 3.5, -10.4457)

menus/main_menu.tscn

@@ -74,8 +74,8 @@ grow_vertical = 0
 [node name="Label" type="Label" parent="ver_string"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 32
-text = "Milestone 5
+text = "Milestone 6
-Private Testing Release 1"
+Beta 1"
 horizontal_alignment = 2
 
 [connection signal="pressed" from="main_content/create" to="." method="_on_create_pressed"]

objects/freezer.tscn

@@ -37,5 +37,18 @@ shape = SubResource("BoxShape3D_uvwqt")
 [node name="Timer" type="Timer" parent="."]
 autostart = true
 
+[node name="spawn" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4)
+
+[node name="CSGBox3D" type="CSGBox3D" parent="spawn"]
+visible = false
+
+[node name="dead" type="Label3D" parent="."]
+visible = false
+offset = Vector2(0, 175)
+billboard = 1
+text = "Dead"
+font_size = 64
+
 [connection signal="body_entered" from="Area3D" to="." method="_on_area_3d_body_entered"]
 [connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]

scripts/freezer.gd

@@ -15,9 +15,10 @@ var living = true
 
 func _process(delta):
 	if occupied:
-		trapped_body.position = position
+		trapped_body.position = global_position
 	if occupied and trapped_body.hp == 0:
 		living = false
+		$dead.show()
 
 func _on_area_3d_body_entered(body):
 	if body is CharacterBody3D:
@@ -29,8 +30,8 @@ func _on_area_3d_body_entered(body):
 			trapped_body.frozen()
 		elif !body.beast and occupied and living and body != trapped_body:
 			trapped_body.unfreeze()
-			trapped_body._on_time_in_bag_timeout()
 			occupied = false
+			trapped_body.position = $spawn.global_position
 			trapped_body = null
 
 func _on_timer_timeout():

scripts/game.gd

@@ -12,7 +12,6 @@ extends Node
 var settings = {"save_version" = 2, "fps_counter" = 1}
 var computers = 0
 var players = 0
-var is_creating = false
 var map_name = "mansion"
 
 func _ready():
@@ -24,6 +23,8 @@ func _ready():
 			settings = temp
 	else:
 		Save.saveJSON("user://settings.json", settings)
+	if OS.is_debug_build():
+		settings["fps_counter"] = 1
 
 func _process(delta):
 	pass

scripts/movement.gd

@@ -144,12 +144,17 @@ func lost_one():
 	$hammer_bag/CSGCylinder3D/CSGSphere3D.visible = false
 
 func frozen():
+	visible = true
 	$in_bag.visible = false
 	is_frozen = true
+	enabled = false
 	
 
 func unfreeze():
 	is_frozen = false
+	if !npc:
+		enabled = true
+	caught = false
 
 func _on_time_in_bag_timeout():
 	visible = true

scripts/server.gd

@@ -21,7 +21,6 @@ var character = preload("res://objects/player.tscn")
 var is_server = false
 var first_joined = true
 var game_master = "debug"
-var host_announced = false
 var map_name = "mansion"
 
 func reset():
@@ -30,6 +29,8 @@ func reset():
 	label = null
 	map = null
 	is_server = false
+	first_joined = false
+	game_master = "debug"
 	character = preload("res://objects/player.tscn")
 	if multiplayer != null:
 		multiplayer.multiplayer_peer = null
@@ -50,8 +51,9 @@ func create_game():
 	multiplayer.multiplayer_peer = peer
 
 func _process(delta):
-	if multiplayer.is_server():
+	if multiplayer != null:
-		make_host.rpc(game_master)
+		if multiplayer.is_server():
+			make_host.rpc(game_master)
 
 @rpc("authority","call_remote","reliable")
 func make_host(id):