From b2baccfa57e80c25e8a4bdda6daa0a346ff1c242 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Mon, 19 Dec 2022 21:08:18 -0500 Subject: [PATCH] adjusted level and barrier --- ...x.png-471522c3a6235b97f30314aef2b04619.md5 | 3 + ....png-471522c3a6235b97f30314aef2b04619.stex | Bin 0 -> 86 bytes ...s.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 | 4 +- ....png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex | Bin 408 -> 432 bytes game.gd | 2 +- graphics/barrier/barrier_2px.png | Bin 0 -> 137 bytes graphics/barrier/barrier_2px.png.import | 35 ++++++++++ graphics/tiles/grass.png | Bin 416 -> 450 bytes maps/map01.tscn | 60 ++++++++++-------- objects/barrier/barrier.gd | 11 +++- objects/barrier/barrier.tscn | 15 ++--- objects/enemy/snake.tscn | 4 +- objects/ladder/ladder.tscn | 2 + objects/player/player.gd | 10 ++- objects/player/player.tscn | 7 +- tilesets/t_grass.tres | 31 ++++++++- 16 files changed, 138 insertions(+), 46 deletions(-) create mode 100644 .import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 create mode 100644 .import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex create mode 100644 graphics/barrier/barrier_2px.png create mode 100644 graphics/barrier/barrier_2px.png.import diff --git a/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 new file mode 100644 index 0000000..f8f302f --- /dev/null +++ b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.md5 @@ -0,0 +1,3 @@ +source_md5="ad86b83e2fd56ca2374f293cbcb17853" +dest_md5="a7728af58a624b5da2e618b0c71442f4" + diff --git a/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex b/.import/barrier_2px.png-471522c3a6235b97f30314aef2b04619.stex new file mode 100644 index 0000000000000000000000000000000000000000..01240ee71b2be996b55f40607160db317d9d7ba2 GIT binary patch literal 86 zcmZ>F2@YXlU|?W^Vg?2Uc19rE3W&p9odSY9-Q4t`?63d}A4MQrpV@(dfxm!9h&5As b!;P@r#jUMB`(HSEHZW*pdAR&WCX*6k literal 0 HcmV?d00001 diff --git a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 index f135665..aa8754d 100644 --- a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 +++ b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.md5 @@ -1,3 +1,3 @@ -source_md5="c59ab7db07786b45336a08776bb2c650" -dest_md5="eaf951160d0c5c460c91c4973d34864e" +source_md5="4de648abb772dd3fb3dbe1f8e48f6efa" +dest_md5="eddab9bfc554f2cac9d4f7deee59d744" diff --git a/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex b/.import/grass.png-4e90a4e3fdfeb91bdade83e0d1eb7d47.stex index 2f82badad5548aea75defc780037b9fba8a71c83..f877b74217452a7bd6664157e7b9ea40bfbe66dd 100644 GIT binary patch delta 418 zcmV;T0bTx>1F!>-7=M%j0037-LQqmkMn;GM0037-LQqyvI81v1001u^zzGn)z#x(& zCtdX-as&jR7y&rI8$ysovX#~ULjf!rkEZ}>s7Rx)*+!Dos0$MxUyEGH^koVHf+GJ% z3%GWK(=3p2!L@H_tptbrL0<*<3F2wcTR;5&1KlsffEY<~+b)@ntKMf4YaHF{CC!C$ZLJ|X%dz*XSx!`$~xt2mqcu4xrD_tOanO!ybm^T^n` zt{g+a)EuCUn9Avkfv{%yikS7o!XFDU_9raNJ7VyRh#TB~#Ih~HdwUblE#kQGL26a( ME`v2GkXZ%*05Ubk)&Kwi delta 394 zcmV;50d@Yc1DFGl7=L^L0037-LQqmkMn-S}0037-LQqyvI80;#001u^zzGniprDbY zW|J3D=uH5M5r6}{Aw*3iNm0iJZlGKa{Atv{xS9*mO1O!F?j}~Cn z2)32Pd_b*au$%{aKY&j_cL&}7!T(**z6A`2k!`igSKkBEyMNErf3a{c!3rY!&%kZl zIMRCUiihG{T@C4t?45;KEhkpn^z?u#&QBLP^n2&0 z-JLr9-i6c6qgmWNroz1p!7f+aJ%9mdP8+=eT`f>2QkpSkDllZ`5|cuO{{3*X zVOpy8eR=RK{-zs#}J9|@BUX~r~en7 z7#J8{y-4^9qf^5V&%9dIe~^J)eZGu?KViRSkw4kNmnW~E3~*FNUQ!8e{`&N2q(+J1Xanq0w~?_PStyZ?*$XYCs98NkqD@O1TaVOi&t&;$TEGpdyU delta 360 zcmX@aynuOvW4%g%Pl&72i`4byK^7`pr8c5X;kFi&LQ41j|6k?szwiE6W2gTYofsGx zUga#?0i<|Jg8YL2BLIWY{d4Dl;+zE@k;M!Qe1|}oQB=dL0Vw#^)5S5w!vF51+d_vG zI9x89JX8Are}8KE!I)WTpC&AqOJ}K1WEXuqDSX1duSaIEoUtm{_~QPO@N1G&%fV}KFCzK^Bv#aapDrQvww_#q+e1?Ue^U<= cost: $AnimationPlayer.play("open") + if Game.golds >= cost: queue_free() func _on_AnimationPlayer_animation_finished(anim_name): if anim_name == "open": diff --git a/objects/barrier/barrier.tscn b/objects/barrier/barrier.tscn index 3f6bea0..659d351 100644 --- a/objects/barrier/barrier.tscn +++ b/objects/barrier/barrier.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://objects/barrier/barrier.gd" type="Script" id=1] -[ext_resource path="res://graphics/barrier/barrier.png" type="Texture" id=2] +[ext_resource path="res://graphics/barrier/barrier_2px.png" type="Texture" id=2] [ext_resource path="res://fonts/2ndpuberty..fnt" type="BitmapFont" id=3] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 2, 8 ) +extents = Vector2( 2, 0.5 ) [sub_resource type="Animation" id=4] resource_name = "initial" @@ -97,12 +97,12 @@ script = ExtResource( 1 ) texture = ExtResource( 2 ) centered = false region_enabled = true -region_rect = Rect2( 0, 0, 16, 16 ) +region_rect = Rect2( 0, 0, 4, 1 ) [node name="StaticBody2D" type="StaticBody2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] -position = Vector2( 8, 8 ) +position = Vector2( 2, 0.5 ) shape = SubResource( 1 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] @@ -110,13 +110,12 @@ anims/initial = SubResource( 4 ) anims/open = SubResource( 3 ) [node name="Label" type="Label" parent="."] -visible = false -margin_left = -12.0 +margin_left = -18.0 margin_top = -15.0 -margin_right = 28.0 +margin_right = 22.0 margin_bottom = 5.0 theme = SubResource( 5 ) -text = "0" +text = "00" align = 1 [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"] diff --git a/objects/enemy/snake.tscn b/objects/enemy/snake.tscn index 2b49e3e..e880c35 100644 --- a/objects/enemy/snake.tscn +++ b/objects/enemy/snake.tscn @@ -26,7 +26,7 @@ animations = [ { } ] [sub_resource type="RectangleShape2D" id=5] -extents = Vector2( 8, 8 ) +extents = Vector2( 5.5, 6 ) [node name="Snake" type="Node2D"] script = ExtResource( 3 ) @@ -39,9 +39,9 @@ frame = 1 playing = true [node name="Area2D" type="Area2D" parent="."] -visible = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +position = Vector2( 0.5, 2 ) shape = SubResource( 5 ) [connection signal="area_entered" from="Area2D" to="." method="_on_Area2D_area_entered"] diff --git a/objects/ladder/ladder.tscn b/objects/ladder/ladder.tscn index b6d45b0..5a7524c 100644 --- a/objects/ladder/ladder.tscn +++ b/objects/ladder/ladder.tscn @@ -17,7 +17,9 @@ position = Vector2( 4, 4 ) shape = SubResource( 1 ) [node name="LeftSnap" type="Position2D" parent="."] +visible = false position = Vector2( 0, 4 ) [node name="RightSnap" type="Position2D" parent="."] +visible = false position = Vector2( 8, 4 ) diff --git a/objects/player/player.gd b/objects/player/player.gd index 55cb246..4efbe3e 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -14,6 +14,7 @@ enum State {IDLE,WALK,JUMP,FALL,STUNNED,CLIMB,SWORD,SHOOT} var current_state = State.IDLE ##Runtime var axis = Vector2.ZERO #Current direction being held +var trail_color = Color(0.25,0,1,0.4) #Physics var velocity = Vector2.ZERO var walk_speed = 50 @@ -66,9 +67,7 @@ func _physics_process(delta): #Apply velocity move_and_slide(velocity,Vector2.UP) #Debug - if Input.is_action_pressed("debug_move_player"): - position = get_viewport().get_mouse_position() - print(get_viewport().get_mouse_position()) + debug() func _process_idle(): if anims.get_current_animation() != "idle": anims.play("idle") @@ -246,3 +245,8 @@ func _on_AnimationPlayer_animation_finished(anim_name): else: current_state = State.FALL return +func debug(): + #Move player to mouse + if Input.is_action_pressed("debug_move_player"): + position = get_viewport().get_mouse_position() + print(get_viewport().get_mouse_position()) diff --git a/objects/player/player.tscn b/objects/player/player.tscn index e638906..c98125b 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -15,7 +15,8 @@ [ext_resource path="res://scripts/recolor.tres" type="Shader" id=13] [ext_resource path="res://graphics/player/sg_doublejump.png" type="Texture" id=14] -[sub_resource type="ShaderMaterial" id=27] +[sub_resource type="ShaderMaterial" id=38] +resource_local_to_scene = true shader = ExtResource( 4 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = true @@ -598,8 +599,10 @@ extents = Vector2( 6, 7 ) [node name="Player" type="KinematicBody2D"] script = ExtResource( 1 ) +[node name="Trail" type="Node" parent="."] + [node name="Sprite" type="Sprite" parent="."] -material = SubResource( 27 ) +material = SubResource( 38 ) texture = ExtResource( 3 ) region_enabled = true region_rect = Rect2( 0, 0, 20, 20 ) diff --git a/tilesets/t_grass.tres b/tilesets/t_grass.tres index 3c5cdad..bb02561 100644 --- a/tilesets/t_grass.tres +++ b/tilesets/t_grass.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=15 format=2] +[gd_resource type="TileSet" load_steps=18 format=2] [ext_resource path="res://graphics/tiles/grass.png" type="Texture" id=1] @@ -41,12 +41,21 @@ points = PoolVector2Array( 8, 0, 8, 0, 8, 8, 8, 8 ) [sub_resource type="ConvexPolygonShape2D" id=13] points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) +[sub_resource type="ConvexPolygonShape2D" id=14] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=15] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=16] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + [resource] 0/name = "grass.png 0" 0/texture = ExtResource( 1 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 0, 0, 32, 24 ) +0/region = Rect2( 0, 0, 32, 32 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) 0/autotile/tile_size = Vector2( 8, 8 ) @@ -140,6 +149,24 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) "one_way_margin": 1.0, "shape": SubResource( 13 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 14 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 15 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 16 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 0/z_index = 0 1/name = "grass.png 1"