made some changes :3

This commit is contained in:
pennyrigate 2023-04-28 16:58:17 -04:00
parent a0b48c76d1
commit 82f2ebfc12
10 changed files with 157 additions and 65 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

View file

@ -0,0 +1,35 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/artificial_soul.png-56b840ad8304c2739f473a4d5b5b0e29.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://graphics/enemy/artificial_soul.png"
dest_files=[ "res://.import/artificial_soul.png-56b840ad8304c2739f473a4d5b5b0e29.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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

View file

@ -167,6 +167,9 @@ position = Vector2( 336, 136 )
[node name="Turniwood19" parent="Platforms" instance=ExtResource( 13 )]
position = Vector2( 400, 144 )
[node name="Turniwood29" parent="Platforms" instance=ExtResource( 13 )]
position = Vector2( 328, 40 )
[node name="Turniwood18" parent="Platforms" instance=ExtResource( 13 )]
position = Vector2( 312, 136 )
delay = 1.0
@ -199,26 +202,16 @@ position = Vector2( 200, 112 )
[node name="Enemies" type="Node2D" parent="."]
[node name="JumpingSpider" parent="Enemies" instance=ExtResource( 10 )]
position = Vector2( 56, 168 )
left_boundary = 2
right_boundary = 4
[node name="JumpingSpider5" parent="Enemies" instance=ExtResource( 10 )]
position = Vector2( 16, 40 )
left_boundary = 2
right_boundary = 3
right_boundary = 4
[node name="JumpingSpider4" parent="Enemies" instance=ExtResource( 10 )]
position = Vector2( 208, 88 )
left_boundary = 2
right_boundary = 3
[node name="JumpingSpider7" parent="Enemies" instance=ExtResource( 10 )]
position = Vector2( 216, 48 )
left_boundary = 2
right_boundary = 3
[node name="JumpingSpider8" parent="Enemies" instance=ExtResource( 10 )]
position = Vector2( 392, 24 )
left_boundary = 4
@ -238,7 +231,7 @@ position = Vector2( 240, 24 )
scale = Vector2( -1, 1 )
[node name="Skelarcher6" parent="Enemies" instance=ExtResource( 5 )]
position = Vector2( 96, 56 )
position = Vector2( 208, 48 )
scale = Vector2( -1, 1 )
shoot_time = 2.0
@ -282,6 +275,11 @@ position = Vector2( 16, 56 )
speed = 50.0
down_boundary = 4
[node name="Spider12" parent="Enemies" instance=ExtResource( 9 )]
position = Vector2( 48, 144 )
speed = 50.0
down_boundary = 4
[node name="Spider3" parent="Enemies" instance=ExtResource( 9 )]
position = Vector2( 536, 88 )
speed = 40.0
@ -378,16 +376,16 @@ position = Vector2( 184, 24 )
position = Vector2( 216, 24 )
[node name="Gold17" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 208, 48 )
position = Vector2( 216, 48 )
[node name="Gold18" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 232, 48 )
position = Vector2( 240, 48 )
[node name="Gold23" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 184, 88 )
position = Vector2( 96, 56 )
[node name="Gold24" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 336, 48 )
position = Vector2( 344, 48 )
[node name="Gold25" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 312, 88 )
@ -432,7 +430,7 @@ position = Vector2( 560, 56 )
position = Vector2( 640, 136 )
[node name="Gold36" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 312, 48 )
position = Vector2( 304, 48 )
[node name="Gold51" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 632, 56 )
@ -459,7 +457,7 @@ position = Vector2( 416, 24 )
position = Vector2( 368, 24 )
[node name="Gold44" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 232, 88 )
position = Vector2( 72, 56 )
[node name="Gold22" parent="Collectibles" instance=ExtResource( 11 )]
position = Vector2( 536, 112 )

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=30 format=2]
[gd_scene load_steps=32 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]
@ -24,6 +24,8 @@
[ext_resource path="res://objects/enemy/rolling_fiend.tscn" type="PackedScene" id=22]
[ext_resource path="res://objects/enemy/steam.tscn" type="PackedScene" id=23]
[ext_resource path="res://objects/enemy/laser_wall.tscn" type="PackedScene" id=24]
[ext_resource path="res://objects/enemy/cop.tscn" type="PackedScene" id=25]
[ext_resource path="res://objects/environment/turret/turret_bullet.tscn" type="PackedScene" id=26]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 16, 20 )
@ -70,7 +72,7 @@ tile_set = ExtResource( 3 )
cell_size = Vector2( 8, 8 )
collision_layer = 9
format = 1
tile_data = PoolIntArray( 196630, 1, 0, 262166, 1, 0, 327702, 1, 0, 393238, 1, 0, 458774, 1, 0, 524310, 1, 0, 589846, 1, 0, 655382, 1, 0, 655388, 0, 196609, 983065, 0, 65537, 983066, 0, 65537, 983067, 0, 65537, 983068, 0, 65537, 983069, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1114125, 0, 0, 1114126, 0, 0, 1114127, 0, 0, 1179663, 0, 0, 1245199, 0, 0, 1245202, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310737, 0, 65537, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 1310745, 0, 65537, 1310746, 0, 65537, 1310747, 0, 65537, 1310748, 0, 65537, 1310749, 0, 65537, 1310750, 0, 65537, 1310751, 0, 65537, 1310752, 0, 65537, 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, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1 )
tile_data = PoolIntArray( 196630, 1, 0, 262166, 1, 0, 327702, 1, 0, 393238, 1, 0, 458774, 1, 0, 524310, 1, 0, 589846, 1, 0, 655382, 1, 0, 655388, 0, 196609, 983062, 0, 65537, 983063, 0, 65537, 983064, 0, 65537, 983065, 0, 65537, 983066, 0, 65537, 983067, 0, 65537, 983068, 0, 65537, 983069, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1114125, 0, 0, 1114126, 0, 0, 1114127, 0, 0, 1179663, 0, 0, 1245199, 0, 0, 1245202, 0, 0, 1310734, 0, 0, 1310735, 0, 0, 1310736, 0, 0, 1310737, 0, 65537, 1310738, 0, 0, 1310739, 0, 0, 1310740, 0, 0, 1310741, 0, 0, 1310742, 0, 0, 1310743, 0, 0, 1310744, 0, 0, 1310745, 0, 65537, 1310746, 0, 65537, 1310747, 0, 65537, 1310748, 0, 65537, 1310749, 0, 65537, 1310750, 0, 65537, 1310751, 0, 65537, 1310752, 0, 65537, 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, 1507328, 0, 1, 1507329, 0, 1, 1507330, 0, 1, 1507331, 0, 1, 1507332, 0, 1, 1507333, 0, 1, 1507334, 0, 1, 1507335, 0, 1, 1507336, 0, 1, 1507337, 0, 1, 1507338, 0, 1, 1507339, 0, 1, 1507340, 0, 1, 1507341, 0, 1, 1507342, 0, 1, 1507343, 0, 1, 1507344, 0, 1, 1507345, 0, 1, 1507346, 0, 1, 1507347, 0, 1, 1507348, 0, 1, 1507349, 0, 1, 1507350, 0, 1, 1507351, 0, 1, 1507352, 0, 1, 1507353, 0, 1, 1507354, 0, 1, 1507355, 0, 1, 1507356, 0, 1, 1507357, 0, 1, 1507358, 0, 1, 1507359, 0, 1 )
[node name="Rock" parent="." instance=ExtResource( 9 )]
position = Vector2( 152, 120 )
@ -94,7 +96,7 @@ position = Vector2( 216, 168 )
position = Vector2( 104, 120 )
[node name="Player" parent="." instance=ExtResource( 1 )]
position = Vector2( 136, 144 )
position = Vector2( 224, 64 )
[node name="Ladder3" parent="." instance=ExtResource( 8 )]
position = Vector2( 40, 136 )
@ -155,6 +157,7 @@ material = SubResource( 4 )
position = Vector2( 120, 168 )
z_index = -3
frames = SubResource( 5 )
frame = 1
playing = true
[node name="SawTest4" type="AnimatedSprite" parent="."]
@ -162,7 +165,6 @@ material = SubResource( 4 )
position = Vector2( 160, 168 )
z_index = -3
frames = SubResource( 5 )
frame = 1
playing = true
[node name="SawTest5" type="AnimatedSprite" parent="."]
@ -170,7 +172,6 @@ material = SubResource( 4 )
position = Vector2( 56, 176 )
z_index = -3
frames = SubResource( 5 )
frame = 1
playing = true
[node name="RollingFiend" parent="." instance=ExtResource( 22 )]
@ -185,6 +186,7 @@ material = SubResource( 4 )
position = Vector2( 4, 4 )
z_index = -3
frames = SubResource( 5 )
frame = 1
playing = true
[node name="Steam" parent="." instance=ExtResource( 23 )]
@ -206,11 +208,18 @@ left_up_boundary = 5.0
right_down_boundary = 5.0
[node name="MsX" parent="." groups=["a"] instance=ExtResource( 15 )]
position = Vector2( 160, 104 )
position = Vector2( 296, 144 )
scale = Vector2( -1, 1 )
[node name="Skelarcher" parent="." instance=ExtResource( 18 )]
position = Vector2( 248, 152 )
scale = Vector2( -1, 1 )
[node name="Cop" parent="." instance=ExtResource( 25 )]
position = Vector2( 184, 112 )
turn_time = inf
[node name="TurretBullet" parent="." instance=ExtResource( 26 )]
position = Vector2( 152, 72 )
[editable path="RollingFiend"]

