From 124b5e16aa747d3bea212f8f45bdcde88b727679 Mon Sep 17 00:00:00 2001
From: pennyrigate <pennyrigate@cybergal.com>
Date: Fri, 13 Jan 2023 16:00:43 -0500
Subject: [PATCH] adjusted roller fiend

---
 graphics/enemy/roller_fiend.png               | Bin 647 -> 638 bytes
 graphics/enemy/roller_fiend_small.png.import  |  35 +++++++++++
 maps/cave.tscn                                |  57 +++++++++++++++++-
 objects/enemy/rolling_fiend.tscn              |  10 +--
 .../falling_block/falling_block.tscn          |   1 +
 objects/environment/rock/rock.tscn            |   1 -
 6 files changed, 96 insertions(+), 8 deletions(-)
 create mode 100644 graphics/enemy/roller_fiend_small.png.import

diff --git a/graphics/enemy/roller_fiend.png b/graphics/enemy/roller_fiend.png
index a24e4778101029b3431c95d424f733287b7bb484..75628091051b965532a686ce4feada0247836569 100644
GIT binary patch
delta 159
zcmV;Q0AT-z1^xuE=mCGh000ib0l1NC?EnA(bV)=(R47x8k5LZ5AP7UP^ZsWZg^G}6
z+4=*m57e<f^cxtXpsiO$2{#Ou1XL+M@EL0az!V(?c>z{{IU8}jfO%bvv`^k!0^}{g
zdA&Rpkya+qub}E9i5<UZ%0KOQZrTQAA@xxb$W>d49(hV5?|>I;tsB0|28C`BfV=<z
N002ovPDHLkV1gP;Ks5jW

delta 168
zcmV;Z09XJ11cwE%=mCGi000ic0Tn1pfB*mheMv+?R47x0kii0gFbG0*?f<_yM6_9l
zIHb_it!)3O0J8%fy{aGKgjHQN<j+(C4rLee^w??w!Vf~803I-FF-e_Xz`8C*wJ^N^
z@(3`Y>$fKmL9Hxc9HB&>7dw3dOtJ%D^_jE`p?Z&~(P#w3)LS6=#~bKXt&G0;(B3yc
WN(K!ipq8!x0000<MNUMnLSTZPhDFf;

diff --git a/graphics/enemy/roller_fiend_small.png.import b/graphics/enemy/roller_fiend_small.png.import
new file mode 100644
index 0000000..823feea
--- /dev/null
+++ b/graphics/enemy/roller_fiend_small.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/roller_fiend_small.png-efb72678baec971ddc1e0966a158ebaa.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://graphics/enemy/roller_fiend_small.png"
+dest_files=[ "res://.import/roller_fiend_small.png-efb72678baec971ddc1e0966a158ebaa.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/maps/cave.tscn b/maps/cave.tscn
index 3319bc4..f0b0f0f 100644
--- a/maps/cave.tscn
+++ b/maps/cave.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
@@ -17,6 +17,7 @@
 [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=15]
 [ext_resource path="res://objects/enemy/tentacle.tscn" type="PackedScene" id=16]
 [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=17]
+[ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=18]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 4, 96 )
@@ -31,6 +32,9 @@ music = ExtResource( 12 )
 position = Vector2( 128, 96 )
 z_index = -2
 texture = ExtResource( 8 )
+__meta__ = {
+"_edit_lock_": true
+}
 
 [node name="CanvasLayer" parent="." instance=ExtResource( 4 )]
 
@@ -39,7 +43,7 @@ tile_set = ExtResource( 2 )
 cell_size = Vector2( 8, 8 )
 collision_layer = 9
 format = 1
-tile_data = PoolIntArray( 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 720905, 0, 65537, 720906, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 0, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 851994, 0, 0, 917530, 0, 0, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983066, 0, 0, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1179648, 0, 65537, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1245192, 0, 65537, 1245193, 0, 65537, 1245194, 0, 65537, 1245195, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 )
+tile_data = PoolIntArray( 262153, 0, 65537, 262154, 0, 65537, 262155, 0, 65537, 262156, 0, 0, 327685, 0, 65537, 327686, 0, 65537, 327687, 0, 65537, 327692, 0, 0, 393228, 0, 0, 458763, 0, 65537, 458764, 0, 65537, 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 0, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 851994, 0, 0, 917530, 0, 0, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 0, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983066, 0, 0, 1048581, 0, 0, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1114117, 0, 0, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1179653, 0, 65537, 1245192, 0, 65537, 1245193, 0, 65537, 1245194, 0, 65537, 1245195, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 )
 
 [node name="Player" parent="." instance=ExtResource( 1 )]
 position = Vector2( 32, 166 )
@@ -60,6 +64,21 @@ scale = Vector2( 1, 10 )
 [node name="Rock" parent="Platforms" instance=ExtResource( 3 )]
 position = Vector2( 138, 144 )
 
+[node name="FallingBlock" parent="Platforms" instance=ExtResource( 18 )]
+position = Vector2( 56, 72 )
+
+[node name="FallingBlock4" parent="Platforms" instance=ExtResource( 18 )]
+position = Vector2( 64, 40 )
+
+[node name="FallingBlock2" parent="Platforms" instance=ExtResource( 18 )]
+position = Vector2( 40, 64 )
+
+[node name="FallingBlock5" parent="Platforms" instance=ExtResource( 18 )]
+position = Vector2( 0, 144 )
+
+[node name="FallingBlock3" parent="Platforms" instance=ExtResource( 18 )]
+position = Vector2( 16, 56 )
+
 [node name="Enemies" type="Node2D" parent="."]
 
 [node name="Snail" parent="Enemies" instance=ExtResource( 7 )]
@@ -72,15 +91,28 @@ position = Vector2( 64, 112 )
 left_up_boundry = 3.0
 right_down_boundry = 3.0
 
+[node name="Snail3" parent="Enemies" instance=ExtResource( 7 )]
+position = Vector2( 8, 80 )
+right_down_boundry = 6.0
+
 [node name="Bat" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 120, 96 )
 right_down_boundry = 10.0
 
+[node name="Bat3" parent="Enemies" instance=ExtResource( 10 )]
+position = Vector2( 32, 56 )
+right_down_boundry = 4.0
+speed = 20
+
+[node name="Bat4" parent="Enemies" instance=ExtResource( 10 )]
+position = Vector2( 80, 24 )
+right_down_boundry = 6.0
+
 [node name="Bat2" parent="Enemies" instance=ExtResource( 10 )]
 position = Vector2( 32, 120 )
 left_up_boundry = 3.0
 right_down_boundry = 3.0
-speed = 80
+speed = 60
 
 [node name="RollingFiend" parent="Enemies" instance=ExtResource( 13 )]
 position = Vector2( 144, 96 )
@@ -123,6 +155,21 @@ position = Vector2( 80, 112 )
 [node name="Gold5" parent="Collectibles" instance=ExtResource( 14 )]
 position = Vector2( 48, 112 )
 
+[node name="Gold13" parent="Collectibles" instance=ExtResource( 14 )]
+position = Vector2( 56, 64 )
+
+[node name="Gold16" parent="Collectibles" instance=ExtResource( 14 )]
+position = Vector2( 16, 80 )
+
+[node name="Gold17" parent="Collectibles" instance=ExtResource( 14 )]
+position = Vector2( 32, 80 )
+
+[node name="Gold14" parent="Collectibles" instance=ExtResource( 14 )]
+position = Vector2( 40, 56 )
+
+[node name="Gold15" parent="Collectibles" instance=ExtResource( 14 )]
+position = Vector2( 16, 48 )
+
 [node name="Gold7" parent="Collectibles" instance=ExtResource( 14 )]
 position = Vector2( 24, 136 )
 
@@ -135,6 +182,10 @@ position = Vector2( 64, 112 )
 [node name="Star" parent="Collectibles" instance=ExtResource( 15 )]
 position = Vector2( 8, 136 )
 
+[node name="Star2" parent="Collectibles" instance=ExtResource( 15 )]
+position = Vector2( 88, 48 )
+color = 1
+
 [node name="Shard" parent="Collectibles" instance=ExtResource( 17 )]
 position = Vector2( 192, 120 )
 
diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn
index 73044aa..3cf3370 100644
--- a/objects/enemy/rolling_fiend.tscn
+++ b/objects/enemy/rolling_fiend.tscn
@@ -10,24 +10,24 @@ shader = ExtResource( 4 )
 shader_param/border_color = Color( 0, 0, 0, 1 )
 shader_param/border_corners = false
 
-[sub_resource type="AtlasTexture" id=1]
+[sub_resource type="AtlasTexture" id=6]
 atlas = ExtResource( 2 )
 region = Rect2( 0, 0, 16, 16 )
 
-[sub_resource type="AtlasTexture" id=2]
+[sub_resource type="AtlasTexture" id=7]
 atlas = ExtResource( 2 )
 region = Rect2( 16, 0, 16, 16 )
 
 [sub_resource type="SpriteFrames" id=3]
 animations = [ {
-"frames": [ SubResource( 1 ), SubResource( 2 ) ],
+"frames": [ SubResource( 6 ), SubResource( 7 ) ],
 "loop": true,
 "name": "default",
 "speed": 10.0
 } ]
 
 [sub_resource type="RectangleShape2D" id=4]
-extents = Vector2( 4, 4 )
+extents = Vector2( 4.0094, 4.0094 )
 
 [node name="RollingFiend" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
@@ -45,7 +45,9 @@ playing = true
 position = Vector2( 0, 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox" index="0"]
+position = Vector2( -0.010025, 0.0104442 )
 rotation = -0.020475
+scale = Vector2( 1, 1 )
 shape = SubResource( 4 )
 
 [node name="Raycasts" type="Node2D" parent="." index="2"]
diff --git a/objects/environment/falling_block/falling_block.tscn b/objects/environment/falling_block/falling_block.tscn
index e1a5f87..a2549d8 100644
--- a/objects/environment/falling_block/falling_block.tscn
+++ b/objects/environment/falling_block/falling_block.tscn
@@ -10,6 +10,7 @@ extents = Vector2( 4, 3.5 )
 extents = Vector2( 4, 0.5 )
 
 [node name="FallingBlock" type="KinematicBody2D"]
+collision_layer = 4
 script = ExtResource( 2 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
diff --git a/objects/environment/rock/rock.tscn b/objects/environment/rock/rock.tscn
index 1d1d15e..1054857 100644
--- a/objects/environment/rock/rock.tscn
+++ b/objects/environment/rock/rock.tscn
@@ -4,7 +4,6 @@
 [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2]
 [ext_resource path="res://objects/environment/rock/rock.gd" type="Script" id=3]
 
-
 [sub_resource type="ShaderMaterial" id=1]
 shader = ExtResource( 2 )
 shader_param/border_color = Color( 0, 0, 0, 1 )