diff --git a/objects/enemy/boss/boss1.gd b/objects/enemy/boss/scrump.gd similarity index 77% rename from objects/enemy/boss/boss1.gd rename to objects/enemy/boss/scrump.gd index e61dd86..bb5498c 100644 --- a/objects/enemy/boss/boss1.gd +++ b/objects/enemy/boss/scrump.gd @@ -13,12 +13,19 @@ onready var shoot_timer = $ShootTimer onready var shootpoint = $Position2D onready var blood_position = $BloodPosition onready var map = get_owner() -const Projectile = preload("res://objects/enemy/boss/boss1_projectile.tscn") -const Gore = preload("res://objects/enemy/boss/boss1_gore.tscn") +const Projectile = preload("res://objects/enemy/boss/scrump_projectile.tscn") +const Gore = preload("res://objects/enemy/boss/scrump_gore.tscn") func _ready(): seed(hash("HEROMARK2")) + #Easy mode + if Game.is_easy_mode: + arrow_speed *= Game.easy_mode_speed_factor + shoot_time /= Game.easy_mode_speed_factor + speed *= Game.easy_mode_speed_factor + phase2_speed *= Game.easy_mode_speed_factor + phase3_speed *= Game.easy_mode_speed_factor func shoot(): Game.instance_node(Projectile,shootpoint.global_position.x,stepify(shootpoint.global_position.y,8),map) diff --git a/objects/enemy/boss/boss1.tscn b/objects/enemy/boss/scrump.tscn similarity index 93% rename from objects/enemy/boss/boss1.tscn rename to objects/enemy/boss/scrump.tscn index f66f5c5..196fea5 100644 --- a/objects/enemy/boss/boss1.tscn +++ b/objects/enemy/boss/scrump.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://graphics/enemy/boss/scrump.png" type="Texture" id=1] -[ext_resource path="res://objects/enemy/boss/boss1.gd" type="Script" id=2] +[ext_resource path="res://objects/enemy/boss/scrump.gd" type="Script" id=1] +[ext_resource path="res://audio/sounds/gover.wav" type="AudioStream" id=2] [ext_resource path="res://audio/sounds/die.wav" type="AudioStream" id=3] -[ext_resource path="res://audio/sounds/gover.wav" type="AudioStream" id=4] +[ext_resource path="res://graphics/enemy/boss/scrump.png" type="Texture" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 5.5, 9.5 ) @@ -12,7 +12,7 @@ extents = Vector2( 5.5, 9.5 ) extents = Vector2( 20, 27 ) [node name="Boss1" type="Node2D"] -script = ExtResource( 2 ) +script = ExtResource( 1 ) move_direction = 1 flip_sprite = false phase2_speed = 75 @@ -79,7 +79,7 @@ autostart = true [node name="Sprite" type="Sprite" parent="."] position = Vector2( 26, 27 ) -texture = ExtResource( 1 ) +texture = ExtResource( 4 ) [node name="BloodPosition" type="Position2D" parent="."] position = Vector2( 0, 14 ) @@ -88,7 +88,7 @@ position = Vector2( 0, 14 ) stream = ExtResource( 3 ) [node name="DeathSound" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 4 ) +stream = ExtResource( 2 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="timeout" from="ShootTimer" to="." method="_on_ShootTimer_timeout"] diff --git a/objects/enemy/boss/boss1_gore.tscn b/objects/enemy/boss/scrump_gore.tscn similarity index 90% rename from objects/enemy/boss/boss1_gore.tscn rename to objects/enemy/boss/scrump_gore.tscn index f485dee..b732a30 100644 --- a/objects/enemy/boss/boss1_gore.tscn +++ b/objects/enemy/boss/scrump_gore.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=35 format=2] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/eyestalk.png" type="Texture" id=1] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/eye.png" type="Texture" id=2] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/headupper.png" type="Texture" id=3] -[ext_resource path="res://scripts/launch_rigid.gd" type="Script" id=4] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/headlower.png" type="Texture" id=5] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle5.png" type="Texture" id=6] +[ext_resource path="res://objects/enemy/constant_bleed.tscn" type="PackedScene" id=1] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle5.png" type="Texture" id=2] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle1.png" type="Texture" id=3] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain4.png" type="Texture" id=4] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/eyestalk.png" type="Texture" id=5] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/eye.png" type="Texture" id=6] [ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle3.png" type="Texture" id=7] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle4.png" type="Texture" id=8] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle1.png" type="Texture" id=9] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle6.png" type="Texture" id=10] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle2.png" type="Texture" id=11] -[ext_resource path="res://objects/enemy/constant_bleed.tscn" type="PackedScene" id=12] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain4.png" type="Texture" id=13] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain3.png" type="Texture" id=14] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain1.png" type="Texture" id=15] -[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain2.png" type="Texture" id=16] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle6.png" type="Texture" id=8] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain1.png" type="Texture" id=9] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/headlower.png" type="Texture" id=10] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain3.png" type="Texture" id=11] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/brain2.png" type="Texture" id=12] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/headupper.png" type="Texture" id=13] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle4.png" type="Texture" id=14] +[ext_resource path="res://graphics/enemy/boss/scrump_gore/tentacle2.png" type="Texture" id=15] +[ext_resource path="res://scripts/launch_rigid.gd" type="Script" id=16] [sub_resource type="PhysicsMaterial" id=21] bounce = 0.3 @@ -92,31 +92,31 @@ physics_material_override = SubResource( 21 ) [node name="Sprite" type="Sprite" parent="Brain1"] position = Vector2( 27, 27 ) -texture = ExtResource( 15 ) +texture = ExtResource( 9 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Brain1"] position = Vector2( 23, 18 ) rotation = 0.504296 shape = SubResource( 17 ) -[node name="DeathSplatter" parent="Brain1" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Brain1" instance=ExtResource( 1 )] position = Vector2( 29, 9 ) -[node name="DeathSplatter2" parent="Brain1" instance=ExtResource( 12 )] +[node name="DeathSplatter2" parent="Brain1" instance=ExtResource( 1 )] position = Vector2( 15, 24 ) [node name="Brain2" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -[node name="DeathSplatter" parent="Brain2" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Brain2" instance=ExtResource( 1 )] position = Vector2( 48, 11 ) -[node name="DeathSplatter2" parent="Brain2" instance=ExtResource( 12 )] +[node name="DeathSplatter2" parent="Brain2" instance=ExtResource( 1 )] position = Vector2( 37, 29 ) [node name="Sprite2" type="Sprite" parent="Brain2"] position = Vector2( 27, 27 ) -texture = ExtResource( 16 ) +texture = ExtResource( 12 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Brain2"] position = Vector2( 47, 23 ) @@ -126,15 +126,15 @@ shape = SubResource( 18 ) [node name="Brain3" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -[node name="DeathSplatter" parent="Brain3" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Brain3" instance=ExtResource( 1 )] position = Vector2( 44, 7 ) -[node name="DeathSplatter2" parent="Brain3" instance=ExtResource( 12 )] +[node name="DeathSplatter2" parent="Brain3" instance=ExtResource( 1 )] position = Vector2( 32, 25 ) [node name="Sprite3" type="Sprite" parent="Brain3"] position = Vector2( 27, 27 ) -texture = ExtResource( 14 ) +texture = ExtResource( 11 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Brain3"] position = Vector2( 38, 17 ) @@ -144,12 +144,12 @@ shape = SubResource( 19 ) [node name="Brain4" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -[node name="DeathSplatter" parent="Brain4" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Brain4" instance=ExtResource( 1 )] position = Vector2( 49, 23 ) [node name="Sprite3" type="Sprite" parent="Brain4"] position = Vector2( 27, 27 ) -texture = ExtResource( 13 ) +texture = ExtResource( 4 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Brain4"] position = Vector2( 46, 32 ) @@ -158,14 +158,14 @@ shape = SubResource( 20 ) [node name="Eye" type="RigidBody2D" parent="."] physics_material_override = SubResource( 4 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Eye" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Eye" instance=ExtResource( 1 )] position = Vector2( 6, 9 ) [node name="Sprite" type="Sprite" parent="Eye"] position = Vector2( 26, 27 ) -texture = ExtResource( 2 ) +texture = ExtResource( 6 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Eye"] position = Vector2( 5, 15 ) @@ -173,17 +173,17 @@ shape = SubResource( 3 ) [node name="Eyestalk" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Eyestalk" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Eyestalk" instance=ExtResource( 1 )] position = Vector2( 6, 8 ) -[node name="DeathSplatter2" parent="Eyestalk" instance=ExtResource( 12 )] +[node name="DeathSplatter2" parent="Eyestalk" instance=ExtResource( 1 )] position = Vector2( 25, 5 ) [node name="Sprite" type="Sprite" parent="Eyestalk"] position = Vector2( 26, 27 ) -texture = ExtResource( 1 ) +texture = ExtResource( 5 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Eyestalk"] position = Vector2( 9, 3 ) @@ -202,23 +202,23 @@ shape = SubResource( 15 ) [node name="UpperHead" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="UpperHead" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="UpperHead" instance=ExtResource( 1 )] position = Vector2( 41, 10 ) -[node name="DeathSplatter2" parent="UpperHead" instance=ExtResource( 12 )] +[node name="DeathSplatter2" parent="UpperHead" instance=ExtResource( 1 )] position = Vector2( 49, 20 ) -[node name="DeathSplatter3" parent="UpperHead" instance=ExtResource( 12 )] +[node name="DeathSplatter3" parent="UpperHead" instance=ExtResource( 1 )] position = Vector2( 42, 26 ) -[node name="DeathSplatter4" parent="UpperHead" instance=ExtResource( 12 )] +[node name="DeathSplatter4" parent="UpperHead" instance=ExtResource( 1 )] position = Vector2( 33, 28 ) [node name="Sprite" type="Sprite" parent="UpperHead"] position = Vector2( 26, 27 ) -texture = ExtResource( 3 ) +texture = ExtResource( 13 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="UpperHead"] position = Vector2( 33, 19 ) @@ -227,29 +227,29 @@ shape = SubResource( 5 ) [node name="LowerHead" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="LowerHead" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="LowerHead" instance=ExtResource( 1 )] position = Vector2( 32, 28 ) -[node name="DeathSplatter2" parent="LowerHead" instance=ExtResource( 12 )] +[node name="DeathSplatter2" parent="LowerHead" instance=ExtResource( 1 )] position = Vector2( 43, 27 ) -[node name="DeathSplatter3" parent="LowerHead" instance=ExtResource( 12 )] +[node name="DeathSplatter3" parent="LowerHead" instance=ExtResource( 1 )] position = Vector2( 18, 37 ) -[node name="DeathSplatter4" parent="LowerHead" instance=ExtResource( 12 )] +[node name="DeathSplatter4" parent="LowerHead" instance=ExtResource( 1 )] position = Vector2( 26, 38 ) -[node name="DeathSplatter5" parent="LowerHead" instance=ExtResource( 12 )] +[node name="DeathSplatter5" parent="LowerHead" instance=ExtResource( 1 )] position = Vector2( 35, 37 ) -[node name="DeathSplatter6" parent="LowerHead" instance=ExtResource( 12 )] +[node name="DeathSplatter6" parent="LowerHead" instance=ExtResource( 1 )] position = Vector2( 44, 37 ) [node name="Sprite" type="Sprite" parent="LowerHead"] position = Vector2( 26, 27 ) -texture = ExtResource( 5 ) +texture = ExtResource( 10 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="LowerHead"] position = Vector2( 35, 33 ) @@ -258,14 +258,14 @@ shape = SubResource( 6 ) [node name="Tentacle1" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Tentacle1" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Tentacle1" instance=ExtResource( 1 )] position = Vector2( 19, 37 ) [node name="Sprite" type="Sprite" parent="Tentacle1"] position = Vector2( 26, 27 ) -texture = ExtResource( 9 ) +texture = ExtResource( 3 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Tentacle1"] position = Vector2( 19, 45 ) @@ -274,14 +274,14 @@ shape = SubResource( 7 ) [node name="Tentacle2" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Tentacle2" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Tentacle2" instance=ExtResource( 1 )] position = Vector2( 23, 38 ) [node name="Sprite" type="Sprite" parent="Tentacle2"] position = Vector2( 26, 27 ) -texture = ExtResource( 11 ) +texture = ExtResource( 15 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Tentacle2"] position = Vector2( 24, 47 ) @@ -290,9 +290,9 @@ shape = SubResource( 8 ) [node name="Tentacle3" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Tentacle3" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Tentacle3" instance=ExtResource( 1 )] position = Vector2( 27, 38 ) [node name="Sprite" type="Sprite" parent="Tentacle3"] @@ -305,14 +305,14 @@ shape = SubResource( 9 ) [node name="Tentacle4" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Tentacle4" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Tentacle4" instance=ExtResource( 1 )] position = Vector2( 33, 38 ) [node name="Sprite" type="Sprite" parent="Tentacle4"] position = Vector2( 26, 27 ) -texture = ExtResource( 8 ) +texture = ExtResource( 14 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Tentacle4"] position = Vector2( 33, 48 ) @@ -320,14 +320,14 @@ shape = SubResource( 10 ) [node name="Tentacle5" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Tentacle5" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Tentacle5" instance=ExtResource( 1 )] position = Vector2( 38, 38 ) [node name="Sprite" type="Sprite" parent="Tentacle5"] position = Vector2( 26, 27 ) -texture = ExtResource( 6 ) +texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Tentacle5"] position = Vector2( 39, 47 ) @@ -335,14 +335,14 @@ shape = SubResource( 11 ) [node name="Tentacle6" type="RigidBody2D" parent="."] physics_material_override = SubResource( 21 ) -script = ExtResource( 4 ) +script = ExtResource( 16 ) -[node name="DeathSplatter" parent="Tentacle6" instance=ExtResource( 12 )] +[node name="DeathSplatter" parent="Tentacle6" instance=ExtResource( 1 )] position = Vector2( 43, 38 ) [node name="Sprite" type="Sprite" parent="Tentacle6"] position = Vector2( 26, 27 ) -texture = ExtResource( 10 ) +texture = ExtResource( 8 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="Tentacle6"] position = Vector2( 44, 48 ) diff --git a/objects/enemy/boss/boss1_projectile.gd b/objects/enemy/boss/scrump_projectile.gd similarity index 100% rename from objects/enemy/boss/boss1_projectile.gd rename to objects/enemy/boss/scrump_projectile.gd diff --git a/objects/enemy/boss/boss1_projectile.tscn b/objects/enemy/boss/scrump_projectile.tscn similarity index 91% rename from objects/enemy/boss/boss1_projectile.tscn rename to objects/enemy/boss/scrump_projectile.tscn index 503769b..a2765ca 100644 --- a/objects/enemy/boss/boss1_projectile.tscn +++ b/objects/enemy/boss/scrump_projectile.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://objects/enemy/boss/boss1_projectile.gd" type="Script" id=1] -[ext_resource path="res://graphics/particles/goo_back.png" type="Texture" id=2] -[ext_resource path="res://graphics/particles/goo_trail.png" type="Texture" id=3] -[ext_resource path="res://graphics/particles/goo.png" type="Texture" id=4] +[ext_resource path="res://graphics/particles/goo_back.png" type="Texture" id=1] +[ext_resource path="res://graphics/particles/goo_trail.png" type="Texture" id=2] +[ext_resource path="res://graphics/particles/goo.png" type="Texture" id=3] +[ext_resource path="res://objects/enemy/boss/scrump_projectile.gd" type="Script" id=4] [sub_resource type="Curve" id=2] _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] @@ -16,13 +16,13 @@ extents = Vector2( 4, 3 ) [node name="Boss1Projectile" type="Node2D"] z_index = -1 -script = ExtResource( 1 ) +script = ExtResource( 4 ) [node name="GooTrail" type="CPUParticles2D" parent="."] position = Vector2( 0, 4 ) z_index = -1 local_coords = false -texture = ExtResource( 3 ) +texture = ExtResource( 2 ) emission_shape = 2 emission_rect_extents = Vector2( 4, 4 ) spread = 180.0 @@ -36,7 +36,7 @@ scale_amount_curve = SubResource( 2 ) [node name="GooBackground" type="CPUParticles2D" parent="."] position = Vector2( 0, 4 ) amount = 16 -texture = ExtResource( 2 ) +texture = ExtResource( 1 ) emission_shape = 2 emission_rect_extents = Vector2( 2, 2 ) spread = 180.0 @@ -53,7 +53,7 @@ scale_amount_curve = SubResource( 3 ) position = Vector2( 0, 4 ) amount = 16 preprocess = 1.0 -texture = ExtResource( 2 ) +texture = ExtResource( 1 ) emission_shape = 2 emission_rect_extents = Vector2( 2, 2 ) spread = 180.0 @@ -70,7 +70,7 @@ scale_amount_curve = SubResource( 3 ) position = Vector2( 0, 4 ) lifetime = 0.5 preprocess = 0.5 -texture = ExtResource( 4 ) +texture = ExtResource( 3 ) emission_shape = 2 emission_rect_extents = Vector2( 2, 2 ) spread = 180.0 diff --git a/objects/enemy/enemy_jump.gd b/objects/enemy/enemy_jump.gd index 64897c3..35b39bc 100644 --- a/objects/enemy/enemy_jump.gd +++ b/objects/enemy/enemy_jump.gd @@ -12,6 +12,10 @@ onready var sprite = $Sprite func _ready(): anims.play("idle") + #Easy mode + if Game.is_easy_mode: + speed *= Game.easy_mode_speed_factor + anims.playback_speed *= Game.easy_mode_speed_factor func _physics_process(delta): if anims.current_animation == "jump": diff --git a/objects/enemy/enemy_move_diagonal.gd b/objects/enemy/enemy_move_diagonal.gd index cab732a..a289010 100644 --- a/objects/enemy/enemy_move_diagonal.gd +++ b/objects/enemy/enemy_move_diagonal.gd @@ -18,6 +18,8 @@ func _ready(): #Move in direction selected if move_direction == 0: direction = Vector2(1,-1) + #Speed + speed *= Game.easy_mode_speed_factor func _physics_process(delta): #Move diff --git a/objects/enemy/enemy_move_sidesideupdown.gd b/objects/enemy/enemy_move_sidesideupdown.gd index 186cb45..b59a471 100644 --- a/objects/enemy/enemy_move_sidesideupdown.gd +++ b/objects/enemy/enemy_move_sidesideupdown.gd @@ -21,6 +21,9 @@ func _ready(): return left_up_boundary *= 8 right_down_boundary *= 8 + #Easy mode + if Game.is_easy_mode == true: + speed = speed * Game.easy_mode_speed_factor func _physics_process(delta): if Engine.editor_hint: diff --git a/objects/enemy/enemy_speedup_in_range.gd b/objects/enemy/enemy_speedup_in_range.gd index 84eac30..c133ef4 100644 --- a/objects/enemy/enemy_speedup_in_range.gd +++ b/objects/enemy/enemy_speedup_in_range.gd @@ -19,6 +19,13 @@ onready var timer = $Timer var speed = 50 var go_fast = false +func _ready(): + #Easy mode + if Game.is_easy_mode: + speed *= Game.easy_mode_speed_factor + slower_speed *= Game.easy_mode_speed_factor + faster_speed *= Game.easy_mode_speed_factor + func _physics_process(delta): if move_direction == 0: move_side_to_side(delta) diff --git a/objects/enemy/roboturret.gd b/objects/enemy/roboturret.gd index 22b3797..7c6a0fd 100644 --- a/objects/enemy/roboturret.gd +++ b/objects/enemy/roboturret.gd @@ -12,6 +12,10 @@ const ArrowProjectile = preload("res://objects/enemy/roboturret_proj.tscn") func _ready(): death_sound = Audio.a_die_robot + #Easy Mode + if Game.is_easy_mode: + shoot_time /= Game.easy_mode_speed_factor + arrow_speed *= Game.easy_mode_speed_factor func _physics_process(delta): if raycast.is_colliding(): diff --git a/objects/enemy/rolling_fiend.gd b/objects/enemy/rolling_fiend.gd index 7f23f22..99d6b80 100644 --- a/objects/enemy/rolling_fiend.gd +++ b/objects/enemy/rolling_fiend.gd @@ -19,6 +19,9 @@ func _ready(): if is_on_surface(DIRS[i]): floor_direction = i break + #Easy mode + if Game.is_easy_mode: + move_speed *= Game.easy_mode_speed_factor func _physics_process(delta): var offset = 1 if clockwise else -1 diff --git a/objects/enemy/skelarcher.gd b/objects/enemy/skelarcher.gd index 21265e1..b957e5a 100644 --- a/objects/enemy/skelarcher.gd +++ b/objects/enemy/skelarcher.gd @@ -4,7 +4,7 @@ const ArrowProjectile = preload("res://objects/enemy/enemy_arrow.tscn") const BoneParticle = preload("res://objects/enemy/bone_particle.tscn") export var shoot_time = 1.0 -export var arrow_speed = 120.0 +export var arrow_speed = 60.0 # bone death particles export var bones_amount = 12 export var bones_speed = 50.0 @@ -18,6 +18,10 @@ onready var arrow_spawn_r = $ArrowSpawnR func _ready(): death_sound = Audio.a_die_skeleton timer.start(shoot_time) + #Easy mode + if Game.is_easy_mode: + shoot_time /= Game.easy_mode_speed_factor + arrow_speed *= Game.easy_mode_speed_factor func _on_Timer_timeout(): anims.play("shoot") diff --git a/objects/enemy/snail.tscn b/objects/enemy/snail.tscn index 4111a27..49bd875 100644 --- a/objects/enemy/snail.tscn +++ b/objects/enemy/snail.tscn @@ -26,7 +26,7 @@ extents = Vector2( 4, 4 ) script = ExtResource( 3 ) score_for_killing = 30 slower_speed = 30 -faster_speed = 80 +faster_speed = 60 [node name="AnimatedSprite" type="AnimatedSprite" parent="."] position = Vector2( 3, 3 ) diff --git a/objects/enemy/spider.gd b/objects/enemy/spider.gd index 4550a79..ff03d73 100644 --- a/objects/enemy/spider.gd +++ b/objects/enemy/spider.gd @@ -23,6 +23,9 @@ func _ready(): hitbox.global_position.y = old_y line.points[1].y = hitbox.position.y raycast.queue_free() + #Easy mode + if Game.is_easy_mode: + speed *= Game.easy_mode_speed_factor func _physics_process(delta): hitbox.position.y += direction * speed * delta diff --git a/objects/enemy/steam.gd b/objects/enemy/steam.gd index 6d28339..8435352 100644 --- a/objects/enemy/steam.gd +++ b/objects/enemy/steam.gd @@ -14,6 +14,9 @@ func _ready(): if !active: particles.emitting = false collision_shape.disabled = true + #Easy mode + if Game.is_easy_mode: + off_time /= Game.easy_mode_speed_factor func _physics_process(delta): time += delta diff --git a/objects/environment/turniwood/turning_platform.gd b/objects/environment/turniwood/turning_platform.gd index 0980f3c..d2bdfcc 100644 --- a/objects/environment/turniwood/turning_platform.gd +++ b/objects/environment/turniwood/turning_platform.gd @@ -16,6 +16,8 @@ func _ready(): flip_timer.start(time_ms) else: delay_timer.start(delay) + #Easy mode + time_ms /= Game.easy_mode_speed_factor func _on_AnimationPlayer_animation_finished(anim_name): #Return to idle after turn animation diff --git a/objects/lore/cave.tscn b/objects/lore/cave.tscn index 07671e9..38cc02d 100644 --- a/objects/lore/cave.tscn +++ b/objects/lore/cave.tscn @@ -6,11 +6,9 @@ [node name="Control" parent="." index="1"] margin_top = 75.0 -margin_right = 256.0 margin_bottom = 117.0 [node name="Label" parent="Control" index="0"] margin_top = 3.0 -margin_right = 215.0 margin_bottom = 39.0 text = "Blue ray caverns is used as a mine by a corporation that wants to create rust and grime" diff --git a/project.godot b/project.godot index 5a74b43..0c0db81 100644 --- a/project.godot +++ b/project.godot @@ -85,7 +85,7 @@ window/handheld/orientation="sensor_landscape" [editor_plugins] -enabled=PoolStringArray( "res://addons/godot_state_charts/plugin.cfg" ) +enabled=PoolStringArray( ) [global]