diff --git a/WikiJam/Level/Fortaleza.tscn b/WikiJam/Level/Fortaleza.tscn index 8db721e..d662f19 100644 --- a/WikiJam/Level/Fortaleza.tscn +++ b/WikiJam/Level/Fortaleza.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Level/Objects/Wall.tscn" type="PackedScene" id=1] [ext_resource path="res://Level/Objects/LongBuilding.tscn" type="PackedScene" id=2] [ext_resource path="res://Level/Objects/SmallBuilding.tscn" type="PackedScene" id=3] -[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=4] +[ext_resource path="res://Level/Objects/Crystal.tscn" type="PackedScene" id=4] +[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=5] [sub_resource type="PlaneMesh" id=1] size = Vector2( 500, 500 ) @@ -153,6 +154,15 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 15, 0, 74 ) [node name="SmallBuilding" parent="Navigation/NavigationMeshInstance" instance=ExtResource( 3 )] +[node name="Crystal" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 2, -15 ) + +[node name="Crystal2" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 2, -32.1406 ) + +[node name="Crystal3" parent="." instance=ExtResource( 4 )] +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, -20.2151, 2, -32.1406 ) + [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource( 5 ) @@ -160,9 +170,5 @@ environment = SubResource( 5 ) transform = Transform( 0.965926, 0.212012, -0.148453, 0, 0.573576, 0.819152, 0.258819, -0.79124, 0.554032, 0, 0, 0 ) shadow_enabled = true -[node name="Player" parent="." instance=ExtResource( 4 )] +[node name="Player" parent="." instance=ExtResource( 5 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 ) -body_nodepath = NodePath("Body") -animation_nodepath = NodePath("WalkAnimationPlayer") -ui_nodepath = NodePath("HUD") -camera_nodepath = NodePath("Camera") diff --git a/WikiJam/Level/Objects/Crystal.gd b/WikiJam/Level/Objects/Crystal.gd new file mode 100644 index 0000000..7aa8225 --- /dev/null +++ b/WikiJam/Level/Objects/Crystal.gd @@ -0,0 +1,8 @@ +extends Spatial + + +func _ready(): + Collector.addCollectible(self) + + +#TODO: handle collisions \ No newline at end of file diff --git a/WikiJam/Level/Objects/Crystal.tscn b/WikiJam/Level/Objects/Crystal.tscn new file mode 100644 index 0000000..5e3b8fa --- /dev/null +++ b/WikiJam/Level/Objects/Crystal.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://Level/Objects/Crystal.gd" type="Script" id=1] + +[sub_resource type="CapsuleMesh" id=1] + +[sub_resource type="CapsuleShape" id=2] + +[node name="Crystal" type="Spatial"] +transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 2, 0 ) +script = ExtResource( 1 ) + +[node name="MeshInstance" type="MeshInstance" parent="."] +mesh = SubResource( 1 ) +material/0 = null + +[node name="StaticBody" type="StaticBody" parent="."] + +[node name="CollisionShape" type="CollisionShape" parent="StaticBody"] +shape = SubResource( 2 ) diff --git a/WikiJam/Player/Footsteps.gd b/WikiJam/Player/Footsteps.gd index 4f7872d..63c8c89 100644 --- a/WikiJam/Player/Footsteps.gd +++ b/WikiJam/Player/Footsteps.gd @@ -7,5 +7,5 @@ onready var steps = [ func play_footstep(): - Logger.trace("Footstep") + #Logger.trace("Footstep") steps[0].play() \ No newline at end of file diff --git a/WikiJam/Player/Player.gd b/WikiJam/Player/Player.gd index c26fe15..d59bed3 100644 --- a/WikiJam/Player/Player.gd +++ b/WikiJam/Player/Player.gd @@ -75,6 +75,7 @@ func _process_input(): # jumping if Input.is_action_just_pressed("move_jump") and is_on_floor(): + Logger.info("current collection count: " + String(Collector.getCount())) _vel.y = JUMP_SPEED # sprinting diff --git a/WikiJam/Util/Collector.gd b/WikiJam/Util/Collector.gd index 05cc7e0..dfe003f 100644 --- a/WikiJam/Util/Collector.gd +++ b/WikiJam/Util/Collector.gd @@ -4,6 +4,7 @@ var _collectibles: Array func addCollectible (coll): + Logger.info("appending new collectible: " + String(coll.get_instance_id())) _collectibles.append(coll)