From e0c4bf60778bd87ffd0e1e293c1f9535dda57613 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sat, 21 Jan 2023 20:33:57 -0500 Subject: [PATCH] add jumping spider --- graphics/enemy/jumping_spider.png | Bin 0 -> 236 bytes graphics/enemy/jumping_spider.png.import | 35 +++++++ maps/canopy.tscn | 20 ++-- objects/enemy/enemy_jump.gd | 33 +++++++ objects/enemy/jumping_spider.tscn | 112 +++++++++++++++++++++++ objects/enemy/spider.gd | 12 ++- 6 files changed, 195 insertions(+), 17 deletions(-) create mode 100644 graphics/enemy/jumping_spider.png create mode 100644 graphics/enemy/jumping_spider.png.import create mode 100644 objects/enemy/enemy_jump.gd create mode 100644 objects/enemy/jumping_spider.tscn diff --git a/graphics/enemy/jumping_spider.png b/graphics/enemy/jumping_spider.png new file mode 100644 index 0000000000000000000000000000000000000000..8fab00a9ecc310f4dcad79e2fb4d3d70102fa233 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eZ!3-q5rDLmr6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K{s5m4S0K$Lr}5R;>Hq)#K=wz)`t?AHwIs+d7%1|e;rBMaV4whJfk$L9 z0|Vb-5N14{zaj-F80zWb7@`r}>f6ZMV8G*a_rE#!7U$_lJ%SH;oi?!hn5?+v0CThu z_bH)2Q}|Z$E5?;at7~8DQ3!mwLU}%ihPe1@y9(EWMb_unrn#(N=G*t-TH4ir2YB;7 WGAEz8Cw3EP0fVQjpUXO@geCya*G%mI literal 0 HcmV?d00001 diff --git a/graphics/enemy/jumping_spider.png.import b/graphics/enemy/jumping_spider.png.import new file mode 100644 index 0000000..bb6f877 --- /dev/null +++ b/graphics/enemy/jumping_spider.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/jumping_spider.png-d49bb22c8a49a203bb5fd0508e4d9bab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/enemy/jumping_spider.png" +dest_files=[ "res://.import/jumping_spider.png-d49bb22c8a49a203bb5fd0508e4d9bab.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/canopy.tscn b/maps/canopy.tscn index 0424a91..ceb85e3 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -1,14 +1,12 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=1] [ext_resource path="res://maps/map.gd" type="Script" id=2] [ext_resource path="res://graphics/backgrounds/canopy.png" type="Texture" id=3] [ext_resource path="res://tilesets/t_canopy.tres" type="TileSet" id=4] -[ext_resource path="res://objects/enemy/skelarcher.tscn" type="PackedScene" id=5] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=7] -[ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=8] -[ext_resource path="res://objects/enemy/spider.tscn" type="PackedScene" id=9] +[ext_resource path="res://objects/enemy/jumping_spider.tscn" type="PackedScene" id=10] [node name="Map" type="Node2D" groups=["map"]] script = ExtResource( 2 ) @@ -24,18 +22,14 @@ texture = ExtResource( 3 ) tile_set = ExtResource( 4 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 983050, 0, 65536, 983051, 0, 65537, 983052, 0, 65537, 983053, 0, 65537, 983054, 0, 65537, 983055, 0, 65537, 983056, 0, 65538, 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, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537 ) +tile_data = PoolIntArray( 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, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537 ) [node name="Player" parent="." instance=ExtResource( 6 )] position = Vector2( 24, 166 ) -[node name="Skelarcher" parent="." instance=ExtResource( 5 )] -position = Vector2( 70, 166 ) - [node name="CanvasLayer" parent="." instance=ExtResource( 7 )] -[node name="Arrow" parent="." instance=ExtResource( 8 )] -position = Vector2( 43, 167 ) - -[node name="Spider" parent="." instance=ExtResource( 9 )] -position = Vector2( 120, 144 ) +[node name="JumpingSpider" parent="." instance=ExtResource( 10 )] +position = Vector2( 88, 168 ) +left_boundary = 3 +right_boundary = 3 diff --git a/objects/enemy/enemy_jump.gd b/objects/enemy/enemy_jump.gd new file mode 100644 index 0000000..6589a2a --- /dev/null +++ b/objects/enemy/enemy_jump.gd @@ -0,0 +1,33 @@ +extends "res://objects/enemy/enemy.gd" + +export var left_boundary = 0 +export var right_boundary = 0 +export var speed = 50 +export var flip_sprite = true +export var direction = 1 +onready var startpos = position + +onready var anims = $AnimationPlayer +onready var sprite = $Sprite + +func _ready(): + anims.play("idle") + +func _physics_process(delta): + if anims.current_animation == "jump": + #Move + position.x += direction * (speed * delta) + #Switch dir + if position.x >= startpos.x + (right_boundary * 8): + direction = -1 + if flip_sprite == true: sprite.scale.x = -1 + if position.x <= startpos.x + (-left_boundary * 8): + direction = 1 + if flip_sprite == true: sprite.scale.x = 1 + + +func _on_AnimationPlayer_animation_finished(anim_name): + if anim_name == "idle": + anims.play("jump") + else: + anims.play("idle") diff --git a/objects/enemy/jumping_spider.tscn b/objects/enemy/jumping_spider.tscn new file mode 100644 index 0000000..c5bfb26 --- /dev/null +++ b/objects/enemy/jumping_spider.tscn @@ -0,0 +1,112 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://graphics/enemy/jumping_spider.png" type="Texture" id=1] +[ext_resource path="res://objects/enemy/enemy_jump.gd" type="Script" id=2] + +[sub_resource type="Animation" id=1] +resource_name = "idle" +length = 0.5 +step = 0.35 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:region_rect") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Rect2( 0, 0, 13, 12 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Sprite:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 4, 2 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Hitbox:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Vector2( 0, 0 ) ] +} + +[sub_resource type="Animation" id=2] +resource_name = "jump" +length = 0.3 +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:region_rect") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ Rect2( 13, 0, 13, 12 ) ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Sprite:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 0.15, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 4, -2 ), Vector2( 4, -16 ), Vector2( 4, -2 ) ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Hitbox:position") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 0.15, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 0, -4 ), Vector2( 0, -18 ), Vector2( 0, -4 ) ] +} + +[sub_resource type="RectangleShape2D" id=3] +extents = Vector2( 4.5, 4 ) + +[node name="JumpingSpider" type="Node2D"] +position = Vector2( 0, -4 ) +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 4, 2 ) +texture = ExtResource( 1 ) +region_enabled = true +region_rect = Rect2( 0, 0, 13, 12 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +anims/idle = SubResource( 1 ) +anims/jump = SubResource( 2 ) + +[node name="Hitbox" type="Area2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] +position = Vector2( 3.5, 4 ) +shape = SubResource( 3 ) + +[connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"] +[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] diff --git a/objects/enemy/spider.gd b/objects/enemy/spider.gd index dc63350..048b16d 100644 --- a/objects/enemy/spider.gd +++ b/objects/enemy/spider.gd @@ -6,7 +6,10 @@ export var direction = 1.0 onready var line = $Line2D onready var hitbox = $Hitbox -var floor_y = 0.0 +export var up_boundary = 0 +export var down_boundary = 0 + +#var floor_y = 0.0 func _ready(): var raycast = $RayCast2D @@ -19,7 +22,8 @@ func _ready(): # detect floor raycast.cast_to = Vector2(0.0, 192.0) raycast.force_raycast_update() - floor_y = to_local(raycast.get_collision_point()).y - 3 + #floor_y = to_local(raycast.get_collision_point()).y - 3 + down_boundary *= 8 raycast.queue_free() func _physics_process(delta): @@ -27,8 +31,8 @@ func _physics_process(delta): if hitbox.position.y < 5.0: hitbox.position.y = 5.0 direction = 1.0 - if hitbox.position.y > floor_y: - hitbox.position.y = floor_y + if hitbox.position.y > down_boundary: + hitbox.position.y = down_boundary direction = -1.0 line.points[1].y = hitbox.position.y death_blood_offset = hitbox.position