diff --git a/level/scenes/BaseWeaponScene.tscn b/level/scenes/BaseWeaponScene.tscn index b19a5f0..e8896ba 100644 --- a/level/scenes/BaseWeaponScene.tscn +++ b/level/scenes/BaseWeaponScene.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c76hql634gf5"] -[ext_resource type="ArrayMesh" uid="uid://cc1kxfbkvpo2d" path="res://assets/Objects/swordlowpoly.obj" id="1_8p8s3"] +[ext_resource type="ArrayMesh" uid="uid://ci1itpjmauvrp" path="res://assets/Objects/swordlowpoly.obj" id="1_8p8s3"] [node name="BaseWeaponScene" type="Node3D"] diff --git a/level/scenes/player.tscn b/level/scenes/player.tscn index 73405a5..7716c7f 100644 --- a/level/scenes/player.tscn +++ b/level/scenes/player.tscn @@ -1,14 +1,14 @@ [gd_scene load_steps=48 format=4 uid="uid://cffjduipbb3s5"] [ext_resource type="Script" uid="uid://c2si8gkbnde0c" path="res://level/scripts/player.gd" id="1_tdh26"] -[ext_resource type="Texture2D" uid="uid://bdg48m6l86q8i" path="res://assets/characters/player/3DGodotRobot_GodotPalette.png" id="1_w11jc"] +[ext_resource type="Texture2D" uid="uid://5cevtcic4bab" path="res://assets/characters/player/3DGodotRobot_GodotPalette.png" id="1_w11jc"] [ext_resource type="Script" uid="uid://v8j54rbc0ik" path="res://level/scripts/3d_godot_robot.gd" id="2_mexc5"] -[ext_resource type="Texture2D" uid="uid://cw6pxwst2gh85" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotYellowPalette.png" id="3_l3dv8"] -[ext_resource type="Texture2D" uid="uid://bbid6mowxhd5b" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotGreenPalette.png" id="4_74ree"] -[ext_resource type="Texture2D" uid="uid://fpmmv2oxjcdv" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotPalette.png" id="4_max2b"] +[ext_resource type="Texture2D" uid="uid://bx1whlf637r18" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotYellowPalette.png" id="3_l3dv8"] +[ext_resource type="Texture2D" uid="uid://cjqqgbprwdl6h" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotGreenPalette.png" id="4_74ree"] +[ext_resource type="Texture2D" uid="uid://b1wwwro3s4m16" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotPalette.png" id="4_max2b"] [ext_resource type="Script" uid="uid://bj7yrijm7bppq" path="res://level/scripts/spring_arm_offset.gd" id="4_ygggd"] -[ext_resource type="Texture2D" uid="uid://brp1gy30s4rks" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotRedPalette.png" id="5_qlefn"] -[ext_resource type="ArrayMesh" uid="uid://dmottq5u3my52" path="res://assets/characters/Lobster/10029_Lobster_v1_iterations-2.obj" id="8_jeskb"] +[ext_resource type="Texture2D" uid="uid://1p20xwfvvfk2" path="res://assets/characters/player/GodotRobotPaletteSwap/GodotRedPalette.png" id="5_qlefn"] +[ext_resource type="ArrayMesh" uid="uid://dy0xld0fpulmk" path="res://assets/characters/Lobster/10029_Lobster_v1_iterations-2.obj" id="8_jeskb"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_mx45w"] radius = 0.35796 diff --git a/level/scenes/weapons/LobsterAxeMesh.tscn b/level/scenes/weapons/LobsterAxeMesh.tscn index dcb0e6c..c24c5dd 100644 --- a/level/scenes/weapons/LobsterAxeMesh.tscn +++ b/level/scenes/weapons/LobsterAxeMesh.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://cq8r5mkn3wvxj"] -[ext_resource type="PackedScene" uid="uid://cejg4ixtc5xsf" path="res://level/scenes/weapons/LobsterAxe.glb" id="1_lobster"] +[ext_resource type="PackedScene" uid="uid://bk5akj878m2a3" path="res://level/scenes/weapons/LobsterAxe.glb" id="1_lobster"] [ext_resource type="Script" uid="uid://jyas86y3f0jp" path="res://level/scripts/hit_box.gd" id="2_hitbox"] [sub_resource type="BoxShape3D" id="BoxShape3D_lobster"] diff --git a/level/scenes/weapons/TestSwordMesh.tscn b/level/scenes/weapons/TestSwordMesh.tscn index 3ae9154..ccf4a4c 100644 --- a/level/scenes/weapons/TestSwordMesh.tscn +++ b/level/scenes/weapons/TestSwordMesh.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://rkvkbxlweo60"] -[ext_resource type="PackedScene" uid="uid://df31n55xyn27i" path="res://assets/Objects/TestSword.glb" id="1_4fdvi"] +[ext_resource type="PackedScene" uid="uid://culurukxpqswh" path="res://assets/Objects/TestSword.glb" id="1_4fdvi"] [ext_resource type="Script" uid="uid://jyas86y3f0jp" path="res://level/scripts/hit_box.gd" id="2_3qhqw"] [sub_resource type="BoxShape3D" id="BoxShape3D_5u25i"] diff --git a/level/scenes/weapons/shield_mesh.tscn b/level/scenes/weapons/shield_mesh.tscn index 66cba5e..e8b1226 100644 --- a/level/scenes/weapons/shield_mesh.tscn +++ b/level/scenes/weapons/shield_mesh.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://rbvk4mg40ceg"] -[ext_resource type="ArrayMesh" uid="uid://rsoymmi6yqhp" path="res://assets/Objects/shield.obj" id="1"] -[ext_resource type="ArrayMesh" uid="uid://dmottq5u3my52" path="res://assets/characters/Lobster/10029_Lobster_v1_iterations-2.obj" id="2_gfu4n"] +[ext_resource type="ArrayMesh" uid="uid://bwpa5ct4buxs0" path="res://assets/Objects/shield.obj" id="1"] +[ext_resource type="ArrayMesh" uid="uid://dy0xld0fpulmk" path="res://assets/characters/Lobster/10029_Lobster_v1_iterations-2.obj" id="2_gfu4n"] [node name="ShieldMesh" type="Node3D"] diff --git a/level/scenes/weapons/sword_mesh.tscn b/level/scenes/weapons/sword_mesh.tscn index 9e778b5..9f84795 100644 --- a/level/scenes/weapons/sword_mesh.tscn +++ b/level/scenes/weapons/sword_mesh.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://dyjfaq654xne3"] -[ext_resource type="ArrayMesh" uid="uid://1wnuqcx2n4xq" path="res://assets/Objects/swordlowpoly.obj" id="1"] +[ext_resource type="ArrayMesh" uid="uid://ci1itpjmauvrp" path="res://assets/Objects/swordlowpoly.obj" id="1"] [ext_resource type="Script" uid="uid://jyas86y3f0jp" path="res://level/scripts/hit_box.gd" id="2_wyi6r"] [sub_resource type="BoxShape3D" id="BoxShape3D_mhdau"] diff --git a/level/scripts/boss_lobster.gd.uid b/level/scripts/boss_lobster.gd.uid new file mode 100644 index 0000000..691e139 --- /dev/null +++ b/level/scripts/boss_lobster.gd.uid @@ -0,0 +1 @@ +uid://b7mbsg83olhh4 diff --git a/level/ui/theme/wow_style.tres b/level/ui/theme/wow_style.tres index bfa9523..42a7876 100644 --- a/level/ui/theme/wow_style.tres +++ b/level/ui/theme/wow_style.tres @@ -1,6 +1,6 @@ -[gd_resource type="Theme" load_steps=2 format=3] +[gd_resource type="Theme" load_steps=2 format=3 uid="uid://dvsh7tuhulnfm"] -[ext_resource type="FontFile" uid="uid://dh88edx2pf6ax" path="res://assets/fonts/Kurland.ttf" id="1_font"] +[ext_resource type="FontFile" uid="uid://wipqjhfqeuwd" path="res://assets/fonts/Kurland.ttf" id="1_font"] [resource] default_font = ExtResource("1_font")