From c96e96a9e97bce35bbba5c838d483990dbd3fe0f Mon Sep 17 00:00:00 2001 From: ncusimano Date: Sat, 19 Aug 2023 11:04:45 -0600 Subject: [PATCH] Villager Actions Not yet complete --- godot/CameraTest.tscn | 37 ++++++++++++++++++++++----------- godot/Default Orange.png.import | 2 +- godot/Default Purple.png | 3 +++ godot/Default Purple.png.import | 35 +++++++++++++++++++++++++++++++ godot/Level/Island.tscn | 28 ++++++++++--------------- godot/Villager.gd | 11 ++++++++++ godot/cultist.tscn | 21 +++++++++++++++++++ godot/player.tscn | 2 +- godot/project.godot | 2 +- godot/villager.tscn | 18 ++++++++++++++++ 10 files changed, 127 insertions(+), 32 deletions(-) create mode 100644 godot/Default Purple.png create mode 100644 godot/Default Purple.png.import create mode 100644 godot/Villager.gd create mode 100644 godot/cultist.tscn create mode 100644 godot/villager.tscn diff --git a/godot/CameraTest.tscn b/godot/CameraTest.tscn index 31d0a98..cee559a 100644 --- a/godot/CameraTest.tscn +++ b/godot/CameraTest.tscn @@ -1,20 +1,33 @@ -[gd_scene load_steps=4 format=3 uid="uid://dd64j7xcfl6io"] +[gd_scene load_steps=6 format=3 uid="uid://dd64j7xcfl6io"] -[ext_resource type="PackedScene" uid="uid://csqyxbjumla33" path="res://player.tscn" id="1_i6frr"] -[ext_resource type="PackedScene" uid="uid://3d51hjh2st8a" path="res://Level/Island.tscn" id="2_cjk1r"] +[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_cxihl"] -radius = 15.365 +[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_i6frr")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.93827, 12.3667, -12.0351) +[node name="Player" parent="." instance=ExtResource("1_jbc4n")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) -[node name="Node3D" parent="." instance=ExtResource("2_cjk1r")] -transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, -0.279051, -4.39988, -1.78854) +[node name="StaticBody3D" type="StaticBody3D" parent="."] -[node name="StaticBody3D" type="StaticBody3D" parent="Node3D"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] +shape = SubResource("CylinderShape3D_62oje") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/StaticBody3D"] -shape = SubResource("CylinderShape3D_cxihl") +[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) diff --git a/godot/Default Orange.png.import b/godot/Default Orange.png.import index c7acb04..55079fd 100644 --- a/godot/Default Orange.png.import +++ b/godot/Default Orange.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d3lvqr08li31r" +uid="uid://vw0x1higed4d" path.s3tc="res://.godot/imported/Default Orange.png-063fb7fe49baee9d7764c022a207ac3a.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/godot/Default Purple.png b/godot/Default Purple.png new file mode 100644 index 0000000..3c64f78 --- /dev/null +++ b/godot/Default Purple.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f800ec4fe8752796c4c90ce1bef1a706f9c511c1edb17fd9b78b9518f2db86a6 +size 223 diff --git a/godot/Default Purple.png.import b/godot/Default Purple.png.import new file mode 100644 index 0000000..4dace10 --- /dev/null +++ b/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 diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index 06dca66..dd9d4db 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -1,23 +1,17 @@ -[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" uid="uid://c1n2lfcn4rkx7" path="res://Models/palm_default.tscn" id="4_2cnue"] -[ext_resource type="PackedScene" uid="uid://ctbyl0qbks4k6" path="res://Models/ocean.tscn" id="4_dey2i"] -[ext_resource type="PackedScene" uid="uid://difi2tur2j4dg" path="res://Models/island.tscn" id="4_lq6cy"] -[ext_resource type="PackedScene" uid="uid://hg1yr5rnxd47" path="res://Models/palm_young.tscn" id="5_prlw2"] +[ext_resource type="PackedScene" path="res://Models/PalmBaby.glb" id="2_xgklm"] +[ext_resource type="PackedScene" path="res://Models/PalmDefalt.glb" id="3_cgw64"] -[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) diff --git a/godot/Villager.gd b/godot/Villager.gd new file mode 100644 index 0000000..92626b9 --- /dev/null +++ b/godot/Villager.gd @@ -0,0 +1,11 @@ +extends Node3D + + +# 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): + pass diff --git a/godot/cultist.tscn b/godot/cultist.tscn new file mode 100644 index 0000000..21dcd81 --- /dev/null +++ b/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") diff --git a/godot/player.tscn b/godot/player.tscn index bd905b8..54be7c5 100644 --- a/godot/player.tscn +++ b/godot/player.tscn @@ -1,7 +1,7 @@ [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" path="res://Default Orange.png" id="2_s5i4o"] +[ext_resource type="Texture2D" uid="uid://vw0x1higed4d" path="res://Default Orange.png" id="2_s5i4o"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"] diff --git a/godot/project.godot b/godot/project.godot index 6e1d6a4..0c01521 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="abgj23" -run/main_scene="res://CameraTest.tscn" +run/main_scene="res://cameraTest.tscn" config/features=PackedStringArray("4.1", "Forward Plus") config/icon="res://icon.svg" diff --git a/godot/villager.tscn b/godot/villager.tscn new file mode 100644 index 0000000..0bb07fc --- /dev/null +++ b/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")