logan/the-crypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tweaks

Browse source
This commit is contained in:
Logan 2020-07-23 22:36:21 -05:00
parent c9f0facf0e
commit 4e28f95b28
14 changed files with 122 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Music and Fonts(Misc.)/Endless Pain of Nightmares.WAV.import
View file

@ -17,5 +17,5 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop=false
edit/loop=true
compress/mode=0

BIN
Music and Fonts(Misc.)/dungeon_ambient_1.ogg Normal file
View file

Binary file not shown.

15
Music and Fonts(Misc.)/dungeon_ambient_1.ogg.import Normal file
View file

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/dungeon_ambient_1.ogg-cd6ab13b7abd1f4ab8bb4c1893b1dfeb.oggstr"
[deps]
source_file="res://Music and Fonts(Misc.)/dungeon_ambient_1.ogg"
dest_files=[ "res://.import/dungeon_ambient_1.ogg-cd6ab13b7abd1f4ab8bb4c1893b1dfeb.oggstr" ]
[params]
loop=true
loop_offset=0

9
levels/Campaign/Level 1/Level 1.tscn
View file

@ -92,7 +92,7 @@ margin_top = 60.0
margin_right = 435.0
margin_bottom = 137.0
custom_fonts/font = SubResource( 1 )
text = "Experiment with combo's, and craft the best magic for the situation."
text = "Experiment with combos, and craft the best magic for the situation."
align = 1
valign = 1
autowrap = true
@ -149,7 +149,7 @@ color = Color( 0.564706, 0.564706, 0.564706, 1 )
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="Sprite" type="Sprite" parent="CanvasLayer"]
modulate = Color( 0, 0, 0, 0 )
modulate = Color( 0, 0, 0, 1 )
texture = ExtResource( 7 )
centered = false
@ -160,7 +160,8 @@ margin_right = 90.0
margin_bottom = 76.0
rect_scale = Vector2( 3.25, 3.25 )
custom_fonts/font = SubResource( 4 )
text = "Stage: 1 Leap of Faith"
text = "Stage 1:
Leap of Faith"
align = 1
valign = 1
percent_visible = 0.0
@ -168,6 +169,6 @@ __meta__ = {
"_edit_use_anchors_": false
}
[connection signal="body_entered" from="Leap" to="Timer" method="_on_Leap_body_entered"]
[connection signal="body_entered" from="Leap" to="AnimationPlayer" method="_on_Leap_body_entered"]
[connection signal="body_entered" from="Leap" to="AnimationPlayer2" method="_on_Leap_body_entered"]
[connection signal="body_entered" from="Leap" to="AnimationPlayer" method="_on_Leap_body_entered"]
[connection signal="timeout" from="Timer" to="Timer" method="_on_Timer_timeout"]

11
levels/Campaign/Level 1/Level 1a.tscn
View file

