Skip to content

Commit

Permalink
Level Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon32 committed Aug 19, 2024
1 parent 3ca964d commit 40e5001
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 64 deletions.
50 changes: 2 additions & 48 deletions Characters/Rat/EnemyRat.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=34 format=3 uid="uid://bgogck1k1rl0i"]
[gd_scene load_steps=22 format=3 uid="uid://bgogck1k1rl0i"]

[ext_resource type="Script" path="res://Characters/Rat/enemy_rat.gd" id="1_i034o"]
[ext_resource type="Texture2D" uid="uid://bfo1ffb8o8bdg" path="res://Characters/Rat/RatAnimations.png" id="2_n6qgb"]
Expand Down Expand Up @@ -96,34 +96,6 @@ _data = {
"walk": SubResource("Animation_wpmag")
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hsgmo"]
animation = &"is_eaten_from_left"

[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_slg0y"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_pwd2n"]
graph_offset = Vector2(-101, -1)
nodes/Animation/node = SubResource("AnimationNodeAnimation_hsgmo")
nodes/Animation/position = Vector2(100, 100)
nodes/TimeScale/node = SubResource("AnimationNodeTimeScale_slg0y")
nodes/TimeScale/position = Vector2(340, 100)
nodes/output/position = Vector2(520, 120)
node_connections = [&"TimeScale", 0, &"Animation", &"output", 0, &"TimeScale"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_i3alo"]
animation = &"is_eaten_from_right"

[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_bryfs"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_156pd"]
graph_offset = Vector2(-116, -6)
nodes/Animation/node = SubResource("AnimationNodeAnimation_i3alo")
nodes/Animation/position = Vector2(139, 155)
nodes/TimeScale/node = SubResource("AnimationNodeTimeScale_bryfs")
nodes/TimeScale/position = Vector2(420, 140)
nodes/output/position = Vector2(620, 160)
node_connections = [&"TimeScale", 0, &"Animation", &"output", 0, &"TimeScale"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_mgglk"]
animation = &"Idle"

Expand Down Expand Up @@ -158,29 +130,13 @@ advance_mode = 2

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_swycp"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_chj2c"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qul8h"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_01n5f"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vvhs2"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_h64ga"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8nv36"]

[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_n6kqg"]
states/Start/position = Vector2(64, 133)
states/eaten_left/node = SubResource("AnimationNodeBlendTree_pwd2n")
states/eaten_left/position = Vector2(634, 100)
states/eaten_right/node = SubResource("AnimationNodeBlendTree_156pd")
states/eaten_right/position = Vector2(648, 164)
states/idle/node = SubResource("AnimationNodeBlendTree_jildm")
states/idle/position = Vector2(328, 49)
states/run/node = SubResource("AnimationNodeBlendTree_u8vwk")
states/run/position = Vector2(328, 261)
transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_on6sh"), "idle", "run", SubResource("AnimationNodeStateMachineTransition_75hwq"), "run", "idle", SubResource("AnimationNodeStateMachineTransition_swycp"), "idle", "eaten_left", SubResource("AnimationNodeStateMachineTransition_chj2c"), "eaten_left", "End", SubResource("AnimationNodeStateMachineTransition_qul8h"), "run", "eaten_left", SubResource("AnimationNodeStateMachineTransition_01n5f"), "idle", "eaten_right", SubResource("AnimationNodeStateMachineTransition_vvhs2"), "eaten_right", "End", SubResource("AnimationNodeStateMachineTransition_h64ga"), "run", "eaten_right", SubResource("AnimationNodeStateMachineTransition_8nv36")]
transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_on6sh"), "idle", "run", SubResource("AnimationNodeStateMachineTransition_75hwq"), "run", "idle", SubResource("AnimationNodeStateMachineTransition_swycp")]
graph_offset = Vector2(-41, 3)

[node name="EnemyRat" type="CharacterBody2D" groups=["Enemy"]]
Expand Down Expand Up @@ -224,8 +180,6 @@ libraries = {
[node name="AnimationTree" type="AnimationTree" parent="."]
tree_root = SubResource("AnimationNodeStateMachine_n6kqg")
anim_player = NodePath("../AnimationPlayer")
parameters/eaten_left/TimeScale/scale = 1.0
parameters/eaten_right/TimeScale/scale = 1.0
parameters/idle/TimeScale/scale = 1.0
parameters/run/TimeScale/scale = 1.0

Expand Down
23 changes: 12 additions & 11 deletions Characters/Rat/enemy_rat.gd
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ var player_visible:bool=false
@export var run_anim_scale = 1
@onready var animationTree = $AnimationTree
@onready var state_machine = animationTree["parameters/playback"]
enum{IDLE, RUN, EATEN_LEFT, EATEN_RIGHT}
enum{IDLE, RUN}
var state = IDLE
var animTree_state_keys = ["idle","run","eaten_left","eaten_right"]
var animTree_state_keys = ["idle","run"]
var being_eaten := false


Expand All @@ -43,16 +43,14 @@ func _on_timer_timeout() -> void:
#detection timer
func _on_detection_timeout_timer_timeout() -> void:
player_detected=false

#draw circle for raycast adjustment (debugging)
#func _draw():
# draw_circle(target.global_position- global_position + Vector2(0,2),5,Color.RED)


func eaten_by(player : Node2D):
being_eaten = true
if player.position.x > position.x:
state = EATEN_RIGHT
else:
state = EATEN_LEFT
#if player.position.x > position.x:
#state = EATEN_RIGHT
#else:
#state = EATEN_LEFT


func _physics_process(_delta):
Expand Down Expand Up @@ -91,7 +89,10 @@ func _physics_process(_delta):
else:
velocity = Vector2.ZERO
state=IDLE


# flip depending on velocity
$Sprite2D.flip_h = velocity > Vector2.ZERO

move_and_slide()
animate()

Expand Down
1 change: 1 addition & 0 deletions Levels/level_01/Level_01.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -1510,6 +1510,7 @@ stream_2 = ExtResource("13_y83ts")
y_sort_enabled = true
script = ExtResource("1_6x71g")
size_target = 800
level_complete = "res://Menus/Level_Transistion_Scene.tscn"

[node name="Walls and Ground" type="TileMapLayer" parent="."]
use_parent_material = true
Expand Down
8 changes: 5 additions & 3 deletions Levels/level_01/level_01.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
extends Node2D
@export var size_target: int = 400

@export_file("*.tscn") var level_complete : String
#@export_file("*.tscn") var next_level : String

# Called when the node enters the scene tree for the first time.
func _ready() -> void:
Expand All @@ -9,9 +11,9 @@ func _ready() -> void:
func check_level_finished(hero_size: int):
if hero_size >= size_target:
print("YOU'RE WINNER")
GlobalSignals.request_scene.emit("res://Menus/Level_Transistion_Scene.tscn")
get_tree().change_scene_to_file("res://Menus/Level_Transition_Scene.tscn")

# TODO: preload scenes
GlobalSignals.request_scene.emit(level_complete)
get_tree().create_timer(1).timeout.connect(func (): get_tree().change_scene_to_file("res://Menus/Level_Transition_Scene.tscn"))

# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
Expand Down
9 changes: 8 additions & 1 deletion Levels/level_02/Level_02.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=62 format=4 uid="uid://bxug41xovxe8p"]
[gd_scene load_steps=63 format=4 uid="uid://bxug41xovxe8p"]

[ext_resource type="Texture2D" uid="uid://dnfflq3qda548" path="res://TileSets/2D Pixel-Dungeon_Tileset.png" id="1_iofhs"]
[ext_resource type="Texture2D" uid="uid://1wius8ss63pg" path="res://TileSets/2D Pixel-Dungeon_Tileset_floor_edit.png" id="2_keywq"]
Expand All @@ -17,6 +17,7 @@
[ext_resource type="AudioStream" uid="uid://bldv1om1tod3o" path="res://Audio/soundtrack/Metalmania.mp3" id="15_5cp77"]
[ext_resource type="AudioStream" uid="uid://bahb4ibce667t" path="res://Audio/soundtrack/Noise Attack.mp3" id="16_6o66l"]
[ext_resource type="AudioStream" uid="uid://ca8tcht4ban0m" path="res://Audio/soundtrack/Summon the Rawk.mp3" id="17_h4iq4"]
[ext_resource type="PackedScene" uid="uid://d2glbpj75vbl8" path="res://Characters/EnemyGreenOoze.tscn" id="18_bakr2"]

[sub_resource type="NavigationPolygon" id="NavigationPolygon_ufibj"]
vertices = PackedVector2Array(8, 8, 0, 8, 0, 0, 8, 0)
Expand Down Expand Up @@ -1569,3 +1570,9 @@ scale = Vector2(3, 3)
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = SubResource("AudioStreamPlaylist_fkmgx")
autoplay = true

[node name="EnemyGreenOoze3" parent="." node_paths=PackedStringArray("target") instance=ExtResource("18_bakr2")]
position = Vector2(313, 52)
scale = Vector2(1.5, 1.5)
slime_size = 400
target = NodePath("../hero")
2 changes: 1 addition & 1 deletion Menus/level_transition_scene.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ func _ready() -> void:


# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
func _process(_delta: float) -> void:
pass


Expand Down

0 comments on commit 40e5001

Please sign in to comment.