Merge remote-tracking branch 'origin/master'
This commit is contained in:
Diego
commit
4a266e00ab
BIN
Music and Fonts(Misc.)/m5x7.ttf
Normal file
BIN
Music and Fonts(Misc.)/m5x7.ttf
Normal file
Binary file not shown.
|
|
@ -1,11 +1,11 @@
|
|||
[gd_scene load_steps=7 format=2]
|
||||
|
||||
[ext_resource path="res://levels/Tilte.gd" type="Script" id=1]
|
||||
[ext_resource path="res://levels/Wizard Background.png" type="Texture" id=2]
|
||||
[ext_resource path="res://levels/Play 1.png" type="Texture" id=3]
|
||||
[ext_resource path="res://levels/Play 2.png" type="Texture" id=4]
|
||||
[ext_resource path="res://levels/Quit 1.png" type="Texture" id=5]
|
||||
[ext_resource path="res://levels/Quit 2.png" type="Texture" id=6]
|
||||
[ext_resource path="res://Title/Tilte.gd" type="Script" id=1]
|
||||
[ext_resource path="res://Title/Wizard Background.png" type="Texture" id=2]
|
||||
[ext_resource path="res://Title/Play 1.png" type="Texture" id=3]
|
||||
[ext_resource path="res://Title/Play 2.png" type="Texture" id=4]
|
||||
[ext_resource path="res://Title/Quit 1.png" type="Texture" id=5]
|
||||
[ext_resource path="res://Title/Quit 2.png" type="Texture" id=6]
|
||||
|
||||
[node name="Title" type="Node"]
|
||||
script = ExtResource( 1 )
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7,7 +7,7 @@
|
|||
[node name="Node2D" type="Node2D"]
|
||||
|
||||
[node name="TileMap" parent="." instance=ExtResource( 2 )]
|
||||
tile_data = PoolIntArray( 65536, 0, 8, 65537, 0, 10, 65538, 0, 10, 65539, 0, 10, 65540, 0, 10, 65541, 0, 10, 65542, 0, 10, 65543, 0, 10, 65544, 0, 10, 65545, 0, 10, 65546, 0, 10, 65547, 0, 10, 65548, 0, 10, 65549, 0, 10, 65550, 0, 10, 65551, 0, 10, 65552, 0, 10, 65553, 0, 10, 65554, 0, 10, 65555, 0, 10, 65556, 0, 10, 65557, 0, 10, 65558, 0, 10, 65559, 0, 10, 65560, 0, 10, 65561, 0, 10, 65562, 0, 10, 65563, 0, 10, 65564, 0, 10, 65565, 0, 10, 65566, 0, 10, 65567, 0, 10, 65568, 0, 10, 65569, 0, 11, 131072, 0, 65544, 131073, 0, 131078, 131074, 0, 196617, 131075, 0, 196617, 131076, 0, 196617, 131077, 0, 196617, 131078, 0, 196617, 131079, 0, 196617, 131080, 0, 196617, 131081, 0, 196617, 131082, 0, 196617, 131083, 0, 196617, 131084, 0, 196617, 131085, 0, 196617, 131086, 0, 196617, 131087, 0, 196617, 131088, 0, 196617, 131089, 0, 196617, 131090, 0, 196617, 131091, 0, 196617, 131092, 0, 196617, 131093, 0, 196617, 131094, 0, 196617, 131095, 0, 196617, 131096, 0, 196617, 131097, 0, 196617, 131098, 0, 196617, 131099, 0, 196617, 131100, 0, 196617, 131101, 0, 196617, 131102, 0, 196617, 131103, 0, 196617, 131104, 0, 196617, 131105, 0, 196619, 196608, 0, 65544, 196609, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589838, 0, 0, 589858, 0, 8, 589859, 0, 11, 655360, 0, 65544, 655361, 0, 131083, 655374, 0, 65540, 655375, 0, 11, 655394, 0, 65544, 655395, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 65541, 720911, 0, 65542, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 10, 720916, 0, 10, 720917, 0, 10, 720918, 0, 10, 720919, 0, 10, 720920, 0, 10, 720921, 0, 10, 720922, 0, 10, 720923, 0, 10, 720924, 0, 10, 720925, 0, 10, 720926, 0, 10, 720927, 0, 10, 720928, 0, 10, 720929, 0, 10, 720930, 0, 65541, 720931, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196617, 786453, 0, 196617, 786454, 0, 196617, 786455, 0, 196617, 786456, 0, 196617, 786457, 0, 196617, 786458, 0, 196617, 786459, 0, 196617, 786460, 0, 196617, 786461, 0, 196617, 786462, 0, 196617, 786463, 0, 196617, 786464, 0, 196617, 786465, 0, 196617, 786466, 0, 196617, 786467, 0, 196619 )
|
||||
tile_data = PoolIntArray( 65536, 0, 8, 65537, 0, 10, 65538, 0, 10, 65539, 0, 10, 65540, 0, 10, 65541, 0, 10, 65542, 0, 10, 65543, 0, 10, 65544, 0, 10, 65545, 0, 10, 65546, 0, 10, 65547, 0, 10, 65548, 0, 10, 65549, 0, 10, 65550, 0, 10, 65551, 0, 10, 65552, 0, 10, 65553, 0, 10, 65554, 0, 10, 65555, 0, 10, 65556, 0, 10, 65557, 0, 10, 65558, 0, 10, 65559, 0, 10, 65560, 0, 10, 65561, 0, 10, 65562, 0, 10, 65563, 0, 10, 65564, 0, 10, 65565, 0, 10, 65566, 0, 10, 65567, 0, 10, 65568, 0, 10, 65569, 0, 10, 65570, 0, 10, 65571, 0, 11, 131072, 0, 65544, 131073, 0, 131078, 131074, 0, 196617, 131075, 0, 196617, 131076, 0, 196617, 131077, 0, 196617, 131078, 0, 196617, 131079, 0, 196617, 131080, 0, 196617, 131081, 0, 196617, 131082, 0, 196617, 131083, 0, 196617, 131084, 0, 196617, 131085, 0, 196617, 131086, 0, 196617, 131087, 0, 196617, 131088, 0, 196617, 131089, 0, 196617, 131090, 0, 196617, 131091, 0, 196617, 131092, 0, 196617, 131093, 0, 196617, 131094, 0, 196617, 131095, 0, 196617, 131096, 0, 196617, 131097, 0, 196617, 131098, 0, 196617, 131099, 0, 196617, 131100, 0, 196617, 131101, 0, 196617, 131102, 0, 196617, 131103, 0, 196617, 131104, 0, 196617, 131105, 0, 196617, 131106, 0, 131077, 131107, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196642, 0, 65544, 196643, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262178, 0, 65544, 262179, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327714, 0, 65544, 327715, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393250, 0, 65544, 393251, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458786, 0, 65544, 458787, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524322, 0, 65544, 524323, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589838, 0, 0, 589858, 0, 65544, 589859, 0, 131083, 655360, 0, 65544, 655361, 0, 131083, 655374, 0, 65540, 655375, 0, 11, 655394, 0, 65544, 655395, 0, 131083, 720896, 0, 65544, 720897, 0, 65542, 720898, 0, 10, 720899, 0, 10, 720900, 0, 10, 720901, 0, 10, 720902, 0, 10, 720903, 0, 10, 720904, 0, 10, 720905, 0, 10, 720906, 0, 10, 720907, 0, 10, 720908, 0, 10, 720909, 0, 10, 720910, 0, 65541, 720911, 0, 65542, 720912, 0, 10, 720913, 0, 10, 720914, 0, 10, 720915, 0, 10, 720916, 0, 10, 720917, 0, 10, 720918, 0, 10, 720919, 0, 10, 720920, 0, 10, 720921, 0, 10, 720922, 0, 10, 720923, 0, 10, 720924, 0, 11, 720930, 0, 65544, 720931, 0, 131083, 786432, 0, 196616, 786433, 0, 196617, 786434, 0, 196617, 786435, 0, 196617, 786436, 0, 196617, 786437, 0, 196617, 786438, 0, 196617, 786439, 0, 196617, 786440, 0, 196617, 786441, 0, 196617, 786442, 0, 196617, 786443, 0, 196617, 786444, 0, 196617, 786445, 0, 196617, 786446, 0, 196617, 786447, 0, 196617, 786448, 0, 196617, 786449, 0, 196617, 786450, 0, 196617, 786451, 0, 196617, 786452, 0, 196617, 786453, 0, 196617, 786454, 0, 196617, 786455, 0, 196617, 786456, 0, 196617, 786457, 0, 196617, 786458, 0, 196617, 786459, 0, 131077, 786460, 0, 131083, 786466, 0, 65544, 786467, 0, 131083, 851995, 0, 65544, 851996, 0, 131083, 852002, 0, 65544, 852003, 0, 131083, 917531, 0, 65544, 917532, 0, 131083, 917538, 0, 65544, 917539, 0, 131083, 983067, 0, 65544, 983068, 0, 131083, 983074, 0, 65544, 983075, 0, 131083, 1048603, 0, 65544, 1048604, 0, 131083, 1048610, 0, 65544, 1048611, 0, 131083, 1114139, 0, 196616, 1114140, 0, 196614, 1114141, 0, 196610, 1114142, 0, 196610, 1114143, 0, 196610, 1114144, 0, 196610, 1114145, 0, 196610, 1114146, 0, 196613, 1114147, 0, 196619 )
|
||||
|
||||
[node name="Player" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 60, 176 )
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ compress/lossy_quality=0.7
|
|||
compress/hdr_mode=0
|
||||
compress/bptc_ldr=0
|
||||
compress/normal_map=0
|
||||
flags/repeat=0
|
||||
flags/repeat=1
|
||||
flags/filter=false
|
||||
flags/mipmaps=false
|
||||
flags/anisotropic=false
|
||||
|
|
|
|||
|
|
@ -10,4 +10,3 @@ cell_size = Vector2( 16, 16 )
|
|||
collision_layer = 2
|
||||
collision_mask = 0
|
||||
format = 1
|
||||
tile_data = PoolIntArray( 0, 0, 8, 1, 0, 10, 2, 0, 10, 3, 0, 10, 4, 0, 10, 5, 0, 10, 6, 0, 10, 7, 0, 10, 8, 0, 10, 9, 0, 10, 10, 0, 10, 11, 0, 10, 12, 0, 10, 13, 0, 10, 14, 0, 10, 15, 0, 10, 16, 0, 10, 17, 0, 10, 18, 0, 10, 19, 0, 10, 20, 0, 11, 65536, 0, 65544, 65537, 0, 131078, 65538, 0, 196617, 65539, 0, 196617, 65540, 0, 196617, 65541, 0, 196617, 65542, 0, 196617, 65543, 0, 196617, 65544, 0, 196617, 65545, 0, 196617, 65546, 0, 196617, 65547, 0, 196617, 65548, 0, 196617, 65549, 0, 196617, 65550, 0, 196617, 65551, 0, 196617, 65552, 0, 196617, 65553, 0, 196617, 65554, 0, 196617, 65555, 0, 131077, 65556, 0, 131083, 131072, 0, 65544, 131073, 0, 131083, 131091, 0, 65544, 131092, 0, 131083, 196608, 0, 65544, 196609, 0, 131083, 196627, 0, 65544, 196628, 0, 131083, 262144, 0, 65544, 262145, 0, 131083, 262163, 0, 65544, 262164, 0, 131083, 327680, 0, 65544, 327681, 0, 131083, 327699, 0, 65544, 327700, 0, 131083, 393216, 0, 65544, 393217, 0, 131083, 393235, 0, 65544, 393236, 0, 131083, 458752, 0, 65544, 458753, 0, 131083, 458771, 0, 65544, 458772, 0, 131083, 524288, 0, 65544, 524289, 0, 131083, 524307, 0, 65544, 524308, 0, 131083, 589824, 0, 65544, 589825, 0, 131083, 589843, 0, 65544, 589844, 0, 131083, 655360, 0, 65544, 655361, 0, 65542, 655362, 0, 10, 655363, 0, 10, 655364, 0, 10, 655365, 0, 10, 655366, 0, 10, 655367, 0, 10, 655368, 0, 10, 655369, 0, 10, 655370, 0, 10, 655371, 0, 10, 655372, 0, 10, 655373, 0, 10, 655374, 0, 10, 655375, 0, 10, 655376, 0, 10, 655377, 0, 10, 655378, 0, 10, 655379, 0, 65541, 655380, 0, 131083, 720896, 0, 196616, 720897, 0, 196617, 720898, 0, 196617, 720899, 0, 196617, 720900, 0, 196617, 720901, 0, 196617, 720902, 0, 196617, 720903, 0, 196617, 720904, 0, 196617, 720905, 0, 196617, 720906, 0, 196617, 720907, 0, 196617, 720908, 0, 196617, 720909, 0, 196617, 720910, 0, 196617, 720911, 0, 196617, 720912, 0, 196617, 720913, 0, 196617, 720914, 0, 196617, 720915, 0, 196617, 720916, 0, 196619 )
|
||||
|
|
|
|||
41
npc/Wizard.gd
Normal file
41
npc/Wizard.gd
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
extends KinematicBody2D
|
||||
|
||||
var velocity = Vector2.ZERO
|
||||
var line0 = ""
|
||||
var line1 = "Good, you've finally made it!"
|
||||
var line2 = "This will be the final stage of your training."
|
||||
var line3 = "Even so, this final test will be no picnic..."
|
||||
var line4 = "I have faith in your abilities, my apprentice."
|
||||
var line5 = "Go on ahead, I'll meet you at the end of The Labyrinth."
|
||||
var lines = [line0, line1, line2, line3, line4, line5]
|
||||
|
||||
var line_number = 0
|
||||
var current_line
|
||||
|
||||
func _process(delta):
|
||||
var p = Player.position
|
||||
if p.x > position.x:
|
||||
$Sprite.flip_h = false
|
||||
if p.x < position.x:
|
||||
$Sprite.flip_h = true
|
||||
current_line = lines[line_number]
|
||||
$Label.text = current_line
|
||||
|
||||
func _physics_process(delta):
|
||||
velocity.y += 20
|
||||
velocity = move_and_slide(velocity)
|
||||
|
||||
func next_line():
|
||||
if line_number != 5:
|
||||
$Typewriter.play("Typewriter")
|
||||
line_number = clamp(line_number + 1, 0, 5)
|
||||
else:
|
||||
$Timer.stop()
|
||||
pass
|
||||
|
||||
func _on_Timer_timeout():
|
||||
next_line()
|
||||
|
||||
func _on_Delay_timeout():
|
||||
next_line()
|
||||
$Timer.start()
|
||||
87
npc/Wizard.tscn
Normal file
87
npc/Wizard.tscn
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
[gd_scene load_steps=7 format=2]
|
||||
|
||||
[ext_resource path="res://art/WizardM.png" type="Texture" id=1]
|
||||
[ext_resource path="res://npc/Wizard.gd" type="Script" id=2]
|
||||
[ext_resource path="res://Music and Fonts(Misc.)/m5x7.tres" type="DynamicFont" id=3]
|
||||
|
||||
[sub_resource type="Animation" id=1]
|
||||
resource_name = "Idle"
|
||||
length = 0.6
|
||||
loop = true
|
||||
step = 0.05
|
||||
tracks/0/type = "value"
|
||||
tracks/0/path = NodePath("Sprite:frame")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/keys = {
|
||||
"times": PoolRealArray( 0, 0.15, 0.3, 0.45 ),
|
||||
"transitions": PoolRealArray( 1, 1, 1, 1 ),
|
||||
"update": 1,
|
||||
"values": [ 0, 1, 2, 3 ]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id=3]
|
||||
resource_name = "Typewriter"
|
||||
length = 1.5
|
||||
tracks/0/type = "value"
|
||||
tracks/0/path = NodePath("Label:percent_visible")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/keys = {
|
||||
"times": PoolRealArray( 0, 1.5 ),
|
||||
"transitions": PoolRealArray( 1, 1 ),
|
||||
"update": 0,
|
||||
"values": [ 0.0, 1.0 ]
|
||||
}
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=2]
|
||||
extents = Vector2( 7, 7 )
|
||||
|
||||
[node name="Wizard" type="KinematicBody2D"]
|
||||
collision_mask = 3
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
position = Vector2( 0, -12 )
|
||||
texture = ExtResource( 1 )
|
||||
vframes = 3
|
||||
hframes = 4
|
||||
frame = 3
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
||||
autoplay = "Idle"
|
||||
anims/Idle = SubResource( 1 )
|
||||
|
||||
[node name="Typewriter" type="AnimationPlayer" parent="."]
|
||||
anims/Typewriter = SubResource( 3 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
position = Vector2( 0, -7 )
|
||||
shape = SubResource( 2 )
|
||||
|
||||
[node name="Label" type="Label" parent="."]
|
||||
margin_left = -55.0
|
||||
margin_top = -63.0
|
||||
margin_right = 55.0
|
||||
margin_bottom = -26.0
|
||||
custom_fonts/font = ExtResource( 3 )
|
||||
align = 1
|
||||
valign = 1
|
||||
autowrap = true
|
||||
percent_visible = 0.0
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="Timer" type="Timer" parent="."]
|
||||
wait_time = 4.0
|
||||
|
||||
[node name="Delay" type="Timer" parent="."]
|
||||
one_shot = true
|
||||
autostart = true
|
||||
[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
|
||||
[connection signal="timeout" from="Delay" to="." method="_on_Delay_timeout"]
|
||||
13
objects/Door.gd
Normal file
13
objects/Door.gd
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
extends Sprite
|
||||
|
||||
export var unlocked: bool = true
|
||||
export var next_scene: String
|
||||
|
||||
onready var door = get_node("AnimationPlayer")
|
||||
|
||||
func _process(delta):
|
||||
if $Area2D.get_overlapping_bodies().size() != 0:
|
||||
if Input.is_action_pressed("open") and unlocked:
|
||||
Player.current_scene = next_scene
|
||||
get_tree().change_scene(next_scene)
|
||||
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
[gd_scene load_steps=5 format=2]
|
||||
[gd_scene load_steps=6 format=2]
|
||||
|
||||
[ext_resource path="res://objects/Area2D.gd" type="Script" id=1]
|
||||
[ext_resource path="res://art/door.png" type="Texture" id=2]
|
||||
[ext_resource path="res://objects/Door.gd" type="Script" id=3]
|
||||
|
||||
[sub_resource type="Animation" id=1]
|
||||
resource_name = "Door Opening"
|
||||
|
|
@ -27,6 +28,7 @@ texture = ExtResource( 2 )
|
|||
centered = false
|
||||
hframes = 2
|
||||
frame = 1
|
||||
script = ExtResource( 3 )
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
||||
"anims/Door Opening" = SubResource( 1 )
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ _global_script_class_icons={
|
|||
[application]
|
||||
|
||||
config/name="Gamejam"
|
||||
run/main_scene="res://levels/test.tscn"
|
||||
run/main_scene="res://levels/World.tscn"
|
||||
config/icon="res://icon.png"
|
||||
|
||||
[autoload]
|
||||
|
|
|
|||
Loading…
Reference in a new issue