diff --git a/Models/Cookie.blend b/Models/Cookie.blend new file mode 100644 index 0000000..2526ea8 Binary files /dev/null and b/Models/Cookie.blend differ diff --git a/Models/Cookie.mtl b/Models/Cookie.mtl new file mode 100644 index 0000000..ac81ab7 --- /dev/null +++ b/Models/Cookie.mtl @@ -0,0 +1,35 @@ +# Blender MTL File: 'None' +# Material Count: 3 + +newmtl Dress +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd Dress.png + +newmtl Nose +Ns 442.408052 +Ka 0.486239 0.486239 0.486239 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 3 +map_Kd Nose.png + +newmtl Skin +Ns 250.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 +map_Kd Face.png diff --git a/Models/Cookie.obj.import b/Models/Cookie.obj.import new file mode 100644 index 0000000..5bcae97 --- /dev/null +++ b/Models/Cookie.obj.import @@ -0,0 +1,21 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://35saq7eyk446" +path="res://.godot/imported/Cookie.obj-662f85ea2a0cd47351e12fab4abf9238.mesh" + +[deps] + +files=["res://.godot/imported/Cookie.obj-662f85ea2a0cd47351e12fab4abf9238.mesh"] + +source_file="res://Models/Cookie.obj" +dest_files=["res://.godot/imported/Cookie.obj-662f85ea2a0cd47351e12fab4abf9238.mesh", "res://.godot/imported/Cookie.obj-662f85ea2a0cd47351e12fab4abf9238.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true diff --git a/Models/Dress Normal.png b/Models/Dress Normal.png new file mode 100644 index 0000000..8ca21a2 Binary files /dev/null and b/Models/Dress Normal.png differ diff --git a/Models/Dress Normal.png.import b/Models/Dress Normal.png.import new file mode 100644 index 0000000..2b78592 --- /dev/null +++ b/Models/Dress Normal.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://brk7dapt02cdp" +path="res://.godot/imported/Dress Normal.png-fcd352e253c0095ddde3bced2677acc8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Models/Dress Normal.png" +dest_files=["res://.godot/imported/Dress Normal.png-fcd352e253c0095ddde3bced2677acc8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +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=1 diff --git a/Models/Dress.png b/Models/Dress.png new file mode 100644 index 0000000..c4f9450 Binary files /dev/null and b/Models/Dress.png differ diff --git a/Models/Dress.png.import b/Models/Dress.png.import new file mode 100644 index 0000000..464dcff --- /dev/null +++ b/Models/Dress.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dkoq8pk0yalja" +path.s3tc="res://.godot/imported/Dress.png-639684eb0ba0642d69cf79167b81396d.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Models/Dress.png" +dest_files=["res://.godot/imported/Dress.png-639684eb0ba0642d69cf79167b81396d.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/Models/Face.png b/Models/Face.png new file mode 100644 index 0000000..4e584c6 Binary files /dev/null and b/Models/Face.png differ diff --git a/Models/Face.png.import b/Models/Face.png.import new file mode 100644 index 0000000..9a0035e --- /dev/null +++ b/Models/Face.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dm1exmpufnv0n" +path.s3tc="res://.godot/imported/Face.png-4e5b33e0b8d1173122b5b96cf5f1ee35.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Models/Face.png" +dest_files=["res://.godot/imported/Face.png-4e5b33e0b8d1173122b5b96cf5f1ee35.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/Models/Nose.png b/Models/Nose.png new file mode 100644 index 0000000..5e8fac4 Binary files /dev/null and b/Models/Nose.png differ diff --git a/Models/Nose.png.import b/Models/Nose.png.import new file mode 100644 index 0000000..8d02017 --- /dev/null +++ b/Models/Nose.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cbmo7tkrhbcu1" +path.s3tc="res://.godot/imported/Nose.png-36a51257fe1234e1ddfcc686efd5ee83.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Models/Nose.png" +dest_files=["res://.godot/imported/Nose.png-36a51257fe1234e1ddfcc686efd5ee83.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/Models/Read Me.txt b/Models/Read Me.txt new file mode 100644 index 0000000..bd465cf --- /dev/null +++ b/Models/Read Me.txt @@ -0,0 +1,11 @@ +NJP here, here's is my C.Blair model! I made a more accurate model close to the game. + +This Cookie Blair custom model is credited to me. + +1. Do not use this model unless you ask for permission if it's a picture, video, etc. +2. If you do use the model, please give credit to NJP. +3. Fuck you Bradon White and your false DMCA's. + +I'll have this rigged with more expression and clothes when I update this. + +6/23/2023 \ No newline at end of file diff --git a/Scenes/Blizzard.tscn b/Scenes/Blizzard.tscn index a812b22..be13045 100644 --- a/Scenes/Blizzard.tscn +++ b/Scenes/Blizzard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://ds2y8l8onrs4f"] +[gd_scene load_steps=5 format=3 uid="uid://ds2y8l8onrs4f"] [ext_resource type="Script" path="res://Scripts/Blizzard.cs" id="1_rqtsv"] @@ -9,11 +9,24 @@ albedo_color = Color(0.137255, 0.447059, 0.796078, 1) radial_segments = 4 rings = 1 +[sub_resource type="SphereShape3D" id="SphereShape3D_xe0sc"] + [node name="Blizzard" type="Node3D"] script = ExtResource("1_rqtsv") _projectileSpeed = 10.0 -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +[node name="RigidBody3D" type="RigidBody3D" parent="."] +collision_layer = 0 +collision_mask = 16 +mass = 0.01 +gravity_scale = 0.0 + +[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11373, 0) material_override = SubResource("StandardMaterial3D_pd0mo") mesh = SubResource("SphereMesh_g0pbs") +skeleton = NodePath("../..") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11958, 0) +shape = SubResource("SphereShape3D_xe0sc") diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn index 387411c..936a009 100644 --- a/Scenes/Main.tscn +++ b/Scenes/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://bcsgd8vxy43g2"] +[gd_scene load_steps=17 format=3 uid="uid://bcsgd8vxy43g2"] [ext_resource type="Script" path="res://Scripts/Player.cs" id="1_8dc05"] [ext_resource type="PackedScene" uid="uid://d20uxkpid4ynd" path="res://Models/vivi1.gltf" id="1_mqt2m"] @@ -7,6 +7,7 @@ [ext_resource type="Script" path="res://Scripts/CameraSystem.cs" id="3_5ecw2"] [ext_resource type="PackedScene" uid="uid://c13g5orvyhy1p" path="res://Models/moogle.gltf" id="4_dckjs"] [ext_resource type="Script" path="res://Scripts/NPCFollow.cs" id="4_o5mpp"] +[ext_resource type="ArrayMesh" uid="uid://35saq7eyk446" path="res://Models/Cookie.obj" id="8_8xb3w"] [sub_resource type="BoxShape3D" id="BoxShape3D_8verc"] size = Vector3(100, 2, 100) @@ -31,6 +32,10 @@ albedo_color = Color(0.509804, 0.584314, 1, 1) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ultw4"] albedo_color = Color(1, 1, 0, 1) +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_y33ih"] +radius = 1.4 +height = 6.94546 + [node name="Main" type="Node"] [node name="StaticBody3D" type="StaticBody3D" parent="."] @@ -109,3 +114,16 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.54678, 0.383205, 4.07192) material_override = SubResource("StandardMaterial3D_ultw4") use_collision = true size = Vector3(15.0266, 4.74018, 1) + +[node name="CharacterBody3D" type="CharacterBody3D" parent="."] +collision_layer = 0 +collision_mask = 16 + +[node name="Cookie" type="MeshInstance3D" parent="CharacterBody3D"] +transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, -0.130408, -1.66095) +mesh = ExtResource("8_8xb3w") +skeleton = NodePath("../..") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] +transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, -8.04457, 0.690081, -1.66095) +shape = SubResource("CapsuleShape3D_y33ih") diff --git a/Scripts/Cookie.obj.import b/Scripts/Cookie.obj.import new file mode 100644 index 0000000..fc8ca5a --- /dev/null +++ b/Scripts/Cookie.obj.import @@ -0,0 +1,21 @@ +[remap] + +importer="wavefront_obj" +importer_version=1 +type="Mesh" +uid="uid://cj246dmena0if" +path="res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh" + +[deps] + +files=["res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh"] + +source_file="res://Scripts/Cookie.obj" +dest_files=["res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh", "res://.godot/imported/Cookie.obj-9c7fa2a3d48746d9f2fd322d3854502d.mesh"] + +[params] + +generate_tangents=true +scale_mesh=Vector3(1, 1, 1) +offset_mesh=Vector3(0, 0, 0) +optimize_mesh=true diff --git a/Scripts/Fireball.cs b/Scripts/Fireball.cs index 26036ef..422c4da 100644 --- a/Scripts/Fireball.cs +++ b/Scripts/Fireball.cs @@ -1,7 +1,9 @@ +using Godot; + public partial class Fireball : Projectile { public override void _PhysicsProcess(double delta) { - Translate(new Godot.Vector3(0, 0, Speed * (float)delta)); + Translate(new Vector3(0, 0, Speed * (float)delta)); } }