View file

@ -0,0 +1,74 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://graphics/enemy/tin_eye.png" type="Texture" id=1]
[ext_resource path="res://objects/enemy/ghost_scholar.gd" type="Script" id=2]
[ext_resource path="res://graphics/enemy/artificial_soul.png" type="Texture" id=3]
[sub_resource type="Animation" id=2]
resource_name = "eye hue"
loop = true
step = 0.125
tracks/0/type = "value"
tracks/0/path = NodePath("Eye:modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.5, 1 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 0,
"values": [ Color( 0.560784, 1, 0.560784, 1 ), Color( 1, 0.560784, 0.568627, 1 ), Color( 0.560784, 1, 0.560784, 1 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath(".:rotation_degrees")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
"update": 1,
"values": [ 360.0, -90.0, -180.0, -270.0, -360.0, -90.0, -180.0, -270.0, -360.0 ]
}
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 3, 3.5 )
[node name="Ghost" type="Node2D"]
script = ExtResource( 2 )
radius = 4.0
speed = 2.0
[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]]
position = Vector2( 36, 4 )
[node name="Sprite" type="Sprite" parent="Hitbox"]
unique_name_in_owner = true
rotation = 6.28319
texture = ExtResource( 3 )
[node name="Eye" type="Sprite" parent="Hitbox/Sprite"]
modulate = Color( 0.580934, 0.97985, 0.561144, 1 )
position = Vector2( 1, 0 )
texture = ExtResource( 1 )
[node name="EyeAnim" type="AnimationPlayer" parent="Hitbox/Sprite"]
autoplay = "eye hue"
"anims/eye hue" = SubResource( 2 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
position = Vector2( 0, -0.5 )
shape = SubResource( 1 )
[node name="Pivot" type="Node2D" parent="."]
position = Vector2( 4, 4 )
[node name="RemoteTransform" type="RemoteTransform2D" parent="Pivot"]
position = Vector2( 32, 0 )
remote_path = NodePath("../../Hitbox")
update_rotation = false
update_scale = false
[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]

View file

@ -24,6 +24,7 @@ var shooting = false
var turns = 0
const BoneParticle = preload("res://objects/enemy/bone_particle.tscn")
const EasyBullet = preload("res://objects/environment/turret/turret_bullet.tscn")
func _ready():
if Engine.editor_hint:
@ -38,6 +39,11 @@ func _ready():
sprite.speed_scale = inverse_lerp(0.0, 25.0, walk_speed)
func _physics_process(delta):
var easy_bullet = EasyBullet.instance()
easy_bullet.direction = Vector2.RIGHT
easy_bullet.global_position = global_position
get_parent().call_deferred("add_child", easy_bullet)
Game.instance_node(EasyBullet,global_position.x,global_position.y,self)
if Engine.editor_hint:
return
if !shooting:
@ -45,6 +51,10 @@ func _physics_process(delta):
var collider = shoot_cast.get_collider()
if collider != null && (collider.is_in_group("player") or collider.is_in_group("msx")):
if Game.get_sector(global_position) == Game.get_sector(collider.global_position):
if Game.is_easy_mode:
#Console.print("test")
Game.instance_node(EasyBullet,global_position.x,global_position.y,self)
else:
# kill player and enter shooting state temporarily
collider.get_parent().die()
# play sound

View file

@ -1,35 +0,0 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://objects/enemy/ghost_scholar.gd" type="Script" id=1]
[ext_resource path="res://graphics/enemy/ghost.png" type="Texture" id=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 3, 3.5 )
[node name="Ghost" type="Node2D"]
script = ExtResource( 1 )
radius = 4.0
speed = 2.0
[node name="Hitbox" type="Area2D" parent="." groups=["enemy_hitbox"]]
position = Vector2( 36, 4 )
[node name="Sprite" type="Sprite" parent="Hitbox"]
unique_name_in_owner = true
texture = ExtResource( 2 )
hframes = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"]
position = Vector2( 0, -0.5 )
shape = SubResource( 1 )
[node name="Pivot" type="Node2D" parent="."]
position = Vector2( 4, 4 )
[node name="RemoteTransform" type="RemoteTransform2D" parent="Pivot"]
position = Vector2( 32, 0 )
remote_path = NodePath("../../Hitbox")
update_rotation = false
update_scale = false
[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]

View file

@ -40,6 +40,7 @@ move_speed = 50.0
material = SubResource( 5 )
position = Vector2( 4, 4 )
frames = SubResource( 3 )
frame = 1
playing = true
[node name="FloorTestShape" type="CollisionShape2D" parent="."]