diff --git a/level/resources/weapon_lobsteraxe.tres b/level/resources/weapon_lobsteraxe.tres new file mode 100644 index 0000000..f689a67 --- /dev/null +++ b/level/resources/weapon_lobsteraxe.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" script_class="WeaponData" load_steps=3 format=3] + +[ext_resource type="Script" path="res://level/scripts/weapon_data.gd" id="1"] +[ext_resource type="PackedScene" path="res://level/scenes/weapons/LobsterAxeMesh.tscn" id="2"] + +[resource] +script = ExtResource("1") +weapon_name = "Lobster Axe" +description = "A heavy-hitting axe shaped like a lobster claw. Surprisingly quick for its size." +damage = 18.0 +attack_range = 3.0 +attack_cooldown = 0.7 +knockback_force = 14.0 +attack_animation = "Attack1" +startup_time = 0.18 +active_time = 0.18 +mesh_scene = ExtResource("2") +pickup_radius = 1.5 +weight = 2.5 diff --git a/level/scenes/level.tscn b/level/scenes/level.tscn index d2f3083..9d692ff 100644 --- a/level/scenes/level.tscn +++ b/level/scenes/level.tscn @@ -1,13 +1,14 @@ -[gd_scene load_steps=14 format=3 uid="uid://dugaivbj1o66n"] +[gd_scene load_steps=15 format=3 uid="uid://dugaivbj1o66n"] [ext_resource type="Script" uid="uid://d0dgljwwl463n" path="res://level/scripts/level.gd" id="1_e1sh7"] [ext_resource type="PackedScene" uid="uid://db06e8q8f8bdq" path="res://level/scenes/Player_Lilguy.tscn" id="1_uvcbi"] [ext_resource type="PackedScene" uid="uid://dif4t1y3c07ax" path="res://level/scenes/enemies/practice_dummy.tscn" id="3_i7s07"] [ext_resource type="FontFile" uid="uid://wipqjhfqeuwd" path="res://assets/fonts/Kurland.ttf" id="3_icc4p"] -[ext_resource type="PackedScene" path="res://level/scenes/enemy_spawner.tscn" id="3_spawner"] +[ext_resource type="PackedScene" uid="uid://blm8lav3xh2yw" path="res://level/scenes/enemy_spawner.tscn" id="3_spawner"] [ext_resource type="PackedScene" uid="uid://chkrcwlprbn88" path="res://assets/Objects/Colosseum_10.fbx" id="4_u750a"] [ext_resource type="PackedScene" uid="uid://hd6pq287rgye" path="res://level/scenes/weapons/world_weapon_testsword.tscn" id="5_cwx4m"] [ext_resource type="PackedScene" uid="uid://8c4l6s6x67vh" path="res://level/scenes/weapons/world_weapon_applecorer.tscn" id="6_xerh7"] +[ext_resource type="PackedScene" path="res://level/scenes/weapons/world_weapon_lobsteraxe.tscn" id="7_lobster"] [sub_resource type="PlaneMesh" id="PlaneMesh_r5xs5"] size = Vector2(90, 90) @@ -289,6 +290,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.0268106, 2.6057472, 8.8369 [node name="WorldWeaponSword2" parent="WeaponsContainer" instance=ExtResource("6_xerh7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.32151043, 5.2709904) +[node name="WorldWeaponLobsterAxe" parent="WeaponsContainer" instance=ExtResource("7_lobster")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 0.5, 5) + [node name="EnemiesContainer" type="Node3D" parent="."] [node name="EnemySpawner" parent="." instance=ExtResource("3_spawner")] diff --git a/level/scenes/weapons/LobsterAxe.glb b/level/scenes/weapons/LobsterAxe.glb new file mode 100644 index 0000000..017a8aa Binary files /dev/null and b/level/scenes/weapons/LobsterAxe.glb differ diff --git a/level/scenes/weapons/LobsterAxeMesh.tscn b/level/scenes/weapons/LobsterAxeMesh.tscn new file mode 100644 index 0000000..c5610fb --- /dev/null +++ b/level/scenes/weapons/LobsterAxeMesh.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=4 format=3 uid="uid://cq8r5mkn3wvxj"] + +[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"] +size = Vector3(2.0, 3.2, 0.6) + +[node name="LobsterAxeMesh" type="Node3D"] + +[node name="LobsterAxe" parent="." instance=ExtResource("1_lobster")] +transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, -1.5884135, 0) + +[node name="HitBox" type="Area3D" parent="."] +script = ExtResource("2_hitbox") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="HitBox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1840072, 0) +shape = SubResource("BoxShape3D_lobster") diff --git a/level/scenes/weapons/world_weapon_lobsteraxe.tscn b/level/scenes/weapons/world_weapon_lobsteraxe.tscn new file mode 100644 index 0000000..0448643 --- /dev/null +++ b/level/scenes/weapons/world_weapon_lobsteraxe.tscn @@ -0,0 +1,17 @@ +[gd_scene load_steps=4 format=3 uid="uid://dpk7n3q8mwx2r"] + +[ext_resource type="Script" uid="uid://ccnnd0y4jqiot" path="res://level/scripts/world_weapon.gd" id="1"] +[ext_resource type="Resource" path="res://level/resources/weapon_lobsteraxe.tres" id="2"] + +[sub_resource type="BoxShape3D" id="1"] +size = Vector3(0.4, 0.4, 0.8) + +[node name="WorldWeaponLobsterAxe" type="RigidBody3D"] +collision_layer = 4 +collision_mask = 2 +mass = 2.5 +script = ExtResource("1") +weapon_data = ExtResource("2") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("1")