Skip to content

Commit 6a119ae

Browse files
Lilith-In-StarlightLilith-In-Starlight
committed
Merged 0.7
1 parent 925fb5f commit 6a119ae

3 files changed

Lines changed: 51 additions & 61 deletions

File tree

‎Player.tscn‎

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,73 +15,73 @@
1515
[ext_resource path="res://WandRenderSprite.tscn" type="PackedScene" id=13]
1616
[ext_resource path="res://Sprites/Player/RunLookback.png" type="Texture" id=14]
1717

18-
[sub_resource type="RectangleShape2D" id=1]
18+
[sub_resource type="RectangleShape2D" id=25]
1919
extents = Vector2( 3.03508, 10.5291 )
2020

21-
[sub_resource type="AtlasTexture" id=2]
21+
[sub_resource type="AtlasTexture" id=26]
2222
atlas = ExtResource( 11 )
2323
region = Rect2( 0, 0, 22, 24 )
2424

25-
[sub_resource type="AtlasTexture" id=3]
25+
[sub_resource type="AtlasTexture" id=27]
2626
atlas = ExtResource( 11 )
2727
region = Rect2( 22, 0, 22, 24 )
2828

29-
[sub_resource type="AtlasTexture" id=4]
29+
[sub_resource type="AtlasTexture" id=28]
3030
atlas = ExtResource( 11 )
3131
region = Rect2( 44, 0, 22, 24 )
3232

33-
[sub_resource type="AtlasTexture" id=5]
33+
[sub_resource type="AtlasTexture" id=29]
3434
atlas = ExtResource( 11 )
3535
region = Rect2( 66, 0, 22, 24 )
3636

37-
[sub_resource type="AtlasTexture" id=6]
37+
[sub_resource type="AtlasTexture" id=30]
3838
atlas = ExtResource( 11 )
3939
region = Rect2( 88, 0, 22, 24 )
4040

41-
[sub_resource type="AtlasTexture" id=7]
41+
[sub_resource type="AtlasTexture" id=31]
4242
atlas = ExtResource( 11 )
4343
region = Rect2( 110, 0, 22, 24 )
4444

45-
[sub_resource type="AtlasTexture" id=8]
46-
atlas = ExtResource( 8 )
47-
region = Rect2( 0, 0, 7, 24 )
48-
49-
[sub_resource type="AtlasTexture" id=9]
50-
atlas = ExtResource( 8 )
51-
region = Rect2( 7, 0, 7, 24 )
52-
53-
[sub_resource type="AtlasTexture" id=10]
54-
atlas = ExtResource( 8 )
55-
region = Rect2( 14, 0, 7, 24 )
56-
57-
[sub_resource type="AtlasTexture" id=11]
58-
atlas = ExtResource( 8 )
59-
region = Rect2( 21, 0, 7, 24 )
60-
61-
[sub_resource type="AtlasTexture" id=12]
45+
[sub_resource type="AtlasTexture" id=32]
6246
atlas = ExtResource( 3 )
6347
region = Rect2( 0, 0, 18, 22 )
6448

65-
[sub_resource type="AtlasTexture" id=13]
49+
[sub_resource type="AtlasTexture" id=33]
6650
atlas = ExtResource( 3 )
6751
region = Rect2( 18, 0, 18, 22 )
6852

69-
[sub_resource type="AtlasTexture" id=14]
53+
[sub_resource type="AtlasTexture" id=34]
7054
atlas = ExtResource( 3 )
7155
region = Rect2( 36, 0, 18, 22 )
7256

73-
[sub_resource type="AtlasTexture" id=15]
57+
[sub_resource type="AtlasTexture" id=35]
7458
atlas = ExtResource( 3 )
7559
region = Rect2( 54, 0, 18, 22 )
7660

77-
[sub_resource type="AtlasTexture" id=16]
61+
[sub_resource type="AtlasTexture" id=36]
7862
atlas = ExtResource( 3 )
7963
region = Rect2( 72, 0, 18, 22 )
8064

81-
[sub_resource type="AtlasTexture" id=17]
65+
[sub_resource type="AtlasTexture" id=37]
8266
atlas = ExtResource( 3 )
8367
region = Rect2( 90, 0, 18, 22 )
8468

69+
[sub_resource type="AtlasTexture" id=38]
70+
atlas = ExtResource( 8 )
71+
region = Rect2( 0, 0, 7, 24 )
72+
73+
[sub_resource type="AtlasTexture" id=39]
74+
atlas = ExtResource( 8 )
75+
region = Rect2( 7, 0, 7, 24 )
76+
77+
[sub_resource type="AtlasTexture" id=40]
78+
atlas = ExtResource( 8 )
79+
region = Rect2( 14, 0, 7, 24 )
80+
81+
[sub_resource type="AtlasTexture" id=41]
82+
atlas = ExtResource( 8 )
83+
region = Rect2( 21, 0, 7, 24 )
84+
8585
[sub_resource type="AtlasTexture" id=19]
8686
atlas = ExtResource( 14 )
8787
region = Rect2( 0, 0, 18, 22 )
@@ -106,7 +106,7 @@ region = Rect2( 72, 0, 18, 22 )
106106
atlas = ExtResource( 14 )
107107
region = Rect2( 90, 0, 18, 22 )
108108

