Merge remote-tracking branch 'origin/Player'

godot/CameraTest.tscn

@@ -0,0 +1,33 @@
+[gd_scene load_steps=6 format=3 uid="uid://dd64j7xcfl6io"]
+
+[ext_resource type="PackedScene" uid="uid://csqyxbjumla33" path="res://player.tscn" id="1_jbc4n"]
+[ext_resource type="PackedScene" uid="uid://cnnsy8h0dq5y1" path="res://villager.tscn" id="2_i3gws"]
+[ext_resource type="PackedScene" uid="uid://rn1bmw0lf1lr" path="res://cultist.tscn" id="3_renxb"]
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_62oje"]
+radius = 80.229
+
+[sub_resource type="CylinderMesh" id="CylinderMesh_c2b6h"]
+top_radius = 80.23
+
+[node name="Node3D" type="Node3D"]
+
+[node name="Player" parent="." instance=ExtResource("1_jbc4n")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0)
+
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+shape = SubResource("CylinderShape3D_62oje")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="StaticBody3D/CollisionShape3D"]
+mesh = SubResource("CylinderMesh_c2b6h")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, -0.523317, 0.852138, 0, -0.852138, -0.523317, 0, 10.6239, 0)
+
+[node name="Node3D" parent="." instance=ExtResource("2_i3gws")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 3, 43)
+
+[node name="Node3D2" parent="." instance=ExtResource("3_renxb")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29, 4, 33)

