diff --git a/assets/characters/coco/coco.tscn b/assets/characters/coco/coco.tscn index 0c6839b..35194db 100644 --- a/assets/characters/coco/coco.tscn +++ b/assets/characters/coco/coco.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=18 format=3 uid="uid://boywgcl7f5ci6"] +[gd_scene load_steps=20 format=3 uid="uid://boywgcl7f5ci6"] [ext_resource type="Script" path="res://assets/characters/player.gd" id="1_bvkmh"] +[ext_resource type="Script" path="res://assets/characters/coco/inventory.gd" id="2_uamqo"] [ext_resource type="Script" path="res://src/viewport.gd" id="3_d52t1"] [ext_resource type="SpineAtlasResource" uid="uid://dj1egdltvn5f3" path="res://assets/characters/coco/coco_bandicoot.atlas" id="3_lykqw"] [ext_resource type="SpineSkeletonFileResource" uid="uid://c3twn8iltvcj0" path="res://assets/characters/coco/coco_bandicoot.skel" id="4_m8s0r"] @@ -10,19 +11,20 @@ [ext_resource type="Script" path="res://assets/characters/coco/states/jump.gd" id="8_1523y"] [ext_resource type="Script" path="res://assets/characters/coco/states/fall.gd" id="9_t8gpm"] [ext_resource type="Script" path="res://assets/characters/coco/states/pause.gd" id="10_qwrnp"] +[ext_resource type="Script" path="res://assets/characters/coco/states/crouch.gd" id="11_qcymd"] -[sub_resource type="ViewportTexture" id="ViewportTexture_05y88"] +[sub_resource type="ViewportTexture" id="ViewportTexture_af5wm"] viewport_path = NodePath("MeshInstance3D/SubViewport") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_fy03b"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_8iy2m"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a31vv"] -next_pass = SubResource("ShaderMaterial_fy03b") +next_pass = SubResource("ShaderMaterial_8iy2m") transparency = 1 shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_05y88") +albedo_texture = SubResource("ViewportTexture_af5wm") billboard_mode = 1 [sub_resource type="QuadMesh" id="QuadMesh_iwcmf"] @@ -43,6 +45,9 @@ axis_lock_angular_y = true axis_lock_angular_z = true script = ExtResource("1_bvkmh") +[node name="Inventory" type="Node" parent="."] +script = ExtResource("2_uamqo") + [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(0.999987, -0.00490892, -0.00171441, 0.00514322, 0.982274, 0.187382, 0.000764184, -0.187388, 0.982286, 0.116849, 1.63592, 5.342) top_level = true @@ -75,6 +80,12 @@ preview_time = 0.79 script = ExtResource("5_migwh") time_scale = 2.5 +[node name="SpineBoneNode" type="SpineBoneNode" parent="MeshInstance3D/SubViewport/SpineSprite"] +show_behind_parent = true +position = Vector2(264.122, -950.881) +scale = Vector2(1, 1) +bone_name = "eye_follow" + [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0) shape = SubResource("CylinderShape3D_wn1m5") @@ -114,4 +125,6 @@ sprite = NodePath("../../MeshInstance3D/SubViewport/SpineSprite") [node name="AirSpin" type="LimboState" parent="LimboHSM"] -[node name="Crouch" type="LimboState" parent="LimboHSM"] +[node name="Crouch" type="LimboState" parent="LimboHSM" node_paths=PackedStringArray("sprite")] +script = ExtResource("11_qcymd") +sprite = NodePath("../../MeshInstance3D/SubViewport/SpineSprite") diff --git a/assets/characters/coco/coco_bandicoot.atlas b/assets/characters/coco/coco_bandicoot.atlas index 6478d85..d4b16a6 100644 --- a/assets/characters/coco/coco_bandicoot.atlas +++ b/assets/characters/coco/coco_bandicoot.atlas @@ -1,54 +1,55 @@ coco_bandicoot.png -size:522,812 +size:815,529 filter:Linear,Linear scale:0.5 accessories.png -bounds:202,62,47,57 -coco_arm_back_1 -bounds:419,637,99,173 -offsets:0,0,100,173 -coco_arm_front_1 -bounds:253,77,88,198 -coco_body_1 -bounds:2,121,135,229 -offsets:0,0,139,229 +bounds:678,271,47,57 rotate:90 +coco_arm_back_1 +bounds:486,37,99,173 +offsets:0,0,100,173 +rotate:90 +coco_arm_front_1 +bounds:678,71,88,198 +coco_body_1 +bounds:347,315,135,212 +offsets:0,0,139,212 +coco_briefs +bounds:2,3,176,107 coco_eyebrows_1 -bounds:410,495,89,31 +bounds:486,4,89,31 coco_eyewhite_1 -bounds:416,528,107,104 +bounds:180,6,107,104 offsets:2,0,109,104 rotate:90 coco_hand_back_1 -bounds:431,122,61,59 +bounds:301,121,61,59 +rotate:90 coco_hand_front_1 -bounds:347,483,79,61 -rotate:90 +bounds:220,121,79,61 coco_head_1 -bounds:345,183,222,175 -rotate:90 +bounds:454,138,222,175 coco_laptop_1 -bounds:2,2,198,117 +bounds:286,2,198,117 coco_leg_back_1 -bounds:2,718,92,415 -rotate:90 +bounds:2,112,92,415 coco_leg_front_1 -bounds:2,594,122,412 -rotate:90 +bounds:96,115,122,412 coco_ponytail_1 -bounds:253,277,90,188 +bounds:362,125,90,188 coco_pupil_back_1 -bounds:503,499,14,27 +bounds:454,122,14,27 +rotate:90 coco_pupil_front_1 -bounds:347,564,28,62 -rotate:90 +bounds:577,6,17,29 flower.png -bounds:347,407,154,74 +bounds:737,285,154,74 +rotate:90 makeup_shotgun -bounds:2,467,343,125 +bounds:220,184,343,125 +rotate:90 makeup_shotgun_fx_0 -bounds:343,105,76,86 -rotate:90 +bounds:737,441,76,86 makeup_shotgun_fx_1 -bounds:2,258,207,249 +bounds:486,320,207,249 rotate:90 diff --git a/assets/characters/coco/coco_bandicoot.png b/assets/characters/coco/coco_bandicoot.png index 06c6fdf..7b57342 100644 Binary files a/assets/characters/coco/coco_bandicoot.png and b/assets/characters/coco/coco_bandicoot.png differ diff --git a/assets/characters/coco/coco_bandicoot.skel b/assets/characters/coco/coco_bandicoot.skel index 5be48f2..742a1a1 100644 Binary files a/assets/characters/coco/coco_bandicoot.skel and b/assets/characters/coco/coco_bandicoot.skel differ diff --git a/assets/characters/coco/inventory.gd b/assets/characters/coco/inventory.gd new file mode 100644 index 0000000..4e554db --- /dev/null +++ b/assets/characters/coco/inventory.gd @@ -0,0 +1,35 @@ +extends Node + +var ALL_ITEMS = { + 0: { + "name": "Hairpin 1", + "desc": "Blah blah" + }, + 1: { + "name": "Briefs", + "desc": "Blah blah" + }, +} + +func use_item_by_index(index: int) -> void: + pass + +func use_item_by_name(name: String) -> void: + # get the item + # call its members + # signal use of item + pass + +func get_item(index, name) -> void: + print ("Pretending to get item") + pass + #return Item(ALL_ITEMS[0]) + +func view_inventory()-> void: + pass + +func _ready() -> void: + pass # Replace with function body. + +func _process(delta: float) -> void: + pass diff --git a/assets/characters/coco/states/crouch.gd b/assets/characters/coco/states/crouch.gd new file mode 100644 index 0000000..7e0bd6a --- /dev/null +++ b/assets/characters/coco/states/crouch.gd @@ -0,0 +1,23 @@ +extends LimboState + +@export var sprite: SpineSprite + +func _enter() -> void: + Messagebus.COCO_STATE.emit(self.name) + var a = sprite.get_animation_state() + if a: a.set_animation("crouch", true, 0) + if true: + a.set_animation("holding/shotgun", false, 1) + +func _ready() -> void: + pass # Replace with function body. + +func _update(delta) -> void: + if Input.is_action_pressed("crouch"): + print("test") + get_root().dispatch("to_idle") + agent.apply_movement(delta) + agent.check_jump_input(delta) + +func _process(delta: float) -> void: + pass diff --git a/assets/characters/coco/states/idle.gd b/assets/characters/coco/states/idle.gd index 0d96d46..c50b00c 100644 --- a/assets/characters/coco/states/idle.gd +++ b/assets/characters/coco/states/idle.gd @@ -16,6 +16,8 @@ func _update(delta) -> void: get_root().dispatch("to_move") if Input.is_action_pressed("Pause"): get_root().dispatch("to_pause") + if Input.is_action_pressed("crouch"): + get_root().dispatch("to_crouch") agent.check_jump_input(delta) func _ready() -> void: diff --git a/assets/characters/player.gd b/assets/characters/player.gd index 5e27d0c..2309810 100644 --- a/assets/characters/player.gd +++ b/assets/characters/player.gd @@ -11,6 +11,7 @@ const JUMP_VELOCITY = 200 @onready var jump_state: LimboState = $LimboHSM/Jump @onready var fall_state: LimboState = $LimboHSM/Fall @onready var pause_state: LimboState = $LimboHSM/Pause +@onready var crouch_state: LimboState = $LimboHSM/Crouch var movement_input = Vector3.ZERO var last_direction:= Vector3.ONE @@ -38,6 +39,9 @@ func _initialize_state_machine(): state_machine.add_transition(idle_state, jump_state, "to_jump") state_machine.add_transition(jump_state, fall_state, "to_fall") state_machine.add_transition(state_machine.ANYSTATE, pause_state, "to_pause") + state_machine.add_transition(state_machine.ANYSTATE, crouch_state, "to_crouch") + state_machine.add_transition(crouch_state, idle_state, "to_idle") + state_machine.add_transition(crouch_state, move_state, "to_move") state_machine.initial_state = idle_state state_machine.initialize(self) @@ -63,11 +67,12 @@ func apply_movement(delta: float) -> void: func shoot_gun(): var space_state = get_world_3d().direct_space_state - - # use global coordinates, not local to node - var start = self.to_global(Vector3(0, 0, 0)) - var end = self.to_global(Vector3(50, 0, 0)) * sign(last_direction.x) - line(start, end, Color.BLACK, 4) + var height = 0.2 + var range = 1.8 + var barrel = 0.3 + var start = self.to_global(Vector3(barrel * sign(last_direction.x), height, 0)) + var end = self.to_global(Vector3((0.4 * sign(last_direction.x)) - barrel, height, 0)) + line(start, end, Color.WHITE, 4) var query = PhysicsRayQueryParameters3D.create(start, end) query.exclude = [self] var result = space_state.intersect_ray(query) @@ -83,9 +88,7 @@ func line(pos1: Vector3, pos2: Vector3, color = Color.BLACK, persist_ms = 0): immediate_mesh.surface_begin(Mesh.PRIMITIVE_LINES, material) immediate_mesh.surface_add_vertex(pos1) - immediate_mesh.surface_add_vertex(pos1-Vector3(0,0,0.2)) immediate_mesh.surface_add_vertex(pos2) - immediate_mesh.surface_add_vertex(pos2-Vector3(0,0,0.2)) immediate_mesh.surface_end() material.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED diff --git a/assets/characters/tawna/tawna.tscn b/assets/characters/tawna/tawna.tscn index df74d82..7e11425 100644 --- a/assets/characters/tawna/tawna.tscn +++ b/assets/characters/tawna/tawna.tscn @@ -33,7 +33,7 @@ max_value = 200.0 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.56535, 83.9717), 420.727, 420.727, 0, 0, Vector2(0.729483, 200), 0.0, 0.0, 0, 0] point_count = 3 -[sub_resource type="ViewportTexture" id="ViewportTexture_cdclm"] +[sub_resource type="ViewportTexture" id="ViewportTexture_vnmwp"] viewport_path = NodePath("MeshInstance3D/SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a31vv"] @@ -41,7 +41,7 @@ transparency = 1 shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_cdclm") +albedo_texture = SubResource("ViewportTexture_vnmwp") billboard_mode = 1 [sub_resource type="QuadMesh" id="QuadMesh_iwcmf"] diff --git a/assets/levels/maps/debug1.tscn b/assets/levels/maps/debug1.tscn index f272060..d1a0a53 100644 --- a/assets/levels/maps/debug1.tscn +++ b/assets/levels/maps/debug1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=3 uid="uid://b2b0sgltiefki"] +[gd_scene load_steps=39 format=3 uid="uid://b2b0sgltiefki"] [ext_resource type="Script" path="res://assets/levels/level_1.gd" id="1_irx2k"] [ext_resource type="Texture2D" uid="uid://1gj5g7mvjkbd" path="res://assets/background-bright.png" id="2_d8eiv"] @@ -19,6 +19,7 @@ [ext_resource type="PackedScene" uid="uid://da0mv3cisoubi" path="res://assets/objects/switch/switch.tscn" id="17_1yuu1"] [ext_resource type="PackedScene" uid="uid://cj7k48mei62om" path="res://assets/characters/megumi/megumi.tscn" id="18_5v3lx"] [ext_resource type="PackedScene" uid="uid://b2maarsg7u3po" path="res://assets/characters/coco/npc_coco.tscn" id="18_tn7yc"] +[ext_resource type="PackedScene" uid="uid://dsqlhcfl242ad" path="res://assets/objects/item/item.tscn" id="20_5bgl1"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_4e4p4"] panorama = ExtResource("2_d8eiv") @@ -71,14 +72,14 @@ data = PackedVector3Array(5, 0, 5, -5, 0, 5, 5, 0, -5, -5, 0, 5, -5, 0, -5, 5, 0 vertices = PackedVector3Array(1.56663, 0.279793, -3.25, 1.56663, 0.279793, -2.75, 2.31663, 0.279793, -2.5, 4.31663, 0.279793, -3.25, 2.31663, 0.279793, -1.5, 1.56663, 0.279793, 2.5, 8.31663, 0.279793, 2.5, 8.31663, 0.279793, -4.5, 1.56663, 0.279793, -1.25, 4.31663, 0.279793, -4.5, 0.81663, 0.279793, -2.5, -5.68337, 0.279793, -3.25, 0.81663, 0.279793, -1.5, -5.68337, 0.279793, 2.5) polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(4, 3, 5), PackedInt32Array(5, 3, 6), PackedInt32Array(6, 3, 7), PackedInt32Array(4, 2, 3), PackedInt32Array(5, 8, 4), PackedInt32Array(3, 9, 7), PackedInt32Array(1, 10, 0), PackedInt32Array(0, 10, 11), PackedInt32Array(8, 5, 12), PackedInt32Array(12, 5, 13), PackedInt32Array(12, 13, 11), PackedInt32Array(11, 10, 12)] -[sub_resource type="ViewportTexture" id="ViewportTexture_cn41h"] +[sub_resource type="ViewportTexture" id="ViewportTexture_gbdjc"] viewport_path = NodePath("NavigationRegion3D/MeshInstance3D/SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mdr1l"] transparency = 2 alpha_scissor_threshold = 0.5 alpha_antialiasing_mode = 0 -albedo_texture = SubResource("ViewportTexture_cn41h") +albedo_texture = SubResource("ViewportTexture_gbdjc") metallic_specular = 0.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lrfyr"] @@ -268,3 +269,10 @@ mesh = SubResource("BoxMesh_0b70n") [node name="Water" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.976, 1.156) mesh = SubResource("PlaneMesh_me2s6") + +[node name="Item" parent="." instance=ExtResource("20_5bgl1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.259656, 0.342733, 0.528481) + +[node name="Item2" parent="." instance=ExtResource("20_5bgl1")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.806831, 0.342733, 0.528481) +spine_item_name = "item_2" diff --git a/assets/objects/item/item.gd b/assets/objects/item/item.gd new file mode 100644 index 0000000..b5e5cb8 --- /dev/null +++ b/assets/objects/item/item.gd @@ -0,0 +1,29 @@ +extends Node3D + +@export var spine_item_name: String = "item_1" +@onready var spine_sprite: SpineSprite = $MeshInstance3D/SubViewport/SpineSprite + +func _ready() -> void: + var s = spine_sprite.get_skeleton() + var attachment = s.get_attachment_by_slot_name("item_1", spine_item_name) + var slot = s.find_slot("item_1") + slot.set_attachment(attachment) + +func drop() -> void: + #enable physics + #random angle throw + #signal item dropped + pass + +func use() -> void: + #call item interface + #signal item dropped + pass + +func pick_up() -> void: + #signal item picked up for cutscene manager + #insert item into inventory + pass + +func _process(delta: float) -> void: + pass diff --git a/assets/objects/item/item.tscn b/assets/objects/item/item.tscn new file mode 100644 index 0000000..2068c03 --- /dev/null +++ b/assets/objects/item/item.tscn @@ -0,0 +1,52 @@ +[gd_scene load_steps=10 format=3 uid="uid://dsqlhcfl242ad"] + +[ext_resource type="Script" path="res://assets/objects/item/item.gd" id="1_l40y6"] +[ext_resource type="Script" path="res://src/viewport.gd" id="2_dn20s"] +[ext_resource type="SpineAtlasResource" uid="uid://dtcp0wdx470vn" path="res://assets/objects/item/skeleton.atlas" id="3_g0ch2"] +[ext_resource type="SpineSkeletonFileResource" uid="uid://bnnwn2tp65bvm" path="res://assets/objects/item/skeleton.skel" id="4_1g1tc"] + +[sub_resource type="ViewportTexture" id="ViewportTexture_ls2ql"] +viewport_path = NodePath("MeshInstance3D/SubViewport") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_fy03b"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_81h8m"] +next_pass = SubResource("ShaderMaterial_fy03b") +transparency = 1 +shading_mode = 0 +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = SubResource("ViewportTexture_ls2ql") +texture_filter = 0 +billboard_mode = 1 + +[sub_resource type="QuadMesh" id="QuadMesh_vace3"] +size = Vector2(1.2, 1.2) + +[sub_resource type="SpineSkeletonDataResource" id="SpineSkeletonDataResource_ht4lw"] +atlas_res = ExtResource("3_g0ch2") +skeleton_file_res = ExtResource("4_1g1tc") + +[node name="Item" type="Node3D"] +script = ExtResource("1_l40y6") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +layers = 2 +material_override = SubResource("StandardMaterial3D_81h8m") +cast_shadow = 0 +mesh = SubResource("QuadMesh_vace3") +script = ExtResource("2_dn20s") + +[node name="SubViewport" type="SubViewport" parent="MeshInstance3D"] +transparent_bg = true +handle_input_locally = false +canvas_cull_mask = 4294966273 +size_2d_override_stretch = true + +[node name="SpineSprite" type="SpineSprite" parent="MeshInstance3D/SubViewport"] +position = Vector2(224, 255) +skeleton_data_res = SubResource("SpineSkeletonDataResource_ht4lw") +preview_skin = "default" +preview_animation = "animation" +preview_frame = true +preview_time = 0.79 diff --git a/assets/objects/item/skeleton.atlas b/assets/objects/item/skeleton.atlas new file mode 100644 index 0000000..8cac94a --- /dev/null +++ b/assets/objects/item/skeleton.atlas @@ -0,0 +1,15 @@ +skeleton.png +size:132,120 +filter:Linear,Linear +scale:0.5 +item_1 +bounds:68,2,60,57 +offsets:1,0,62,57 +item_2 +bounds:68,61,62,57 +offsets:0,1,63,58 +item_3 +bounds:2,2,52,64 +rotate:90 +item_4 +bounds:2,56,64,62 diff --git a/assets/objects/item/skeleton.atlas.import b/assets/objects/item/skeleton.atlas.import new file mode 100644 index 0000000..a103dfb --- /dev/null +++ b/assets/objects/item/skeleton.atlas.import @@ -0,0 +1,15 @@ +[remap] + +importer="spine.atlas" +type="SpineAtlasResource" +uid="uid://dtcp0wdx470vn" +path="res://.godot/imported/skeleton.atlas-57ed2ec9e8c8fe884c0962642e281f77.spatlas" + +[deps] + +source_file="res://assets/objects/item/skeleton.atlas" +dest_files=["res://.godot/imported/skeleton.atlas-57ed2ec9e8c8fe884c0962642e281f77.spatlas"] + +[params] + +normal_map_prefix="n" diff --git a/assets/objects/item/skeleton.png b/assets/objects/item/skeleton.png new file mode 100644 index 0000000..91289a1 Binary files /dev/null and b/assets/objects/item/skeleton.png differ diff --git a/assets/objects/item/skeleton.png.import b/assets/objects/item/skeleton.png.import new file mode 100644 index 0000000..7e63ec2 --- /dev/null +++ b/assets/objects/item/skeleton.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://e8v5a5nc3lc" +path="res://.godot/imported/skeleton.png-8c56ffd8c139f864fbe1c0793f44f14f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/objects/item/skeleton.png" +dest_files=["res://.godot/imported/skeleton.png-8c56ffd8c139f864fbe1c0793f44f14f.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/assets/objects/item/skeleton.skel b/assets/objects/item/skeleton.skel new file mode 100644 index 0000000..929a53f Binary files /dev/null and b/assets/objects/item/skeleton.skel differ diff --git a/assets/objects/item/skeleton.skel.import b/assets/objects/item/skeleton.skel.import new file mode 100644 index 0000000..d3aca19 --- /dev/null +++ b/assets/objects/item/skeleton.skel.import @@ -0,0 +1,14 @@ +[remap] + +importer="spine.skel" +type="SpineSkeletonFileResource" +uid="uid://bnnwn2tp65bvm" +path="res://.godot/imported/skeleton.skel-c8b44514fdb5edd831b4b4a91d40e590.spskel" + +[deps] + +source_file="res://assets/objects/item/skeleton.skel" +dest_files=["res://.godot/imported/skeleton.skel-c8b44514fdb5edd831b4b4a91d40e590.spskel"] + +[params] + diff --git a/assets/spine/coco-walk/coco.spine b/assets/spine/coco-walk/coco.spine index c9702e4..4c1cc87 100644 Binary files a/assets/spine/coco-walk/coco.spine and b/assets/spine/coco-walk/coco.spine differ diff --git a/assets/spine/coco-walk/images/coco_body_1.png b/assets/spine/coco-walk/images/coco_body_1.png index 29ea047..8220407 100644 Binary files a/assets/spine/coco-walk/images/coco_body_1.png and b/assets/spine/coco-walk/images/coco_body_1.png differ diff --git a/assets/spine/coco-walk/images/coco_briefs.png b/assets/spine/coco-walk/images/coco_briefs.png new file mode 100644 index 0000000..3fca948 Binary files /dev/null and b/assets/spine/coco-walk/images/coco_briefs.png differ diff --git a/assets/spine/coco-walk/images/coco_briefs.png.import b/assets/spine/coco-walk/images/coco_briefs.png.import new file mode 100644 index 0000000..2cbe79e --- /dev/null +++ b/assets/spine/coco-walk/images/coco_briefs.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://k08q73y8pki1" +path="res://.godot/imported/coco_briefs.png-19dddca9f936ce36f88489811329faa6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/coco-walk/images/coco_briefs.png" +dest_files=["res://.godot/imported/coco_briefs.png-19dddca9f936ce36f88489811329faa6.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/assets/spine/coco-walk/images/coco_head_1.png b/assets/spine/coco-walk/images/coco_head_1.png index 32cd6b1..d8ee662 100644 Binary files a/assets/spine/coco-walk/images/coco_head_1.png and b/assets/spine/coco-walk/images/coco_head_1.png differ diff --git a/assets/spine/coco-walk/images/coco_pupil_front_1.png b/assets/spine/coco-walk/images/coco_pupil_front_1.png index 8f9b04a..8f0c131 100644 Binary files a/assets/spine/coco-walk/images/coco_pupil_front_1.png and b/assets/spine/coco-walk/images/coco_pupil_front_1.png differ diff --git a/assets/spine/coco-walk/images/spine.json b/assets/spine/coco-walk/images/spine.json index 3274be0..a42b628 100644 --- a/assets/spine/coco-walk/images/spine.json +++ b/assets/spine/coco-walk/images/spine.json @@ -10,7 +10,7 @@ "name": "test", "parent": "root", "length": 0, - "x": 179.5000000000009, + "x": 69.50000000000045, "y": 1334.4999999999995 } ], @@ -45,6 +45,12 @@ "attachment": "coco_body_1", "blend": "normal" }, + { + "name": "coco_briefs", + "bone": "root", + "attachment": "coco_briefs", + "blend": "normal" + }, { "name": "coco_body_2", "bone": "root", @@ -152,7 +158,7 @@ "default": { "coco_arm_back_1": { "coco_arm_back_1": { - "x": 43.0, + "x": -67.0, "y": 787.0, "width": 200, "height": 346 @@ -160,7 +166,7 @@ }, "coco_leg_front_1": { "coco_leg_front_1": { - "x": -164.0, + "x": -274.0, "y": 310.0, "width": 244, "height": 824 @@ -168,7 +174,7 @@ }, "coco_leg_back_1": { "coco_leg_back_1": { - "x": 9.0, + "x": -101.0, "y": 320.5, "width": 184, "height": 829 @@ -176,7 +182,7 @@ }, "coco_leg_back_2": { "coco_leg_back_2": { - "x": 428.5, + "x": 318.5, "y": 345.5, "width": 175, "height": 783 @@ -184,15 +190,23 @@ }, "coco_body_1": { "coco_body_1": { - "x": -92.0, - "y": 788.0, + "x": -202.0, + "y": 770.5, "width": 278, - "height": 458 + "height": 423 + } + }, + "coco_briefs": { + "coco_briefs": { + "x": -186.0, + "y": 580.5, + "width": 352, + "height": 213 } }, "coco_body_2": { "coco_body_2": { - "x": 528.0, + "x": 418.0, "y": 790.5, "width": 278, "height": 423 @@ -200,7 +214,7 @@ }, "coco_hand_back_1": { "coco_hand_back_1": { - "x": 150.5, + "x": 40.5, "y": 631.0, "width": 121, "height": 118 @@ -208,7 +222,7 @@ }, "coco_arm_front_1": { "coco_arm_front_1": { - "x": -258.5, + "x": -368.5, "y": 772.0, "width": 175, "height": 396 @@ -216,7 +230,7 @@ }, "coco_leg_front_2": { "coco_leg_front_2": { - "x": 869.5, + "x": 759.5, "y": 339.0, "width": 847, "height": 760 @@ -224,7 +238,7 @@ }, "Copy of coco_arm_front_1": { "Copy of coco_arm_front_1": { - "x": 641.5, + "x": 531.5, "y": 753.5, "width": 245, "height": 419 @@ -232,7 +246,7 @@ }, "coco_hand_front_1": { "coco_hand_front_1": { - "x": -333.5, + "x": -443.5, "y": 588.0, "width": 157, "height": 122 @@ -240,7 +254,7 @@ }, "coco_ponytail_1": { "coco_ponytail_1": { - "x": -561.0, + "x": -671.0, "y": 1485.5, "width": 180, "height": 375 @@ -248,7 +262,7 @@ }, "makeup_shotgun": { "makeup_shotgun": { - "x": 403.5, + "x": 293.5, "y": 1760.0, "width": 685, "height": 250 @@ -256,7 +270,7 @@ }, "makeup_shotgun_fx_0": { "makeup_shotgun_fx_0": { - "x": 867.5, + "x": 757.5, "y": 1838.5, "width": 151, "height": 171 @@ -264,7 +278,7 @@ }, "makeup_shotgun_fx_1": { "makeup_shotgun_fx_1": { - "x": 1298.0, + "x": 1188.0, "y": 1847.0, "width": 414, "height": 498 @@ -272,7 +286,7 @@ }, "coco_laptop_1": { "coco_laptop_1": { - "x": 927.0, + "x": 817.0, "y": 1504.5, "width": 396, "height": 233 @@ -280,7 +294,7 @@ }, "coco_eyewhite_1": { "coco_eyewhite_1": { - "x": -77.0, + "x": -187.0, "y": 1116.0, "width": 218, "height": 208 @@ -288,7 +302,7 @@ }, "coco_pupil_back_1": { "coco_pupil_back_1": { - "x": -25.5, + "x": -135.5, "y": 1087.0, "width": 27, "height": 54 @@ -296,15 +310,15 @@ }, "coco_pupil_front_1": { "coco_pupil_front_1": { - "x": -98.5, - "y": 1062.0, - "width": 55, - "height": 124 + "x": -219.0, + "y": 1095.5, + "width": 34, + "height": 57 } }, "coco_head_1": { "coco_head_1": { - "x": -53.5, + "x": -163.5, "y": 1130.5, "width": 443, "height": 349 @@ -312,7 +326,7 @@ }, "coco_head_2": { "coco_head_2": { - "x": 529.5, + "x": 419.5, "y": 1136.5, "width": 411, "height": 361 diff --git a/assets/spine/item/images/item_1.png b/assets/spine/item/images/item_1.png new file mode 100644 index 0000000..5813584 Binary files /dev/null and b/assets/spine/item/images/item_1.png differ diff --git a/assets/spine/item/images/item_1.png.import b/assets/spine/item/images/item_1.png.import new file mode 100644 index 0000000..c1cc649 --- /dev/null +++ b/assets/spine/item/images/item_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://biqkmgi4viv7q" +path="res://.godot/imported/item_1.png-5eb20d4e60db138a1c2e92e3317a9f71.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/item/images/item_1.png" +dest_files=["res://.godot/imported/item_1.png-5eb20d4e60db138a1c2e92e3317a9f71.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/assets/spine/item/images/item_2.png b/assets/spine/item/images/item_2.png new file mode 100644 index 0000000..4ac6ba1 Binary files /dev/null and b/assets/spine/item/images/item_2.png differ diff --git a/assets/spine/item/images/item_2.png.import b/assets/spine/item/images/item_2.png.import new file mode 100644 index 0000000..b67901b --- /dev/null +++ b/assets/spine/item/images/item_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccotnbcgbb8cn" +path="res://.godot/imported/item_2.png-0e21b42358a63dc67c4921f86e594a4d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/item/images/item_2.png" +dest_files=["res://.godot/imported/item_2.png-0e21b42358a63dc67c4921f86e594a4d.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/assets/spine/item/images/item_3.png b/assets/spine/item/images/item_3.png new file mode 100644 index 0000000..114dbfc Binary files /dev/null and b/assets/spine/item/images/item_3.png differ diff --git a/assets/spine/item/images/item_3.png.import b/assets/spine/item/images/item_3.png.import new file mode 100644 index 0000000..3c24e32 --- /dev/null +++ b/assets/spine/item/images/item_3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cub0nhtu3dhpn" +path="res://.godot/imported/item_3.png-291a3bc1cdb44116e9a44f6dba3c0fc6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/item/images/item_3.png" +dest_files=["res://.godot/imported/item_3.png-291a3bc1cdb44116e9a44f6dba3c0fc6.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/assets/spine/item/images/item_4.png b/assets/spine/item/images/item_4.png new file mode 100644 index 0000000..df61a4b Binary files /dev/null and b/assets/spine/item/images/item_4.png differ diff --git a/assets/spine/item/images/item_4.png.import b/assets/spine/item/images/item_4.png.import new file mode 100644 index 0000000..cad5952 --- /dev/null +++ b/assets/spine/item/images/item_4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://e8ht7gsae8kt" +path="res://.godot/imported/item_4.png-fa52b4b8e7442698cd9d9ad0b06d0145.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/item/images/item_4.png" +dest_files=["res://.godot/imported/item_4.png-fa52b4b8e7442698cd9d9ad0b06d0145.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/assets/spine/item/item.spine b/assets/spine/item/item.spine new file mode 100644 index 0000000..baa9d80 Binary files /dev/null and b/assets/spine/item/item.spine differ diff --git a/assets/spine/pasadena/images/item_1.png b/assets/spine/pasadena/images/item_1.png new file mode 100644 index 0000000..5813584 Binary files /dev/null and b/assets/spine/pasadena/images/item_1.png differ diff --git a/assets/spine/pasadena/images/item_1.png.import b/assets/spine/pasadena/images/item_1.png.import new file mode 100644 index 0000000..4482285 --- /dev/null +++ b/assets/spine/pasadena/images/item_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clfn1o81s1v12" +path="res://.godot/imported/item_1.png-eef4618291449e640d06c3fa65f68c86.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/item_1.png" +dest_files=["res://.godot/imported/item_1.png-eef4618291449e640d06c3fa65f68c86.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/assets/spine/pasadena/images/item_2.png b/assets/spine/pasadena/images/item_2.png new file mode 100644 index 0000000..4ac6ba1 Binary files /dev/null and b/assets/spine/pasadena/images/item_2.png differ diff --git a/assets/spine/pasadena/images/item_2.png.import b/assets/spine/pasadena/images/item_2.png.import new file mode 100644 index 0000000..cb74f8f --- /dev/null +++ b/assets/spine/pasadena/images/item_2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7ka65ejsjtrk" +path="res://.godot/imported/item_2.png-ad7cccf641826b48eec7dd4d4713c7d9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/item_2.png" +dest_files=["res://.godot/imported/item_2.png-ad7cccf641826b48eec7dd4d4713c7d9.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/assets/spine/pasadena/images/item_3.png b/assets/spine/pasadena/images/item_3.png new file mode 100644 index 0000000..114dbfc Binary files /dev/null and b/assets/spine/pasadena/images/item_3.png differ diff --git a/assets/spine/pasadena/images/item_3.png.import b/assets/spine/pasadena/images/item_3.png.import new file mode 100644 index 0000000..3b7a1dd --- /dev/null +++ b/assets/spine/pasadena/images/item_3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bboq4vb73n424" +path="res://.godot/imported/item_3.png-b62c6590825008e6ddb813cd8ac2aa38.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/item_3.png" +dest_files=["res://.godot/imported/item_3.png-b62c6590825008e6ddb813cd8ac2aa38.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/assets/spine/pasadena/images/item_4.png b/assets/spine/pasadena/images/item_4.png new file mode 100644 index 0000000..df61a4b Binary files /dev/null and b/assets/spine/pasadena/images/item_4.png differ diff --git a/assets/spine/pasadena/images/item_4.png.import b/assets/spine/pasadena/images/item_4.png.import new file mode 100644 index 0000000..335bb73 --- /dev/null +++ b/assets/spine/pasadena/images/item_4.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bfcpbdgvwvygr" +path="res://.godot/imported/item_4.png-be3df2013c97deb86f16185533b022a2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/item_4.png" +dest_files=["res://.godot/imported/item_4.png-be3df2013c97deb86f16185533b022a2.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/assets/spine/pasadena/images/pasadena_arm_back_1.png b/assets/spine/pasadena/images/pasadena_arm_back_1.png new file mode 100644 index 0000000..e474712 Binary files /dev/null and b/assets/spine/pasadena/images/pasadena_arm_back_1.png differ diff --git a/assets/spine/pasadena/images/pasadena_arm_back_1.png.import b/assets/spine/pasadena/images/pasadena_arm_back_1.png.import new file mode 100644 index 0000000..31b2fc2 --- /dev/null +++ b/assets/spine/pasadena/images/pasadena_arm_back_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ooucf6beq4mt" +path="res://.godot/imported/pasadena_arm_back_1.png-531fff79df71b9b14f1b664d49134fa1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/pasadena_arm_back_1.png" +dest_files=["res://.godot/imported/pasadena_arm_back_1.png-531fff79df71b9b14f1b664d49134fa1.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/assets/spine/pasadena/images/pasadena_arm_front_1.png b/assets/spine/pasadena/images/pasadena_arm_front_1.png new file mode 100644 index 0000000..4ecb86e Binary files /dev/null and b/assets/spine/pasadena/images/pasadena_arm_front_1.png differ diff --git a/assets/spine/pasadena/images/pasadena_arm_front_1.png.import b/assets/spine/pasadena/images/pasadena_arm_front_1.png.import new file mode 100644 index 0000000..e12e3e1 --- /dev/null +++ b/assets/spine/pasadena/images/pasadena_arm_front_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhowtuuwnjena" +path="res://.godot/imported/pasadena_arm_front_1.png-bac93ee057271c9e0754bed00d18568c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/pasadena_arm_front_1.png" +dest_files=["res://.godot/imported/pasadena_arm_front_1.png-bac93ee057271c9e0754bed00d18568c.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/assets/spine/pasadena/images/pasadena_body_1.png b/assets/spine/pasadena/images/pasadena_body_1.png new file mode 100644 index 0000000..4844597 Binary files /dev/null and b/assets/spine/pasadena/images/pasadena_body_1.png differ diff --git a/assets/spine/pasadena/images/pasadena_body_1.png.import b/assets/spine/pasadena/images/pasadena_body_1.png.import new file mode 100644 index 0000000..fe95de2 --- /dev/null +++ b/assets/spine/pasadena/images/pasadena_body_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bof452tdvki88" +path="res://.godot/imported/pasadena_body_1.png-69c6fbd8bf00b727755c3d8af71343c5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/pasadena_body_1.png" +dest_files=["res://.godot/imported/pasadena_body_1.png-69c6fbd8bf00b727755c3d8af71343c5.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/assets/spine/pasadena/images/pasadena_head_1.png b/assets/spine/pasadena/images/pasadena_head_1.png new file mode 100644 index 0000000..5e309cb Binary files /dev/null and b/assets/spine/pasadena/images/pasadena_head_1.png differ diff --git a/assets/spine/pasadena/images/pasadena_head_1.png.import b/assets/spine/pasadena/images/pasadena_head_1.png.import new file mode 100644 index 0000000..ef17a41 --- /dev/null +++ b/assets/spine/pasadena/images/pasadena_head_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://najrjdwk2f4k" +path="res://.godot/imported/pasadena_head_1.png-8e5915c5bc97b80edc7afac9f3d3bd69.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/pasadena_head_1.png" +dest_files=["res://.godot/imported/pasadena_head_1.png-8e5915c5bc97b80edc7afac9f3d3bd69.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/assets/spine/pasadena/images/pasadena_neckerchief_1.png b/assets/spine/pasadena/images/pasadena_neckerchief_1.png new file mode 100644 index 0000000..3117809 Binary files /dev/null and b/assets/spine/pasadena/images/pasadena_neckerchief_1.png differ diff --git a/assets/spine/pasadena/images/pasadena_neckerchief_1.png.import b/assets/spine/pasadena/images/pasadena_neckerchief_1.png.import new file mode 100644 index 0000000..c63cd7c --- /dev/null +++ b/assets/spine/pasadena/images/pasadena_neckerchief_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dy504dwcmdcbp" +path="res://.godot/imported/pasadena_neckerchief_1.png-3e297126810f5766d8aaf1249458463c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/pasadena_neckerchief_1.png" +dest_files=["res://.godot/imported/pasadena_neckerchief_1.png-3e297126810f5766d8aaf1249458463c.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/assets/spine/pasadena/images/pasadena_tail_1.png b/assets/spine/pasadena/images/pasadena_tail_1.png new file mode 100644 index 0000000..1c03d6b Binary files /dev/null and b/assets/spine/pasadena/images/pasadena_tail_1.png differ diff --git a/assets/spine/pasadena/images/pasadena_tail_1.png.import b/assets/spine/pasadena/images/pasadena_tail_1.png.import new file mode 100644 index 0000000..526df9f --- /dev/null +++ b/assets/spine/pasadena/images/pasadena_tail_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ckkim0p1gdihs" +path="res://.godot/imported/pasadena_tail_1.png-61809164a730b65becfc391337082ad8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/pasadena/images/pasadena_tail_1.png" +dest_files=["res://.godot/imported/pasadena_tail_1.png-61809164a730b65becfc391337082ad8.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/assets/spine/pasadena/images/spine.json b/assets/spine/pasadena/images/spine.json new file mode 100644 index 0000000..f49960f --- /dev/null +++ b/assets/spine/pasadena/images/spine.json @@ -0,0 +1,157 @@ +{ + "skeleton": { + "images": "/home/user/Projects/Games/Test/assets/spine/pasadena/images/" + }, + "bones": [ + { + "name": "root" + } + ], + "slots": [ + { + "name": "item_4", + "bone": "root", + "attachment": "item_4", + "blend": "normal" + }, + { + "name": "item_3", + "bone": "root", + "attachment": "item_3", + "blend": "normal" + }, + { + "name": "item_2", + "bone": "root", + "attachment": "item_2", + "blend": "normal" + }, + { + "name": "item_1", + "bone": "root", + "attachment": "item_1", + "blend": "normal" + }, + { + "name": "pasadena_arm_back_1", + "bone": "root", + "attachment": "pasadena_arm_back_1", + "blend": "normal" + }, + { + "name": "pasadena_body_1", + "bone": "root", + "attachment": "pasadena_body_1", + "blend": "normal" + }, + { + "name": "pasadena_tail_1", + "bone": "root", + "attachment": "pasadena_tail_1", + "blend": "normal" + }, + { + "name": "pasadena_neckerchief_1", + "bone": "root", + "attachment": "pasadena_neckerchief_1", + "blend": "normal" + }, + { + "name": "pasadena_head_1", + "bone": "root", + "attachment": "pasadena_head_1", + "blend": "normal" + }, + { + "name": "pasadena_arm_front_1", + "bone": "root", + "attachment": "pasadena_arm_front_1", + "blend": "normal" + } + ], + "skins": { + "default": { + "item_4": { + "item_4": { + "x": -2076.0, + "y": 914.5, + "width": 128, + "height": 123 + } + }, + "item_3": { + "item_3": { + "x": -2013.0, + "y": 1116.5, + "width": 104, + "height": 127 + } + }, + "item_2": { + "item_2": { + "x": -1956.0, + "y": 1292.0, + "width": 126, + "height": 116 + } + }, + "item_1": { + "item_1": { + "x": -1776.0, + "y": 1450.5, + "width": 124, + "height": 113 + } + }, + "pasadena_arm_back_1": { + "pasadena_arm_back_1": { + "x": -1232.5, + "y": 802.5, + "width": 279, + "height": 549 + } + }, + "pasadena_body_1": { + "pasadena_body_1": { + "x": -1060.5, + "y": 443.5, + "width": 437, + "height": 1369 + } + }, + "pasadena_tail_1": { + "pasadena_tail_1": { + "x": -431.5, + "y": 628.5, + "width": 1081, + "height": 69 + } + }, + "pasadena_neckerchief_1": { + "pasadena_neckerchief_1": { + "x": -1098.0, + "y": 1054.0, + "width": 264, + "height": 106 + } + }, + "pasadena_head_1": { + "pasadena_head_1": { + "x": -973.5, + "y": 1222.5, + "width": 599, + "height": 565 + } + }, + "pasadena_arm_front_1": { + "pasadena_arm_front_1": { + "x": -877.5, + "y": 754.5, + "width": 319, + "height": 675 + } + } + } + }, + "animations": {} +} \ No newline at end of file diff --git a/assets/spine/pasadena/pasadena.spine b/assets/spine/pasadena/pasadena.spine new file mode 100644 index 0000000..1a89f9b Binary files /dev/null and b/assets/spine/pasadena/pasadena.spine differ diff --git a/assets/spine/tawna/shadow.png b/assets/spine/tawna/shadow.png new file mode 100644 index 0000000..41b4f29 Binary files /dev/null and b/assets/spine/tawna/shadow.png differ diff --git a/assets/spine/tawna/shadow.png.import b/assets/spine/tawna/shadow.png.import new file mode 100644 index 0000000..fa1564e --- /dev/null +++ b/assets/spine/tawna/shadow.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bn80qvekf4agt" +path="res://.godot/imported/shadow.png-463803cfe64263b3fc4a84f3955241a7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/spine/tawna/shadow.png" +dest_files=["res://.godot/imported/shadow.png-463803cfe64263b3fc4a84f3955241a7.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/assets/spine/tawna/spine.json b/assets/spine/tawna/spine.json index 3004078..e094cf8 100644 --- a/assets/spine/tawna/spine.json +++ b/assets/spine/tawna/spine.json @@ -25,33 +25,47 @@ "bone": "root", "attachment": "tawna2", "blend": "normal" + }, + { + "name": "shadow", + "bone": "root", + "attachment": "shadow", + "blend": "normal" } ], "skins": { "default": { "hairpin": { "hairpin": { - "x": 3667.36, - "y": -2791.74, + "x": -212.0, + "y": 947.5, "width": 94, "height": 113 } }, "tawna": { "tawna": { - "x": 3424.86, - "y": -3257.24, + "x": -454.5, + "y": 482.0, "width": 487, "height": 1152 } }, "tawna2": { "tawna2": { - "x": 3424.86, - "y": -3257.24, + "x": -454.5, + "y": 482.0, "width": 487, "height": 1152 } + }, + "shadow": { + "shadow": { + "x": -1385.5, + "y": 833.5, + "width": 193, + "height": 193 + } } } }, diff --git a/project.godot b/project.godot index 3a3b2f1..939303d 100644 --- a/project.godot +++ b/project.godot @@ -25,8 +25,8 @@ Messagebus="*res://src/messagebus.gd" [display] -window/size/viewport_width=1920 -window/size/viewport_height=1080 +window/size/viewport_width=1024 +window/size/viewport_height=768 window/size/resizable=false window/stretch/mode="viewport" window/vsync/vsync_mode=0 @@ -108,6 +108,11 @@ Pause={ "events": [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":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } +crouch={ +"deadzone": 0.5, +"events": [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":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} [input_devices] diff --git a/src/item.gd b/src/item.gd new file mode 100644 index 0000000..1bbc9ce --- /dev/null +++ b/src/item.gd @@ -0,0 +1,19 @@ +extends Node +class_name Item + +@export var item_name: String = "Unknown" +@export var item_sprite: SpineSprite + +func get_item_index(): + pass + +func get_total_items(): + pass + +func _ready() -> void: + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/src/spine_sprite.gd b/src/spine_sprite.gd index 18b5ec2..e65c463 100644 --- a/src/spine_sprite.gd +++ b/src/spine_sprite.gd @@ -3,10 +3,7 @@ extends SpineSprite @export var time_scale:= 1.0 func _ready() -> void: - var a = get_animation_state() - if a: - a.set_animation("animation", true, 0) - a.set_time_scale(time_scale) + pass func _process(delta: float) -> void: pass diff --git a/src/viewport.gd b/src/viewport.gd index 44dbfde..baf13e9 100644 --- a/src/viewport.gd +++ b/src/viewport.gd @@ -4,6 +4,3 @@ extends MeshInstance3D func _ready(): if material_override != null: material_override.albedo_texture = $SubViewport.get_texture() - -#func _process(delta): - #self.look_at(camera.global_position, Vector3.UP, true)