Ladders! ...janky ones.
This commit is contained in:
parent
6f8a13c8bb
commit
592c8dffb1
BIN
assets/Mega.png
BIN
assets/Mega.png
Binary file not shown.
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 117 KiB |
File diff suppressed because one or more lines are too long
|
|
@ -77,3 +77,6 @@ func wants_roll() -> bool:
|
|||
|
||||
func wants_climb() -> bool:
|
||||
return false
|
||||
|
||||
func get_climb_shape_location() -> Vector2:
|
||||
return Vector2(-1,-1)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=128 format=2]
|
||||
[gd_scene load_steps=126 format=2]
|
||||
|
||||
[ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://src/playerD/movement_component.gd" type="Script" id=2]
|
||||
|
|
@ -23,31 +23,31 @@ load_path = "res://.import/Mega.png-93dfe0790902b932f7b46f7b23c5d4e7.stex"
|
|||
|
||||
[sub_resource type="AtlasTexture" id=91]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1440, 960, 240, 160 )
|
||||
region = Rect2( 1680, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=92]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1680, 960, 240, 160 )
|
||||
region = Rect2( 1920, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=93]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1920, 960, 240, 160 )
|
||||
region = Rect2( 2160, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=94]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2160, 960, 240, 160 )
|
||||
region = Rect2( 2400, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=95]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2400, 960, 240, 160 )
|
||||
region = Rect2( 0, 1120, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=96]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 1120, 240, 160 )
|
||||
region = Rect2( 240, 1120, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=97]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 1120, 240, 160 )
|
||||
region = Rect2( 1440, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=98]
|
||||
atlas = SubResource( 90 )
|
||||
|
|
@ -55,31 +55,31 @@ region = Rect2( 480, 1120, 240, 160 )
|
|||
|
||||
[sub_resource type="AtlasTexture" id=99]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 1120, 240, 160 )
|
||||
region = Rect2( 480, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=100]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 1120, 240, 160 )
|
||||
region = Rect2( 720, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=101]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 160, 240, 160 )
|
||||
region = Rect2( 960, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=102]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 160, 240, 160 )
|
||||
region = Rect2( 1200, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=103]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 160, 240, 160 )
|
||||
region = Rect2( 1440, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=104]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 160, 240, 160 )
|
||||
region = Rect2( 240, 1440, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=105]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1440, 160, 240, 160 )
|
||||
region = Rect2( 480, 1440, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=106]
|
||||
atlas = SubResource( 90 )
|
||||
|
|
@ -119,43 +119,43 @@ region = Rect2( 0, 1600, 240, 160 )
|
|||
|
||||
[sub_resource type="AtlasTexture" id=115]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 1600, 240, 160 )
|
||||
region = Rect2( 960, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=116]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 1600, 240, 160 )
|
||||
region = Rect2( 1200, 960, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=117]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 960, 240, 160 )
|
||||
region = Rect2( 1200, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=118]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 960, 240, 160 )
|
||||
region = Rect2( 0, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=119]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 0, 240, 160 )
|
||||
region = Rect2( 1440, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=120]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 0, 240, 160 )
|
||||
region = Rect2( 1680, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=121]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1440, 0, 240, 160 )
|
||||
region = Rect2( 1920, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=122]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1680, 0, 240, 160 )
|
||||
region = Rect2( 2160, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=123]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1920, 0, 240, 160 )
|
||||
region = Rect2( 240, 1600, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=124]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2160, 0, 240, 160 )
|
||||
region = Rect2( 480, 1600, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=125]
|
||||
atlas = SubResource( 90 )
|
||||
|
|
@ -163,187 +163,187 @@ region = Rect2( 720, 1600, 240, 160 )
|
|||
|
||||
[sub_resource type="AtlasTexture" id=126]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 1600, 240, 160 )
|
||||
region = Rect2( 240, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=127]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 1600, 240, 160 )
|
||||
region = Rect2( 1680, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=128]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 160, 240, 160 )
|
||||
region = Rect2( 1920, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=129]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1680, 160, 240, 160 )
|
||||
region = Rect2( 2160, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=130]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1920, 160, 240, 160 )
|
||||
region = Rect2( 2400, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=131]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2160, 160, 240, 160 )
|
||||
region = Rect2( 0, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=132]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2400, 160, 240, 160 )
|
||||
region = Rect2( 240, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=133]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 320, 240, 160 )
|
||||
region = Rect2( 480, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=134]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 320, 240, 160 )
|
||||
region = Rect2( 720, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=135]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 320, 240, 160 )
|
||||
region = Rect2( 960, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=136]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 320, 240, 160 )
|
||||
region = Rect2( 1200, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=137]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 320, 240, 160 )
|
||||
region = Rect2( 1680, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=138]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 320, 240, 160 )
|
||||
region = Rect2( 1920, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=139]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1680, 640, 240, 160 )
|
||||
region = Rect2( 2160, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=140]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1920, 640, 240, 160 )
|
||||
region = Rect2( 2400, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=141]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2160, 640, 240, 160 )
|
||||
region = Rect2( 0, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=142]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2400, 640, 240, 160 )
|
||||
region = Rect2( 240, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=143]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 800, 240, 160 )
|
||||
region = Rect2( 480, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=144]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 800, 240, 160 )
|
||||
region = Rect2( 720, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=145]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 800, 240, 160 )
|
||||
region = Rect2( 960, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=146]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 800, 240, 160 )
|
||||
region = Rect2( 1200, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=147]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 800, 240, 160 )
|
||||
region = Rect2( 1440, 800, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=148]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 800, 240, 160 )
|
||||
region = Rect2( 1920, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=149]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1440, 800, 240, 160 )
|
||||
region = Rect2( 2160, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=150]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1920, 320, 240, 160 )
|
||||
region = Rect2( 2400, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=151]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2160, 320, 240, 160 )
|
||||
region = Rect2( 0, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=152]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2400, 320, 240, 160 )
|
||||
region = Rect2( 240, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=153]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 480, 240, 160 )
|
||||
region = Rect2( 480, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=154]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 480, 240, 160 )
|
||||
region = Rect2( 720, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=155]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 480, 240, 160 )
|
||||
region = Rect2( 960, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=156]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 480, 240, 160 )
|
||||
region = Rect2( 1200, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=157]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 480, 240, 160 )
|
||||
region = Rect2( 1440, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=158]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 480, 240, 160 )
|
||||
region = Rect2( 1920, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=159]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1440, 480, 240, 160 )
|
||||
region = Rect2( 2160, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=160]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1920, 480, 240, 160 )
|
||||
region = Rect2( 2400, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=161]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2160, 480, 240, 160 )
|
||||
region = Rect2( 0, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=162]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2400, 480, 240, 160 )
|
||||
region = Rect2( 240, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=163]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 640, 240, 160 )
|
||||
region = Rect2( 480, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=164]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 640, 240, 160 )
|
||||
region = Rect2( 720, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=165]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 640, 240, 160 )
|
||||
region = Rect2( 960, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=166]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 640, 240, 160 )
|
||||
region = Rect2( 1200, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=167]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 640, 240, 160 )
|
||||
region = Rect2( 1440, 640, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=168]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1200, 640, 240, 160 )
|
||||
region = Rect2( 2400, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=169]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1440, 640, 240, 160 )
|
||||
region = Rect2( 0, 160, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=170]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 2400, 0, 240, 160 )
|
||||
region = Rect2( 720, 1120, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=171]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 0, 160, 240, 160 )
|
||||
region = Rect2( 960, 1120, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=172]
|
||||
atlas = SubResource( 90 )
|
||||
|
|
@ -419,119 +419,121 @@ region = Rect2( 0, 1440, 240, 160 )
|
|||
|
||||
[sub_resource type="AtlasTexture" id=190]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 1440, 240, 160 )
|
||||
region = Rect2( 240, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=191]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 1440, 240, 160 )
|
||||
region = Rect2( 480, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=192]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 240, 0, 240, 160 )
|
||||
region = Rect2( 720, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=193]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 480, 0, 240, 160 )
|
||||
region = Rect2( 960, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=194]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 720, 0, 240, 160 )
|
||||
region = Rect2( 1680, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=195]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 960, 0, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=196]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1680, 320, 240, 160 )
|
||||
|
||||
[sub_resource type="AtlasTexture" id=197]
|
||||
atlas = SubResource( 90 )
|
||||
region = Rect2( 1680, 480, 240, 160 )
|
||||
|
||||
[sub_resource type="SpriteFrames" id=198]
|
||||
[sub_resource type="SpriteFrames" id=196]
|
||||
animations = [ {
|
||||
"frames": [ SubResource( 91 ), SubResource( 92 ), SubResource( 93 ), SubResource( 94 ), SubResource( 95 ), SubResource( 96 ), SubResource( 97 ), SubResource( 98 ), SubResource( 99 ), SubResource( 100 ) ],
|
||||
"frames": [ SubResource( 91 ), SubResource( 92 ), SubResource( 93 ), SubResource( 94 ), SubResource( 95 ), SubResource( 96 ) ],
|
||||
"loop": true,
|
||||
"name": "climb",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 101 ), SubResource( 102 ), SubResource( 103 ), SubResource( 103 ), SubResource( 104 ), SubResource( 105 ) ],
|
||||
"frames": [ SubResource( 97 ) ],
|
||||
"loop": false,
|
||||
"name": "climb_step",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 98 ) ],
|
||||
"loop": false,
|
||||
"name": "climb_upstep",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 99 ), SubResource( 99 ), SubResource( 99 ), SubResource( 100 ), SubResource( 101 ), SubResource( 102 ), SubResource( 103 ), SubResource( 103 ), SubResource( 103 ) ],
|
||||
"loop": false,
|
||||
"name": "dash",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 106 ), SubResource( 107 ), SubResource( 108 ), SubResource( 109 ), SubResource( 110 ), SubResource( 111 ), SubResource( 112 ), SubResource( 113 ), SubResource( 114 ), SubResource( 115 ), SubResource( 114 ), SubResource( 116 ) ],
|
||||
"frames": [ SubResource( 104 ), SubResource( 105 ), SubResource( 106 ), SubResource( 107 ), SubResource( 108 ), SubResource( 109 ), SubResource( 110 ), SubResource( 111 ), SubResource( 112 ), SubResource( 113 ), SubResource( 112 ), SubResource( 114 ) ],
|
||||
"loop": false,
|
||||
"name": "die",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 117 ), SubResource( 118 ) ],
|
||||
"frames": [ SubResource( 115 ), SubResource( 116 ) ],
|
||||
"loop": true,
|
||||
"name": "hurt",
|
||||
"speed": 4.0
|
||||
}, {
|
||||
"frames": [ SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ), SubResource( 122 ), SubResource( 123 ), SubResource( 124 ) ],
|
||||
"frames": [ SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 117 ), SubResource( 118 ), SubResource( 119 ), SubResource( 120 ), SubResource( 121 ), SubResource( 122 ) ],
|
||||
"loop": true,
|
||||
"name": "idle",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 125 ), SubResource( 126 ), SubResource( 127 ) ],
|
||||
"frames": [ SubResource( 123 ), SubResource( 124 ), SubResource( 125 ) ],
|
||||
"loop": true,
|
||||
"name": "idle_shield",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 128 ) ],
|
||||
"loop": false,
|
||||
"frames": [ SubResource( 126 ) ],
|
||||
"loop": true,
|
||||
"name": "idle_shoot",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 129 ), SubResource( 130 ), SubResource( 131 ), SubResource( 132 ), SubResource( 130 ), SubResource( 133 ), SubResource( 134 ), SubResource( 135 ) ],
|
||||
"frames": [ SubResource( 127 ), SubResource( 128 ), SubResource( 129 ), SubResource( 130 ), SubResource( 128 ), SubResource( 131 ), SubResource( 132 ), SubResource( 133 ) ],
|
||||
"loop": false,
|
||||
"name": "jump",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 136 ), SubResource( 137 ), SubResource( 138 ) ],
|
||||
"frames": [ SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 134 ), SubResource( 135 ), SubResource( 136 ) ],
|
||||
"loop": false,
|
||||
"name": "jump_shoot",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 139 ), SubResource( 140 ), SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ), SubResource( 148 ), SubResource( 149 ) ],
|
||||
"frames": [ SubResource( 137 ), SubResource( 138 ), SubResource( 139 ), SubResource( 140 ), SubResource( 141 ), SubResource( 142 ), SubResource( 143 ), SubResource( 144 ), SubResource( 145 ), SubResource( 146 ), SubResource( 147 ) ],
|
||||
"loop": false,
|
||||
"name": "roll",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 150 ), SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ), SubResource( 158 ), SubResource( 159 ) ],
|
||||
"frames": [ SubResource( 148 ), SubResource( 149 ), SubResource( 150 ), SubResource( 151 ), SubResource( 152 ), SubResource( 153 ), SubResource( 154 ), SubResource( 155 ), SubResource( 156 ), SubResource( 157 ) ],
|
||||
"loop": true,
|
||||
"name": "run",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 160 ), SubResource( 161 ), SubResource( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ), SubResource( 168 ), SubResource( 169 ) ],
|
||||
"frames": [ SubResource( 158 ), SubResource( 159 ), SubResource( 160 ), SubResource( 161 ), SubResource( 162 ), SubResource( 163 ), SubResource( 164 ), SubResource( 165 ), SubResource( 166 ), SubResource( 167 ) ],
|
||||
"loop": true,
|
||||
"name": "run_shoot",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 170 ), SubResource( 171 ), SubResource( 128 ) ],
|
||||
"frames": [ SubResource( 168 ), SubResource( 169 ), SubResource( 126 ) ],
|
||||
"loop": false,
|
||||
"name": "shoot",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 174 ), SubResource( 175 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 178 ), SubResource( 179 ), SubResource( 180 ), SubResource( 181 ), SubResource( 182 ), SubResource( 183 ), SubResource( 184 ), SubResource( 185 ), SubResource( 186 ), SubResource( 187 ), SubResource( 188 ), SubResource( 189 ), SubResource( 190 ), SubResource( 191 ) ],
|
||||
"frames": [ SubResource( 170 ), SubResource( 171 ), SubResource( 172 ), SubResource( 172 ), SubResource( 173 ), SubResource( 174 ), SubResource( 175 ), SubResource( 176 ), SubResource( 176 ), SubResource( 177 ), SubResource( 178 ), SubResource( 179 ), SubResource( 180 ), SubResource( 181 ), SubResource( 182 ), SubResource( 183 ), SubResource( 184 ), SubResource( 185 ), SubResource( 186 ), SubResource( 187 ), SubResource( 188 ), SubResource( 189 ) ],
|
||||
"loop": true,
|
||||
"name": "slash",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 120 ), SubResource( 192 ), SubResource( 193 ), SubResource( 194 ), SubResource( 195 ) ],
|
||||
"frames": [ SubResource( 118 ), SubResource( 190 ), SubResource( 191 ), SubResource( 192 ), SubResource( 193 ) ],
|
||||
"loop": false,
|
||||
"name": "stand",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 196 ) ],
|
||||
"frames": [ SubResource( 194 ) ],
|
||||
"loop": false,
|
||||
"name": "step",
|
||||
"speed": 10.0
|
||||
}, {
|
||||
"frames": [ SubResource( 197 ) ],
|
||||
"frames": [ SubResource( 195 ) ],
|
||||
"loop": false,
|
||||
"name": "step_shoot",
|
||||
"speed": 10.0
|
||||
|
|
@ -547,7 +549,7 @@ player_number = 1
|
|||
|
||||
[node name="AnimatedSprite" parent="." index="0"]
|
||||
position = Vector2( -1, -51 )
|
||||
frames = SubResource( 198 )
|
||||
frames = SubResource( 196 )
|
||||
animation = "idle_shoot"
|
||||
frame = 0
|
||||
flip_h = false
|
||||
|
|
@ -648,8 +650,7 @@ animation_sequence = [ "die" ]
|
|||
[node name="climb" type="Node" parent="movement_state_machine" index="9"]
|
||||
script = ExtResource( 17 )
|
||||
debug_state = true
|
||||
move_speed = 0.0
|
||||
animation_sequence = [ "climb" ]
|
||||
animation_sequence = [ "climb_step", "climb", "climb_upstep" ]
|
||||
idle_node = NodePath("../idle")
|
||||
|
||||
[node name="Hurtbox_Component" parent="." index="4"]
|
||||
|
|
|
|||
|
|
@ -22,6 +22,13 @@ export (NodePath) var interactable_node
|
|||
onready var interactable_receiver_node: Interactable_Receiver = get_node(interactable_node)
|
||||
onready var ladder_detection:RayCast2D = $"../Ladder_Detection"
|
||||
|
||||
var ladder_collision: RayCast2D
|
||||
|
||||
func _ready():
|
||||
ladder_collision = ladder_detection
|
||||
# Guess there isn't a hit from inside in 3.5
|
||||
# Remember to make raycast as tall as needed for the player
|
||||
#ladder_collision.hit_from_inside = true
|
||||
|
||||
func process_physics(delta):
|
||||
PlayerInfo.player_position = owner.global_position
|
||||
|
|
@ -73,11 +80,39 @@ func wants_roll() -> bool:
|
|||
|
||||
func wants_climb() -> bool:
|
||||
if ladder_detection.is_colliding() and Input.is_action_pressed("ui_up"):
|
||||
print("betcha wanna climb though!")
|
||||
#print("betcha wanna climb though!")
|
||||
return true
|
||||
else:
|
||||
return false
|
||||
|
||||
func get_climb_shape_location() -> Vector2:
|
||||
if ladder_detection.is_colliding():
|
||||
var point: Vector2 = ladder_collision.get_collision_point()
|
||||
var shape_id = ladder_collision.get_collider_shape()
|
||||
var object = ladder_collision.get_collider()
|
||||
|
||||
# This works but doesn't get the shapes location.
|
||||
# if object is Area2D:
|
||||
# print("You got an area bro!" , object.global_position)
|
||||
|
||||
|
||||
# This appears to get the shapes location!
|
||||
var area = Physics2DServer.area_get_transform(object)
|
||||
var areashape = Physics2DServer.area_get_shape_transform(object, shape_id)
|
||||
|
||||
|
||||
var y_dir = Input.get_axis("ui_up" , "ui_down")
|
||||
#var target = get_collider() # A CollisionObject2D.
|
||||
#var shape_id = get_collider_shape() # The shape index in the collider.
|
||||
#var owner_id = target.shape_find_owner(shape_id) # The owner ID in the collider.
|
||||
#var shape = target.shape_owner_get_owner(owner_id)
|
||||
|
||||
#UiManager.debug_text = str(round(point.x)) + ' ' + str(round(point.y)) #( "Mod(" + str(sign(_move_speed_modifier)) + ") Dir(" + str(move_direction) + ") Vel(" + str(sign(current_x_velocity)) + ") Mov(" + str(sign(move_component.desired_movement_vector.x)) +
|
||||
|
||||
return Vector2(areashape.origin.x, y_dir)
|
||||
else:
|
||||
return Vector2(-1,-1)
|
||||
|
||||
## Other needed variables
|
||||
# desired_movement_vector: Vector2 - Used to store desired movement depending on the state
|
||||
# current_movement_state:String - The name of the current State
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ func _ready():
|
|||
climbing_modifier= StateModifier.new()
|
||||
#add_child(modifier)
|
||||
#modifier.init_ref()
|
||||
climbing_modifier.ready( "landing", "jump" , climbing_modifier.TYPE.EXIT_ANIMATION)
|
||||
climbing_modifier.starting_frame = 6
|
||||
# climbing_modifier.ready( "landing", "jump" , climbing_modifier.TYPE.EXIT_ANIMATION)
|
||||
# climbing_modifier.starting_frame = 6
|
||||
#print("ready! MOD")
|
||||
|
||||
|
||||
|
|
@ -24,7 +24,22 @@ func process_physics(delta: float) -> State:
|
|||
|
||||
# First allow horizontal movement.
|
||||
#move_actor_as_desired(delta)
|
||||
|
||||
# Make wure we still want to climb
|
||||
var ladder_location = move_component.get_climb_shape_location()
|
||||
if ladder_location != Vector2(-1,-1):
|
||||
UiManager.debug_text = str(ladder_location) + '\n' + str(ladder_location - parent.global_position) #+ '\n' + str(parent.global_position.distance_to(ladder_location))
|
||||
# An attempt to snap to the ladder location
|
||||
if parent.global_position.x != round(ladder_location.x):
|
||||
parent.global_translate(Vector2(round((ladder_location.x - parent.global_position.x)),(ladder_location.y * move_speed) * delta))
|
||||
if ladder_location.y != 0:
|
||||
animations.play()
|
||||
else:
|
||||
# Make sure we hopped the step index
|
||||
if animation_index > 0:
|
||||
animations.stop()
|
||||
else:
|
||||
return idle_state
|
||||
#parent.move_local_x()
|
||||
#Flip the character before tha actual move maybe.
|
||||
if move_component.get_movement_direction() != 0.0:
|
||||
parent.transform.x.x = move_component.get_movement_direction()
|
||||
|
|
|
|||
|
|
@ -453,7 +453,7 @@ func move_actor_as_desired(delta: float, x_move_direction_override: float = 0):
|
|||
var sim_move_speed = (MIN_SPEED + (sign(_move_speed_modifier) * -1 * move_component.momentum.x))
|
||||
|
||||
# if move_component.momentum.x != 0:
|
||||
if true:
|
||||
if false:
|
||||
UiManager.debug_text = ( "Mod(" + str(sign(_move_speed_modifier)) + ") Dir(" + str(move_direction) + ") Vel(" + str(sign(current_x_velocity)) + ") Mov(" + str(sign(move_component.desired_movement_vector.x)) +
|
||||
")\nNS:" + str(round(sim_move_speed)) + #" Z:" + str(sign(_move_speed_modifier) * -1 * move_component.momentum.x) +
|
||||
"\nS:" + str(round(_move_speed + _move_speed_modifier)) + ",M" + str(round(move_component.momentum.x)) +
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user