diff --git a/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.md5 b/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.md5 index eccfa97..f1c87e7 100644 --- a/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.md5 +++ b/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.md5 @@ -1,3 +1,3 @@ -source_md5="3384dd00c44f65297c45a26a1b808f2c" -dest_md5="7f8383210199c01e63f81f4a23f2568b" +source_md5="b1c3441f4097c8ecb7b28e28e63031cc" +dest_md5="0ccc925a53515f2444c2ca7a6e6ff4eb" diff --git a/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.stex b/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.stex index dec187f..e6ccbb6 100644 Binary files a/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.stex and b/.import/water1.png-96dd6aee434a7808b413abd6ab0e2583.stex differ diff --git a/Resources/Graphics/Water/water1.png b/Resources/Graphics/Water/water1.png index afce59e..1cbfa2b 100644 Binary files a/Resources/Graphics/Water/water1.png and b/Resources/Graphics/Water/water1.png differ diff --git a/World/TileHandler.gd b/World/TileHandler.gd index a83bcaa..7368f39 100644 --- a/World/TileHandler.gd +++ b/World/TileHandler.gd @@ -12,7 +12,8 @@ func spawn(): for y in range (0, map_size.y): var tile = Tile.instance() tile.set_tile_id(Vector2(x,y)) - if x == 0 or x == map_size.x -1 or y== 0 or y==map_size.y -1: + # tile is coast if its on one of the outer borders + if x == 0 or x == map_size.x -1 or y == 0 or y==map_size.y -1: tile.is_coast = true tiles.append(tile) add_child(tile) diff --git a/World/Tiles/CoastalProps.gd b/World/Tiles/CoastalProps.gd new file mode 100644 index 0000000..91bb931 --- /dev/null +++ b/World/Tiles/CoastalProps.gd @@ -0,0 +1,17 @@ +extends Node2D + +func _ready() -> void: + set_random_platform() + +# selects one of the platform sprites randomly and picks it +func set_random_platform(): + var sprite = $Platform + var reflection = $Reflection + var sprites = [ + preload("res://Resources/Graphics/Tiles/platform.png"), + preload("res://Resources/Graphics/Tiles/platform2.png"), + preload("res://Resources/Graphics/Tiles/platform3.png"), + preload("res://Resources/Graphics/Tiles/platform4.png"), + ] + sprite.texture = sprites[Randomizer.rng.randi_range(0, sprites.size() - 1)] + reflection.texture = sprite.texture diff --git a/World/Tiles/CoastalProps.tscn b/World/Tiles/CoastalProps.tscn index cf6afdd..121e343 100644 --- a/World/Tiles/CoastalProps.tscn +++ b/World/Tiles/CoastalProps.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://World/Tiles/Reflection.gd" type="Script" id=1] [ext_resource path="res://Resources/Graphics/Water/close_to_land.png" type="Texture" id=2] [ext_resource path="res://Resources/Graphics/Tiles/platform.png" type="Texture" id=3] +[ext_resource path="res://World/Tiles/CoastalProps.gd" type="Script" id=4] [sub_resource type="ParticlesMaterial" id=6] emission_shape = 2 @@ -40,6 +40,7 @@ animations = [ { } ] [node name="CoastalProps" type="Node2D"] +script = ExtResource( 4 ) [node name="Platform" type="Sprite" parent="."] position = Vector2( 0, 16 ) @@ -60,11 +61,10 @@ position = Vector2( 0, 37 ) z_index = -1 texture = ExtResource( 3 ) flip_v = true -script = ExtResource( 1 ) [node name="Water" type="AnimatedSprite" parent="."] position = Vector2( 0, 16 ) z_index = -1 frames = SubResource( 1 ) -frame = 1 +frame = 2 playing = true diff --git a/World/Tiles/Tile.gd b/World/Tiles/Tile.gd index 3a1818d..b62e0f1 100644 --- a/World/Tiles/Tile.gd +++ b/World/Tiles/Tile.gd @@ -6,7 +6,6 @@ var is_coast = false func _ready() -> void: if is_coast: add_child(preload("res://World/Tiles/CoastalProps.tscn").instance()) - set_random_platform() func change_color_to(color): var sprite = $Sprite @@ -30,12 +29,3 @@ func set_position(id: Vector2): position.y = id.y * 26 if (fmod(id.y, 2)) == 0: position.x += 16 - -func set_random_platform(): - var sprite = $Platform - var sprites = [ - preload("res://Resources/Graphics/Tiles/platform.png"), - preload("res://Resources/Graphics/Tiles/platform2.png"), - preload("res://Resources/Graphics/Tiles/platform3.png"), - preload("res://Resources/Graphics/Tiles/platform4.png"), - ]