zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix labels

Browse Source
This commit is contained in:
Zenny
2024-09-08 15:42:08 -07:00
parent a47d1306b9
commit 1dfc61f003
242 changed files with 5502 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/items/InventoryItem.cs
View File

@@ -1,8 +1,5 @@
using Chickensoft.AutoInject;
using Chickensoft.GodotNodeInterfaces;
using Chickensoft.Introspection;
using Godot;
using System.Linq;
namespace GameJamDungeon
{
@@ -13,17 +10,5 @@ namespace GameJamDungeon
public InventoryItemInfo Info { get; }
}
[Meta(typeof(IAutoNode))]
public partial class InventoryItem : Node3D, IInventoryItem
{
public override void _Notification(int what) => this.Notify(what);
[Dependency] public IGameRepo GameRepo => this.DependOn<IGameRepo>();
[Node] public Area3D Pickup { get; set; } = default!;
[Node] public Sprite3D Sprite { get; set; } = default!;
public InventoryItemInfo Info { get; set; } = new InventoryItemInfo();
}
public interface IEquippable;
}

10
src/items/accessory/Accessory.cs
View File

@@ -5,15 +5,21 @@ using Godot;
using System.Linq;
[Meta(typeof(IAutoNode))]
public partial class Accessory : InventoryItem
public partial class Accessory : Node3D, IInventoryItem, IEquippable
{
public override void _Notification(int what) => this.Notify(what);
public new InventoryItemInfo Info => AccessoryInfo;
[Dependency] public IGameRepo GameRepo => this.DependOn<IGameRepo>();
public InventoryItemInfo Info => AccessoryInfo;
[Export]
public AccessoryInfo AccessoryInfo { get; set; }
[Node] public Sprite3D Sprite { get; set; } = default!;
[Node] public Area3D Pickup { get; set; } = default!;
public void OnReady()
{
Sprite.Texture = AccessoryInfo.Texture;

94
src/items/accessory/Accessory.tscn
View File

@@ -1,94 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://b07srt3lckt4e"]
[gd_scene load_steps=3 format=3 uid="uid://b07srt3lckt4e"]
[ext_resource type="Script" path="res://src/items/accessory/Accessory.cs" id="1_ikyk2"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1ceef"]
radius = 0.470016
[sub_resource type="Animation" id="Animation_w4iur"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Pickup:monitoring")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Pickup:monitorable")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
[sub_resource type="Animation" id="Animation_gkdye"]
resource_name = "drop"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5, 1),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Vector3(0, 1, 0), Vector3(-0.752, 0.8, 0), Vector3(-1.50473, 0.09512, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Pickup:monitoring")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Pickup:monitorable")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s2htf"]
_data = {
"RESET": SubResource("Animation_w4iur"),
"drop": SubResource("Animation_gkdye")
}
[node name="Accessory" type="Node3D"]
script = ExtResource("1_ikyk2")
@@ -96,8 +12,6 @@ script = ExtResource("1_ikyk2")
unique_name_in_owner = true
collision_layer = 0
collision_mask = 4
monitoring = false
monitorable = false
[node name="Sprite" type="Sprite3D" parent="Pickup"]
unique_name_in_owner = true
@@ -107,9 +21,3 @@ texture_filter = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"]
shape = SubResource("CapsuleShape3D_1ceef")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_s2htf")
}

10
src/items/armor/Armor.cs
View File

@@ -5,15 +5,21 @@ using Godot;
using System.Linq;
[Meta(typeof(IAutoNode))]
public partial class Armor : InventoryItem
public partial class Armor : Node3D, IInventoryItem, IEquippable
{
public override void _Notification(int what) => this.Notify(what);
public new InventoryItemInfo Info => ArmorInfo;
[Dependency] public IGameRepo GameRepo => this.DependOn<IGameRepo>();
public InventoryItemInfo Info => ArmorInfo;
[Export]
public ArmorInfo ArmorInfo { get; set; }
[Node] public Sprite3D Sprite { get; set; } = default!;
[Node] public Area3D Pickup { get; set; } = default!;
public void OnReady()
{
Sprite.Texture = ArmorInfo.Texture;

94
src/items/armor/Armor.tscn
View File

@@ -1,94 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://dorr7v1tkeiy0"]
[gd_scene load_steps=3 format=3 uid="uid://dorr7v1tkeiy0"]
[ext_resource type="Script" path="res://src/items/armor/Armor.cs" id="1_cmjpq"]
[sub_resource type="BoxShape3D" id="BoxShape3D_qdeu2"]
size = Vector3(0.778381, 0.929947, 0.731567)
[sub_resource type="Animation" id="Animation_w4iur"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Pickup:monitoring")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Pickup:monitorable")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
[sub_resource type="Animation" id="Animation_gkdye"]
resource_name = "drop"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5, 1),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Vector3(0, 1, 0), Vector3(-0.752, 0.8, 0), Vector3(-1.50473, 0.09512, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Pickup:monitoring")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Pickup:monitorable")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s2htf"]
_data = {
"RESET": SubResource("Animation_w4iur"),
"drop": SubResource("Animation_gkdye")
}
[node name="Armor" type="Node3D"]
script = ExtResource("1_cmjpq")
@@ -96,8 +12,6 @@ script = ExtResource("1_cmjpq")
unique_name_in_owner = true
collision_layer = 0
collision_mask = 4
monitoring = false
monitorable = false
[node name="Sprite" type="Sprite3D" parent="Pickup"]
unique_name_in_owner = true
@@ -111,9 +25,3 @@ texture_filter = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0600509, 0.26725, 0.180481)
shape = SubResource("BoxShape3D_qdeu2")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_s2htf")
}

