From be83513bf4cec94769e4b83b621bade3b208be83 Mon Sep 17 00:00:00 2001 From: Petra Andraschko <51335299+monochromia@users.noreply.github.com> Date: Mon, 4 Jul 2022 02:44:29 -0400 Subject: [PATCH] 420 Merge Fixes and Trail Fix (#492) * Radzo overwrite fixes, trail fixes --- scenes/platformer/characters/Bus.gd | 14 ++++------- scenes/platformer/characters/Trail.gd | 5 +--- scenes/title/TitleScreen.gd | 3 --- sprites/title_mario.png | Bin 0 -> 7256 bytes sprites/title_mario.png.import | 35 ++++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 sprites/title_mario.png create mode 100644 sprites/title_mario.png.import diff --git a/scenes/platformer/characters/Bus.gd b/scenes/platformer/characters/Bus.gd index 907fb0eec..a7b3565df 100644 --- a/scenes/platformer/characters/Bus.gd +++ b/scenes/platformer/characters/Bus.gd @@ -8,11 +8,10 @@ onready var player : Player = owner onready var horn_sound : AudioStreamPlayer = get_node("Horn") onready var resting_sound : AudioStreamPlayer2D = get_node("brrrrrrrrr") onready var moving_sound : AudioStreamPlayer2D = get_node("moving_sound") +onready var collision: CollisionShape2D = get_node(collision_shape) enum busState {RESTING, MOVING}; var state -onready var collision: CollisionShape2D = get_node(collision_shape) - func _ready() -> void: @@ -21,12 +20,6 @@ func _ready() -> void: func _process(_delta: float) -> void: - if inventory.has_bus: - player.powerupspeed = 4 - player.powerupaccel = 2 - else: - player.powerupspeed = 1 - player.powerupaccel = 1 if (Input.is_action_pressed("right") or Input.is_action_pressed("left")): _set_state(busState.MOVING) @@ -66,13 +59,16 @@ func _activate_bus(active: bool) -> void: player.powerupaccel = 1 moving_sound.playing = false resting_sound.playing = false + else: + player.powerupspeed = 4 + player.powerupaccel = 2 func _set_state(newState): if(state == newState): return if (newState == busState.RESTING): animation = "standing" - playing = false + playing = true resting_sound.playing = true # When more state sounds are added that continuously should play moving_sound.playing = false # make all the sounds a dictionary. if (newState == busState.MOVING): diff --git a/scenes/platformer/characters/Trail.gd b/scenes/platformer/characters/Trail.gd index ebe3f878c..09a28699e 100644 --- a/scenes/platformer/characters/Trail.gd +++ b/scenes/platformer/characters/Trail.gd @@ -6,16 +6,13 @@ export(int) var trail_length = 5 var positions = [] var height = 0.0 -onready var parent = get_parent() onready var player: Node2D = owner - func _ready(): - randomize() var result = FileUtils._getFilePathsFromImport(textures_directory, ".png", ".jpg") var finalPath = result[randi() % result.size()] if result: - ResourceLoader.load(finalPath, "Texture") + texture = ResourceLoader.load(finalPath, "Texture") func _process(_delta): global_position = Vector2(0, 0) diff --git a/scenes/title/TitleScreen.gd b/scenes/title/TitleScreen.gd index 9fa11badf..506fecc0a 100644 --- a/scenes/title/TitleScreen.gd +++ b/scenes/title/TitleScreen.gd @@ -18,13 +18,10 @@ func alternate_title_screen(): var screen_index = randi() % label_texts.size() var mario_sprite = get_node("VBoxContainer/IdleMario") var size=mario_sprite.texture.get_size() - mario_sprite.texture = ResourceLoader.load(sprite_paths[screen_index].rstrip(".import"), "Texture") var sizeto=mario_sprite.texture.get_size() - var scale_factor = sizeto/size if sizeto < size else size/sizeto mario_sprite.scale=scale_factor - var mario_label = get_node("VBoxContainer/Mario") mario_label.text = label_texts[screen_index] mario_label.bbcode_text = "\n" + TextUtils.center(TextUtils.wave(TextUtils.rainbow(mario_label.text))) diff --git a/sprites/title_mario.png b/sprites/title_mario.png new file mode 100644 index 0000000000000000000000000000000000000000..679b2e7c2adbf9b7a8d0525a96e3106fd91062e1 GIT binary patch literal 7256 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