@ -9,10 +9,14 @@
[node name="Level 1a" type="Node"]
[node name="Lever" parent="." instance=ExtResource( 4 )]
position = Vector2( 984, 280 )
[node name="Door" parent="." instance=ExtResource( 6 )]
position = Vector2( 77, 320 )
unlocked = false
next_scene = "res://levels/Campaign/Level 2/Level_2.tscn"
text = "Stage 2: Mind the Bone"
[node name="TileMap" type="TileMap" parent="." groups=[
"Tilemap",
@ -41,9 +45,6 @@ position = Vector2( 480, 256 )
[node name="torch5" parent="Torch" instance=ExtResource( 5 )]
position = Vector2( 896, 256 )
[node name="Player" parent="." instance=ExtResource( 3 )]
position = Vector2( 324, 253 )
[node name="Enemy" type="Node" parent="."]
[node name="Skeleton Enemy" parent="Enemy" instance=ExtResource( 2 )]
@ -61,8 +62,8 @@ position = Vector2( 864, 272 )
[node name="Skeleton Enemy5" parent="Enemy" instance=ExtResource( 2 )]
position = Vector2( 736, 272 )
[node name="Lever" parent="." instance=ExtResource( 4 )]
position = Vector2( 984, 280 )
[node name="Player" parent="." instance=ExtResource( 3 )]
position = Vector2( 324, 253 )
[node name="CanvasModulate" type="CanvasModulate" parent="."]
color = Color( 0.564706, 0.564706, 0.564706, 1 )

110
levels/Campaign/Level 2/Level 2.tscn
View file

File diff suppressed because one or more lines are too long

1
levels/Campaign/Level 2/Level_2.tscn
View file

@ -19,6 +19,7 @@ extents = Vector2( 7, 39 )
[node name="Door" parent="." instance=ExtResource( 8 )]
position = Vector2( 880, 64 )
next_scene = "res://levels/Campaign/Level 3/Level_3.tscn"
text = "Stage 3: Green Giants"
[node name="door" type="Sprite" parent="."]
position = Vector2( 16, 161 )

15
levels/Campaign/Level 3/Level_3.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=2]
[gd_scene load_steps=16 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://meta/DungeonTilemap.tres" type="TileSet" id=2]
@ -19,6 +19,9 @@ extents = Vector2( 152, 18 )
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 10, 45 )
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 10, 55 )
[node name="Level 3" type="Node"]
[node name="Spikes" type="Node" parent="."]
@ -132,20 +135,24 @@ shape = SubResource( 2 )
position = Vector2( -49, -9 )
shape = SubResource( 2 )
[node name="CollisionShape2D7" type="CollisionShape2D" parent="EnemyCollision"]
position = Vector2( 157, 109 )
shape = SubResource( 3 )
[node name="Ogre" parent="." instance=ExtResource( 7 )]
position = Vector2( 800, -52 )
[node name="Ogre2" parent="." instance=ExtResource( 7 )]
position = Vector2( 876, -52 )
position = Vector2( 876, -53 )
[node name="Ogre3" parent="." instance=ExtResource( 7 )]
position = Vector2( 956, -53 )
[node name="Ogre4" parent="." instance=ExtResource( 7 )]
position = Vector2( 717, 119 )
position = Vector2( 1070, 72 )
[node name="CanvasModulate" type="CanvasModulate" parent="."]
color = Color( 0.564706, 0.564706, 0.564706, 1 )
[connection signal="on" from="Lever" to="TileMapDisapearing" method="_on_Lever_on"]
[connection signal="on" from="Lever" to="TileMapAppearing" method="_on_Lever_on"]
[connection signal="on" from="Lever" to="TileMapDisapearing" method="_on_Lever_on"]
[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_Area2D_body_entered"]

2
levels/Campaign/Level 3/TileMap3.gd
View file

@ -1,7 +1,5 @@
extends TileMap
func _on_Lever_on():
collision_layer = 2
visible = true

1
magic/Projectiles/Projectile.gd
View file

@ -44,6 +44,7 @@ func launch(wand, mod = 1):
damage_mod = mod
scale = Vector2(1, 1)
Spr.scale = Vector2(mod, mod)
if mod > 1:
$Light2D.texture_scale = mod / 2
if $Particles2D != null:
$Particles2D.scale = Vector2(mod, mod)

10
meta/Music.gd Normal file
View file

@ -0,0 +1,10 @@
extends Node
onready var MainMusic: AudioStreamPlayer = $MainMusic
onready var Ambience: AudioStreamPlayer = $Ambience
func _process(delta):
if not MainMusic.playing:
MainMusic.playing = true
if not Ambience.playing:
Ambience.playing = true

11
meta/Music.tscn
View file

@ -1,9 +1,16 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Music and Fonts(Misc.)/Endless Pain of Nightmares.WAV" type="AudioStream" id=1]
[ext_resource path="res://Music and Fonts(Misc.)/dungeon_ambient_1.ogg" type="AudioStream" id=2]
[ext_resource path="res://meta/Music.gd" type="Script" id=3]
[node name="Node" type="Node"]
script = ExtResource( 3 )
[node name="MainMusic" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 1 )
volume_db = -2.0
volume_db = -4.0
[node name="Ambience" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 2 )
volume_db = -8.0

12
objects/Door.gd
View file

@ -2,16 +2,19 @@ extends Sprite
export var unlocked: bool = true
export var next_scene: String
export var text: String
onready var door = get_node("AnimationPlayer")
func _ready():
$CanvasLayer/Label.text = text
func _process(delta):
if $Area2D.get_overlapping_bodies().size() != 0:
if unlocked:
$Label.text = "F to Open"
if Input.is_action_just_pressed("open"):
Player.current_scene = next_scene
get_tree().change_scene(""+next_scene+"")
$CanvasLayer.AnimationPlayer.play("fadeout")
else:
$Label.text = "Locked"
$Label.visible = true
@ -24,3 +27,8 @@ func lock():
func unlock():
unlocked = true
func _on__animation_finished(anim_name):
Player.current_scene = next_scene
get_tree().change_scene(""+next_scene+"")

71
objects/Door.tscn
View file

@ -1,56 +1,89 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=8 format=2]
[ext_resource path="res://Music and Fonts(Misc.)/m5x7.tres" type="DynamicFontData" id=1]
[ext_resource path="res://art/door.png" type="Texture" id=2]
[ext_resource path="res://objects/Door.gd" type="Script" id=3]
[ext_resource path="res://art/Black.png" type="Texture" id=4]
[sub_resource type="Animation" id=1]
resource_name = "Door Opening"
length = 0.12
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 14, 13 )
[sub_resource type="DynamicFont" id=2]
font_data = ExtResource( 1 )
[sub_resource type="Animation" id=3]
resource_name = "fadeout"
length = 3.0
tracks/0/type = "value"
tracks/0/path = NodePath(".:frame")
tracks/0/path = NodePath("Black: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.1 ),
"times": PoolRealArray( 0, 1 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 1,
"values": [ 0, 1 ]
"update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Label:percent_visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 1, 2 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 14, 13 )
[sub_resource type="DynamicFont" id=3]
font_data = ExtResource( 1 )
[node name="Door" type="Sprite"]
position = Vector2( -16, -32 )
texture = ExtResource( 2 )
centered = false
hframes = 2
script = ExtResource( 3 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
"anims/Door Opening" = SubResource( 1 )
[node name="Area2D" type="Area2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 16, 19 )
shape = SubResource( 2 )
shape = SubResource( 1 )
[node name="Label" type="Label" parent="."]
margin_left = -9.0
margin_top = -15.0
margin_right = 42.0
margin_bottom = -1.0
custom_fonts/font = SubResource( 3 )
custom_fonts/font = SubResource( 2 )
text = "F to Open"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="Black" type="Sprite" parent="CanvasLayer"]
modulate = Color( 1, 1, 1, 0 )
position = Vector2( 160, 90 )
texture = ExtResource( 4 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="CanvasLayer"]
anims/fadeout = SubResource( 3 )
[node name="Label" type="Label" parent="CanvasLayer"]
margin_left = 80.0
margin_top = 60.0
margin_right = 240.0
margin_bottom = 120.0
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="body_entered" from="Area2D" to="Area2D" method="_on_Area2D_body_entered"]
[connection signal="animation_finished" from="CanvasLayer/AnimationPlayer" to="." method="_on__animation_finished"]