wip: new sprites

pull/41/head
John Montagu, the 4th Earl of Sandvich 2024-06-09 08:36:41 -07:00
parent 51e1ebd033
commit dba2d89251
Signed by: sandvich
GPG Key ID: 9A39BE37E602B22D
6 changed files with 137 additions and 13 deletions

View File

@ -268,8 +268,8 @@ scale_curve = SubResource("CurveTexture_5uulw")
color = Color(1, 0, 0, 1) color = Color(1, 0, 0, 1)
color_ramp = SubResource("GradientTexture1D_iyaih") color_ramp = SubResource("GradientTexture1D_iyaih")
[sub_resource type="RectangleShape2D" id="RectangleShape2D_bfqew"] [sub_resource type="CircleShape2D" id="CircleShape2D_umi1b"]
size = Vector2(8, 8) radius = 4.0
[sub_resource type="RectangleShape2D" id="RectangleShape2D_1gjgc"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_1gjgc"]
size = Vector2(12, 16) size = Vector2(12, 16)
@ -429,7 +429,7 @@ offset = Vector2(0, -12)
hframes = 7 hframes = 7
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_bfqew") shape = SubResource("CircleShape2D_umi1b")
[node name="Inventory" type="Node2D" parent="." node_paths=PackedStringArray("Hotbar")] [node name="Inventory" type="Node2D" parent="." node_paths=PackedStringArray("Hotbar")]
script = ExtResource("17_5rur0") script = ExtResource("17_5rur0")

View File

@ -174,6 +174,7 @@ Sprite = NodePath("Sprites/Sprite2D")
Inventory = NodePath("Inventory") Inventory = NodePath("Inventory")
StateMachine = NodePath("StateMachine") StateMachine = NodePath("StateMachine")
Hurtbox = NodePath("Hurtbox") Hurtbox = NodePath("Hurtbox")
Faction = 4
[node name="StateMachine" type="Node" parent="." node_paths=PackedStringArray("InitialState", "Character")] [node name="StateMachine" type="Node" parent="." node_paths=PackedStringArray("InitialState", "Character")]
script = ExtResource("2_dhles") script = ExtResource("2_dhles")

View File

@ -59,7 +59,7 @@ public partial class UnwantedFrequency : Projectile, Utils.ITarget
TrailPosition.Position = new Vector2(0, 4 * Mathf.Sin(radians)); TrailPosition.Position = new Vector2(0, 4 * Mathf.Sin(radians));
TrailPosition2.Position = -TrailPosition.Position; TrailPosition2.Position = -TrailPosition.Position;
if (CharacterTarget is not null) if (CharacterTarget is not null && IsInstanceValid(CharacterTarget))
{ {
var pos = CharacterTarget.GlobalPosition; var pos = CharacterTarget.GlobalPosition;
var desired = GlobalPosition.DirectionTo(pos); var desired = GlobalPosition.DirectionTo(pos);

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,9 @@
[gd_resource type="TileSet" load_steps=12 format=3 uid="uid://l61kbx31ug4p"] [gd_resource type="TileSet" load_steps=14 format=3 uid="uid://l61kbx31ug4p"]
[ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="1_kud44"] [ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="1_kud44"]
[ext_resource type="Texture2D" uid="uid://j1ekk1ppenm4" path="res://Assets/Sprites/grass-tileset.png" id="2_lihbs"] [ext_resource type="Texture2D" uid="uid://j1ekk1ppenm4" path="res://Assets/Sprites/grass-tileset.png" id="2_lihbs"]
[ext_resource type="Texture2D" uid="uid://udgjrcaexuaq" path="res://Assets/Sprites/Props/arena-arches.png" id="3_hbylw"] [ext_resource type="Texture2D" uid="uid://udgjrcaexuaq" path="res://Assets/Sprites/Props/arena-arches.png" id="3_hbylw"]
[ext_resource type="Texture2D" uid="uid://bth1v3dyuqwg6" path="res://Assets/Sprites/arena-tileset-new.png" id="4_n70qi"]
[sub_resource type="NavigationPolygon" id="NavigationPolygon_7lhug"] [sub_resource type="NavigationPolygon" id="NavigationPolygon_7lhug"]
vertices = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) vertices = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
@ -718,6 +719,60 @@ texture = ExtResource("3_hbylw")
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:1/0/physics_layer_0/angular_velocity = 0.0 2:1/0/physics_layer_0/angular_velocity = 0.0
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_45tin"]
texture = ExtResource("4_n70qi")
0:0/0 = 0
1:0/0 = 0
4:0/0 = 0
5:0/0 = 0
6:0/0 = 0
8:0/0 = 0
9:0/0 = 0
10:0/0 = 0
11:0/0 = 0
12:0/0 = 0
13:0/0 = 0
0:1/0 = 0
1:1/0 = 0
4:1/0 = 0
5:1/0 = 0
6:1/0 = 0
7:1/0 = 0
8:1/0 = 0
9:1/0 = 0
10:1/0 = 0
11:1/0 = 0
2:2/0 = 0
3:2/0 = 0
4:2/0 = 0
5:2/0 = 0
6:2/0 = 0
7:2/0 = 0
8:2/0 = 0
9:2/0 = 0
10:2/0 = 0
11:2/0 = 0
0:3/0 = 0
1:3/0 = 0
2:3/0 = 0
3:3/0 = 0
4:3/0 = 0
8:3/0 = 0
0:4/0 = 0
2:4/0 = 0
3:4/0 = 0
4:4/0 = 0
5:4/0 = 0
6:4/0 = 0
9:4/0 = 0
0:5/0 = 0
1:5/0 = 0
2:5/0 = 0
3:5/0 = 0
4:5/0 = 0
5:3/0 = 0
6:3/0 = 0
[resource] [resource]
occlusion_layer_0/light_mask = 1 occlusion_layer_0/light_mask = 1
physics_layer_0/collision_layer = 1 physics_layer_0/collision_layer = 1
@ -735,3 +790,4 @@ navigation_layer_0/layers = 1
sources/0 = SubResource("TileSetAtlasSource_fcd6d") sources/0 = SubResource("TileSetAtlasSource_fcd6d")
sources/1 = SubResource("TileSetAtlasSource_mdfpe") sources/1 = SubResource("TileSetAtlasSource_mdfpe")
sources/2 = SubResource("TileSetAtlasSource_u4tjf") sources/2 = SubResource("TileSetAtlasSource_u4tjf")
sources/3 = SubResource("TileSetAtlasSource_45tin")

View File

@ -7,6 +7,7 @@ public enum FactionName
{ {
Player = 1, Player = 1,
Doc = 2, Doc = 2,
Forest = 4,
} }
public interface IFaction public interface IFaction