109-
[sub_resource type="SpriteFrames" id=18]
109+
[sub_resource type="SpriteFrames" id=42]
110110
animations = [ {
111111
"frames": [ ExtResource( 4 ) ],
112112
"loop": true,
@@ -123,45 +123,45 @@ animations = [ {
123123
"name": "up",
124124
"speed": 5.0
125125
}, {
126-
"frames": [ ExtResource( 9 ) ],
126+
"frames": [ SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ) ],
127127
"loop": true,
128-
"name": "oneleg_slide2",
128+
"name": "crawling",
129129
"speed": 5.0
130130
}, {
131-
"frames": [ ExtResource( 12 ) ],
131+
"frames": [ SubResource( 32 ), SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ) ],
132132
"loop": true,
133-
"name": "crawl",
134-
"speed": 5.0
133+
"name": "run",
134+
"speed": 10.0
135135
}, {
136-
"frames": [ ExtResource( 10 ) ],
136+
"frames": [ ExtResource( 6 ) ],
137137
"loop": true,
138-
"name": "oneleg_slide",
138+
"name": "down",
139139
"speed": 5.0
140140
}, {
141-
"frames": [ ExtResource( 5 ) ],
141+
"frames": [ ExtResource( 12 ) ],
142142
"loop": true,
143-
"name": "slide2",
143+
"name": "crawl",
144144
"speed": 5.0
145145
}, {
146-
"frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ) ],
146+
"frames": [ SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ) ],
147147
"loop": true,
148-
"name": "crawling",
148+
"name": "panting",
149149
"speed": 5.0
150150
}, {
151-
"frames": [ SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ) ],
151+
"frames": [ ExtResource( 10 ) ],
152152
"loop": true,
153-
"name": "panting",
153+
"name": "oneleg_slide",
154154
"speed": 5.0
155155
}, {
156-
"frames": [ ExtResource( 6 ) ],
156+
"frames": [ ExtResource( 5 ) ],
157157
"loop": true,
158-
"name": "down",
158+
"name": "slide2",
159159
"speed": 5.0
160160
}, {
161-
"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ) ],
161+
"frames": [ ExtResource( 9 ) ],
162162
"loop": true,
163-
"name": "run",
164-
"speed": 10.0
163+
"name": "oneleg_slide2",
164+
"speed": 5.0
165165
}, {
166166
"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ],
167167
"loop": true,
@@ -174,7 +174,7 @@ collision_mask = 38
174174
script = ExtResource( 1 )
175175

176176
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
177-
shape = SubResource( 1 )
177+
shape = SubResource( 25 )
178178

179179
[node name="Left" type="RayCast2D" parent="."]
180180
enabled = true
@@ -187,8 +187,9 @@ cast_to = Vector2( 4, 0 )
187187
collision_mask = 2
188188

189189
[node name="Player" type="AnimatedSprite" parent="."]
190-
frames = SubResource( 18 )
190+
frames = SubResource( 42 )
191191
animation = "run_lookback"
192+
frame = 4
192193
playing = true
193194

194195
[node name="WandRender" parent="." instance=ExtResource( 13 )]

‎Spells/Fireball.gd‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,14 @@ var rotate := 0.0
99
func _ready():
1010
rotate = (goal).angle_to_point(Caster.position)
1111
position = Caster.position + Vector2(cos(rotate), sin(rotate))*12
12-
<<<<<<< HEAD
13-
=======
1412
if Caster.has_method("cast_from"):
1513
position = Caster.cast_from()
16-
>>>>>>> 0.7
1714

1815
func _physics_process(delta):
1916
for body in $Area.get_overlapping_bodies():
2017
if not body == self:
2118
_on_body_entered(body)
22-
<<<<<<< HEAD
23-
=======
2419

25-
>>>>>>> 0.7
2620

2721
move_and_slide(Vector2(cos(rotate), sin(rotate))*200)
2822
frames += 1

‎Spells/Iceball.gd‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,9 @@ var gravity := 0.0
99

1010
func _ready():
1111
rotate = goal.angle_to_point(Caster.position)
12-
<<<<<<< HEAD
13-
position = Caster.position + Vector2(cos(rotate), sin(rotate)+gravity)*12
14-
15-
=======
1612
position = Caster.position + Vector2(cos(rotate), sin(rotate))*16
1713
if Caster.has_method("cast_from"):
1814
position = Caster.cast_from()
19-
>>>>>>> 0.7
2015

2116
func _physics_process(delta):
2217
gravity += delta

0 commit comments

Comments
 (0)