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

Auto stash before merge of "master" and "origin/master"

Browse source
This commit is contained in:
Logan 2020-07-18 18:52:15 -05:00
parent 1d6b2b0ecd
commit c9c38d74e1
4 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
magic/Wands/BasicWand.tscn
View file

@ -1,13 +1,13 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://art/Wand.png" type="Texture" id=1]
[ext_resource path="res://script/BasicWand.gd" type="Script" id=2]
[ext_resource path="res://script/BasicWand.gd" type="Script" id=1]
[ext_resource path="res://art/Wand.png" type="Texture" id=2]
[node name="Wand" type="Sprite"]
position = Vector2( 7, 0 )
rotation = 1.5708
texture = ExtResource( 1 )
script = ExtResource( 2 )
texture = ExtResource( 2 )
script = ExtResource( 1 )
[node name="ProjectileSpawn" type="Position2D" parent="."]
position = Vector2( -6.11959e-07, -7 )

8
magic/Wands/Conduit1.tscn → magic/Wands/ChargedWand.tscn
View file

@ -1,13 +1,13 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://art/Wand.png" type="Texture" id=1]
[ext_resource path="res://script/BasicWand.gd" type="Script" id=2]
[ext_resource path="res://script/BasicWand.gd" type="Script" id=1]
[ext_resource path="res://art/Wand.png" type="Texture" id=2]
[node name="Conduit1" type="Sprite"]
position = Vector2( 7, 0 )
rotation = 1.5708
texture = ExtResource( 1 )
script = ExtResource( 2 )
texture = ExtResource( 2 )
script = ExtResource( 1 )
[node name="ProjectileSpawn" type="Position2D" parent="."]
position = Vector2( -6.11959e-07, -7 )

8
script/globals.gd
View file

@ -7,10 +7,10 @@ enum {Effect1, Effect2, Effect3, Effect4}
const TILE_SIZE = 16
###
var conduit1_ps = preload("res://magic/Wands/Conduit1.tscn")
var conduit2_ps
var conduit3_ps
var conduit4_ps
var conduit1_ps = preload("res://magic/Wands/ChargedWand.tscn")
var conduit2_ps = preload("res://magic/Wands/TripleWand.tscn")
var conduit3_ps =
var conduit4_ps =
var projectile1_ps = preload("res://magic/projectiles/Projectile1.tscn")
var projectile2_ps

17
ui/Inventory.tscn
View file

@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://ui/Inventory.png" type="Texture" id=1]
[ext_resource path="res://script/Inventory.gd" type="Script" id=2]
[ext_resource path="res://art/Wand.png" type="Texture" id=3]
[ext_resource path="res://art/TripleWand.png" type="Texture" id=4]
[sub_resource type="Animation" id=1]
resource_name = "SlideIn"
@ -62,9 +63,23 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Conduit2" type="TextureButton" parent="Inventory/Conduits"]
light_mask = -2147483647
margin_left = -55.0
margin_top = -20.0
margin_right = -39.0
margin_bottom = 2.0
toggle_mode = true
action_mode = 0
texture_normal = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Projectiles" type="Node2D" parent="Inventory"]
visible = false
[node name="Effects" type="Node2D" parent="Inventory"]
visible = false
[connection signal="toggled" from="Inventory/Conduits/Conduit1" to="." method="_on_Conduit1_toggled"]
[connection signal="toggled" from="Inventory/Conduits/Conduit2" to="." method="_on_Conduit1_toggled"]