Skip to content

Commit 6d53738

Browse files
committed
I'm gonna push what I have
1 parent 0c79b06 commit 6d53738

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

Levels/Playable/Medium/13Puzzle/Floor1.tscn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,7 @@ position = Vector2(641, -749)
314314

315315
[node name="DronePatrolPoints" parent="DroneManager" index="0"]
316316
visible = false
317-
position = Vector2(0, 256)
318-
points = PackedVector2Array(-2, 109, 3, 587, -42, 620, -84, -240)
317+
points = PackedVector2Array(-2, 109, -6, 810, -44, 852, -84, -240)
319318

320319
[node name="DoorAjarSprite" type="Sprite2D" parent="."]
321320
position = Vector2(15, 0)

Objects/StaticObjects/AttackDrone.tscn

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=17 format=3 uid="uid://1ydef646f5s8"]
22

3-
[ext_resource type="Script" path="res://Scripts/ObjectScripts/AttackDroneManager.gd" id="1_x1qy1"]
3+
[ext_resource type="Script" uid="uid://bajb0rmgkhjof" path="res://Scripts/ObjectScripts/AttackDroneManager.gd" id="1_x1qy1"]
44
[ext_resource type="Texture2D" uid="uid://dgvalkix6ijlb" path="res://Assets/Images/Objects/Misc/CloudThing.png" id="2_6rg6k"]
55
[ext_resource type="SpriteFrames" uid="uid://dvad4ka6eq5kw" path="res://Objects/StaticObjects/AttackDroneAnimations.tres" id="3_dgcyn"]
66
[ext_resource type="Texture2D" uid="uid://b5t40i60nfdmm" path="res://Assets/Images/Objects/Enemy/DroneOutlineSpritesheet.png" id="4_yuunr"]
@@ -42,6 +42,13 @@ animations = [{
4242
"speed": 20.0
4343
}]
4444

45+
[sub_resource type="Gradient" id="Gradient_0awkx"]
46+
colors = PackedColorArray(0.404511, 0.404511, 0.404511, 1, 1, 1, 1, 1)
47+
48+
[sub_resource type="GradientTexture1D" id="GradientTexture1D_q5bk6"]
49+
gradient = SubResource("Gradient_0awkx")
50+
width = 1
51+
4552
[sub_resource type="Gradient" id="Gradient_2j5lc"]
4653
offsets = PackedFloat32Array(0, 0.255208, 0.46875, 0.723958, 1)
4754
colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0)
@@ -64,13 +71,6 @@ color_ramp = SubResource("GradientTexture1D_inqbl")
6471
turbulence_enabled = true
6572
turbulence_noise_scale = 4.8
6673

67-
[sub_resource type="Gradient" id="Gradient_0awkx"]
68-
colors = PackedColorArray(0.404511, 0.404511, 0.404511, 1, 1, 1, 1, 1)
69-
70-
[sub_resource type="GradientTexture1D" id="GradientTexture1D_q5bk6"]
71-
gradient = SubResource("Gradient_0awkx")
72-
width = 1
73-
7474
[sub_resource type="RectangleShape2D" id="RectangleShape2D_cp6ji"]
7575
size = Vector2(4, 2)
7676

@@ -115,11 +115,11 @@ autoplay = "Idle"
115115

116116
[node name="GPUParticles2D" type="GPUParticles2D" parent="Drone"]
117117
amount = 10
118-
process_material = SubResource("ParticleProcessMaterial_76aea")
119118
texture = SubResource("GradientTexture1D_q5bk6")
120119
lifetime = 20.0
121120
visibility_rect = Rect2(-5000, -5000, 10000, 10000)
122121
local_coords = true
122+
process_material = SubResource("ParticleProcessMaterial_76aea")
123123

124124
[node name="SmallBox" type="Area2D" parent="Drone"]
125125

Scripts/ObjectScripts/AttackDroneManager.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func _on_area_2d_body_exited(body):
228228
$Drone/DroneOutlineSpritesheet.visible = false
229229

230230
func _on_drone_hurtbox_area_entered(area):
231-
if area.name != "DroneHurtbox" && area.name != "SmallBox" && area.name != "CheckpointCollision" && area.name != "ExplosionHitbox" && !big_drone && !temp_disabled:
231+
if (area.name == "PlayerBulletHurter" || area.name == "PlayerHurtbox" || area.name == "DeathZone") && !temp_disabled:
232232
var instantiated_exploder = loaded_bomb.instantiate()
233233
instantiated_exploder.position = position + $Drone.position
234234

Scripts/ObjectScripts/DrillManager.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func _process(delta):
8080
node_with_name.name = "Drill worked!"
8181
right_collision = node_with_name
8282

83-
if left_collision != null && left_collision.name != "Player" && left_collision.name != "DrillCollider" && direction == -speed:
83+
if left_collision != null && left_collision.name != "Player" && left_collision != $DrillCollider && direction == -speed:
8484
direction = speed
8585
$JumpHurtBox/CollisionShape2D2.disabled = false
8686
$JumpHurtBox/CollisionShape2D3.disabled = true
@@ -92,7 +92,7 @@ func _process(delta):
9292
if tank:
9393
$DrillCollider.scale.x = 1
9494

95-
elif right_collision != null && right_collision.name != "Player" && right_collision.name != "DrillCollider" && direction == speed:
95+
elif right_collision != null && right_collision.name != "Player" && right_collision != $DrillCollider && direction == speed:
9696
print(right_collision.name)
9797
direction = -speed
9898
$JumpHurtBox/CollisionShape2D2.disabled = true

Scripts/ObjectScripts/Player.gd

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,9 @@ func _physics_process(delta):
281281
# Go down a ladder.
282282
if Input.is_action_pressed("down") && climbing && !dead:
283283
velocity.y += jump_push_force * 2
284+
285+
if $PlayerAnimation.animation != "Climbing" || !$PlayerAnimation.is_playing():
286+
$PlayerAnimation.play("Climbing")
284287

285288
# Increase velocity for steam boost.
286289
if in_boost_area && !velocity.y < -4:
@@ -307,8 +310,10 @@ func _physics_process(delta):
307310
if !was_climbing:
308311
$PlayerAnimation.play("Climbing")
309312

310-
if $PlayerAnimation.animation != "Climbing":
313+
if $PlayerAnimation.animation != "Climbing" || !$PlayerAnimation.is_playing():
311314
$PlayerAnimation.play("Climbing")
315+
elif $PlayerAnimation.animation == "Climbing" && !Input.is_action_pressed("down"):
316+
$PlayerAnimation.pause()
312317

313318
# Sword attack.
314319
if Input.is_action_just_pressed("attack") && current_ability == "Weapon" && $NewDashCooldown.time_left == 0 && !dead:

0 commit comments

Comments
 (0)