10
src/items/weapons/Weapon.cs
View File

@@ -5,7 +5,7 @@ using Godot;
using System.Linq;
[Meta(typeof(IAutoNode))]
public partial class Weapon : InventoryItem
public partial class Weapon : Node3D, IInventoryItem, IEquippable
{
public Weapon()
{
@@ -14,11 +14,17 @@ public partial class Weapon : InventoryItem
public override void _Notification(int what) => this.Notify(what);
public new InventoryItemInfo Info => WeaponInfo;
[Dependency] public IGameRepo GameRepo => this.DependOn<IGameRepo>();
public InventoryItemInfo Info => WeaponInfo;
[Export]
public WeaponInfo WeaponInfo { get; set; }
[Node] public Sprite3D Sprite { get; set; } = default!;
[Node] public Area3D Pickup { get; set; } = default!;
public void OnReady()
{
Sprite.Texture = WeaponInfo.Texture;

94
src/items/weapons/Weapon.tscn
View File

@@ -1,94 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://db206brufi83s"]
[gd_scene load_steps=3 format=3 uid="uid://db206brufi83s"]
[ext_resource type="Script" path="res://src/items/weapons/Weapon.cs" id="1_7pkyf"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_wll7p"]
radius = 0.470016
[sub_resource type="Animation" id="Animation_w4iur"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0, 0, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Pickup:monitoring")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Pickup:monitorable")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
[sub_resource type="Animation" id="Animation_gkdye"]
resource_name = "drop"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Pickup:position")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.5, 1),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Vector3(0, 1, 0), Vector3(-0.752, 0.8, 0), Vector3(-1.50473, 0.09512, 0)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Pickup:monitoring")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Pickup:monitorable")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [false, true]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s2htf"]
_data = {
"RESET": SubResource("Animation_w4iur"),
"drop": SubResource("Animation_gkdye")
}
[node name="Weapon" type="Node3D"]
script = ExtResource("1_7pkyf")
@@ -96,8 +12,6 @@ script = ExtResource("1_7pkyf")
unique_name_in_owner = true
collision_layer = 4
collision_mask = 4
monitoring = false
monitorable = false
[node name="Sprite" type="Sprite3D" parent="Pickup"]
unique_name_in_owner = true
@@ -110,9 +24,3 @@ texture_filter = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"]
shape = SubResource("CapsuleShape3D_wll7p")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_s2htf")
}