godot/Default Orange.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://vw0x1higed4d"
+path.s3tc="res://.godot/imported/Default Orange.png-063fb7fe49baee9d7764c022a207ac3a.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Default Orange.png"
+dest_files=["res://.godot/imported/Default Orange.png-063fb7fe49baee9d7764c022a207ac3a.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

godot/Default Purple.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://df0xror4t3gbc"
+path.s3tc="res://.godot/imported/Default Purple.png-7d2233ba088e783e3b3f8448d0341adf.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Default Purple.png"
+dest_files=["res://.godot/imported/Default Purple.png-7d2233ba088e783e3b3f8448d0341adf.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

godot/Level/Island.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=6 format=3 uid="uid://3d51hjh2st8a"]
+[gd_scene load_steps=3 format=3 uid="uid://3d51hjh2st8a"]
 
 [ext_resource type="PackedScene" uid="uid://d3ccrfjpg4hbv" path="res://Models/palm_curved.tscn" id="3_bth2b"]
 [ext_resource type="PackedScene" path="res://Models/palm_default.tscn" id="4_2cnue"]
@@ -6,18 +6,15 @@
 [ext_resource type="PackedScene" uid="uid://difi2tur2j4dg" path="res://Models/island.tscn" id="4_lq6cy"]
 [ext_resource type="PackedScene" path="res://Models/palm_young.tscn" id="5_prlw2"]
 
-[node name="Node3D" type="Node3D"]
+[node name="Node3D2" type="Node3D"]
 
-[node name="island" parent="." instance=ExtResource("4_lq6cy")]
+[node name="island" type="Node3D" parent="."]
 
-[node name="ocean" parent="." instance=ExtResource("4_dey2i")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.867198, 0)
+[node name="PalmBaby" parent="." instance=ExtResource("2_xgklm")]
+transform = Transform3D(0.354782, 0, 0, 0, 0.354782, 0, 0, 0, 0.354782, 0.210514, 1.44177, -0.290407)
 
-[node name="PalmCurved" parent="." instance=ExtResource("3_bth2b")]
-transform = Transform3D(0.0166766, 0, 0, 0, 0.0166766, 0, 0, 0, 0.0166766, 2.60201, 1.38633, -0.419671)
+[node name="PalmDefalt" parent="." instance=ExtResource("3_cgw64")]
+transform = Transform3D(0.771343, 0, 0, 0, 0.771343, 0, 0, 0, 0.771343, 0.310153, 1.61852, 0.365102)
 
-[node name="PalmDefault" parent="." instance=ExtResource("4_2cnue")]
-transform = Transform3D(0.0285645, 0, 0, 0, 0.0285645, 0, 0, 0, 0.0285645, 1.58539, 1.19143, 0.741446)
-
-[node name="PalmYoung" parent="." instance=ExtResource("5_prlw2")]
-transform = Transform3D(0.0328739, 0, 0, 0, 0.0328739, 0, 0, 0, 0.0328739, 0.0679206, 1.38939, 0.60797)
+[node name="ocean" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.904215, 0)

godot/Models/ExoticPalmBaby.fbx.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://b0je4d0hkwh33"
+path="res://.godot/imported/ExoticPalmBaby.fbx-18609796ca21ea31d02469d5ce4b3a8d.scn"
+
+[deps]
+
+source_file="res://Models/ExoticPalmBaby.fbx"
+dest_files=["res://.godot/imported/ExoticPalmBaby.fbx-18609796ca21ea31d02469d5ce4b3a8d.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

godot/Models/ExoticPalmCurve.fbx.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://br02kcb2orkru"
+path="res://.godot/imported/ExoticPalmCurve.fbx-f171d43633fcb2564ec85725bdc79e46.scn"
+
+[deps]
+
+source_file="res://Models/ExoticPalmCurve.fbx"
+dest_files=["res://.godot/imported/ExoticPalmCurve.fbx-f171d43633fcb2564ec85725bdc79e46.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

godot/Models/ExoticPalmDefalt.fbx.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cwprqiadeagdy"
+path="res://.godot/imported/ExoticPalmDefalt.fbx-7992e041312168fc1e24b073b220a6b7.scn"
+
+[deps]
+
+source_file="res://Models/ExoticPalmDefalt.fbx"
+dest_files=["res://.godot/imported/ExoticPalmDefalt.fbx-7992e041312168fc1e24b073b220a6b7.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

godot/Models/ExoticPalmOld.fbx.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://c8clfgxi041an"
+path="res://.godot/imported/ExoticPalmOld.fbx-bcb78e65808546f55f4d71f474979326.scn"
+
+[deps]
+
+source_file="res://Models/ExoticPalmOld.fbx"
+dest_files=["res://.godot/imported/ExoticPalmOld.fbx-bcb78e65808546f55f4d71f474979326.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

godot/Models/ExoticPalmYoung.fbx.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dhimbtdsktc5s"
+path="res://.godot/imported/ExoticPalmYoung.fbx-0de6081591e7c224a5fccf5cd1669985.scn"
+
+[deps]
+
+source_file="res://Models/ExoticPalmYoung.fbx"
+dest_files=["res://.godot/imported/ExoticPalmYoung.fbx-0de6081591e7c224a5fccf5cd1669985.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

godot/Player.gd

@@ -0,0 +1,50 @@
+extends CharacterBody3D
+
+
+const SPEED = 5.0
+const JUMP_VELOCITY = 4.5
+@export var horiz_sens = 0.25
+@export var vert_sens = 0.25
+var playerCam
+
+# Get the gravity from the project settings to be synced with RigidBody nodes.
+var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
+
+func _ready():
+	Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
+	playerCam = get_node("CameraMount") as Node3D
+	
+	
+func _process(delta):
+	# Brings your mouse out of the window if you press escape. Add pause screen function here?
+	if Input.is_action_pressed("ui_cancel"):
+		Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
+		
+
+func _input(event):
+	# Handle the rotation of the camera using mouse movement.
+	if event is InputEventMouseMotion:
+		rotate_y(deg_to_rad(-event.relative.x * horiz_sens))
+		playerCam.rotate_x(deg_to_rad(-event.relative.y * vert_sens))
+
+func _physics_process(delta):
+	# Add the gravity.
+	if not is_on_floor():
+		velocity.y -= gravity * delta
+
+	# Handle Jump.
+	if Input.is_action_just_pressed("ui_accept") and is_on_floor():
+		velocity.y = JUMP_VELOCITY
+
+	# Get the input direction and handle the movement/deceleration.
+	# As good practice, you should replace UI actions with custom gameplay actions.
+	var input_dir = Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down")
+	var direction = (transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized()
+	if direction:
+		velocity.x = direction.x * SPEED
+		velocity.z = direction.z * SPEED
+	else:
+		velocity.x = move_toward(velocity.x, 0, SPEED)
+		velocity.z = move_toward(velocity.z, 0, SPEED)
+
+	move_and_slide()

godot/Villager.gd

@@ -0,0 +1,55 @@
+extends Node3D
+
+var rng = RandomNumberGenerator.new()
+var spin_amount = 0
+var spinning = false
+var wait_time = 0
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	var task = "idle"
+	
+	match task:
+		"idle":
+			task = rng.randi_range(0, 100)
+			
+			if task <= 33:
+				task = "walk"
+			elif task > 33 and task <= 50:
+				task = "spin"
+			elif task > 50:
+				task = "wait"
+		
+		"walk":
+			pass
+		
+		"spin":
+			if !spinning:
+				var spin_amount = rng.randi_range(-360, 360)
+				spinning = true
+				
+			if spin_amount > 0:
+				rotate_y(5)
+				spin_amount -= 5
+			elif spin_amount < 0:
+				rotate_y(-5)
+				spin_amount += 5
+			else:
+				task = "idle"
+				spinning = false 
+							
+		"wait":
+			# Idle Animation goes here!
+			wait_time += 1
+			if wait_time == 100:
+				task = "idle"
+				wait_time = 0
+		
+		
+

godot/cultist.tscn

@@ -0,0 +1,21 @@
+[gd_scene load_steps=5 format=3 uid="uid://rn1bmw0lf1lr"]
+
+[ext_resource type="Texture2D" uid="uid://df0xror4t3gbc" path="res://Default Purple.png" id="1_x8j7f"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_y0hcm"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vxnad"]
+albedo_texture = ExtResource("1_x8j7f")
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_17ljq"]
+material = SubResource("StandardMaterial3D_vxnad")
+
+[node name="Node3D" type="Node3D"]
+
+[node name="RigidBody3D" type="RigidBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
+shape = SubResource("CapsuleShape3D_y0hcm")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D/CollisionShape3D"]
+mesh = SubResource("CapsuleMesh_17ljq")

godot/player.tscn

@@ -0,0 +1,28 @@
+[gd_scene load_steps=6 format=3 uid="uid://csqyxbjumla33"]
+
+[ext_resource type="Script" path="res://Player.gd" id="1_7gpdp"]
+[ext_resource type="Texture2D" uid="uid://vw0x1higed4d" path="res://Default Orange.png" id="2_s5i4o"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"]
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_1e11l"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_npbs0"]
+albedo_texture = ExtResource("2_s5i4o")
+
+[node name="Player" type="CharacterBody3D"]
+script = ExtResource("1_7gpdp")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("CapsuleShape3D_kb4ms")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+mesh = SubResource("CapsuleMesh_1e11l")
+surface_material_override/0 = SubResource("StandardMaterial3D_npbs0")
+
+[node name="CameraMount" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0)
+
+[node name="PlayerCam" type="Camera3D" parent="CameraMount"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4)
+fov = 105.5

godot/project.godot

@@ -11,6 +11,7 @@ config_version=5
 [application]
 
 config/name="abgj23"
+run/main_scene="res://cameraTest.tscn"
 config/features=PackedStringArray("4.1", "Forward Plus")
 config/icon="res://icon.svg"
 
@@ -22,6 +23,44 @@ window/size/mode=3
 window/stretch/mode="viewport"
 window/stretch/aspect="expand"
 
+[dotnet]
+project/assembly_name="abgj23"
+
 [filesystem]
 
 import/fbx/enabled=false
+
+[input]
+
+ui_left={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null)
+]
+}
+ui_right={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null)
+]
+}
+ui_up={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null)
+]
+}
+ui_down={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null)
+]
+}

godot/villager.tscn

@@ -0,0 +1,18 @@
+[gd_scene load_steps=4 format=3 uid="uid://cnnsy8h0dq5y1"]
+
+[ext_resource type="Script" path="res://Villager.gd" id="1_ardgw"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_s4x8n"]
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_b3srs"]
+
+[node name="Node3D" type="Node3D"]
+script = ExtResource("1_ardgw")
+
+[node name="RigidBody3D" type="RigidBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
+shape = SubResource("CapsuleShape3D_s4x8n")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D/CollisionShape3D"]
+mesh = SubResource("CapsuleMesh_b3srs")