Skip to content

Commit

Permalink
major changes ;)
Browse files Browse the repository at this point in the history
  • Loading branch information
onsetsu committed Aug 13, 2019
1 parent 915d1b9 commit 3a15f75
Show file tree
Hide file tree
Showing 8 changed files with 308 additions and 26 deletions.
Binary file not shown.
183 changes: 183 additions & 0 deletions Scenes/Card.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,189 @@ playback/speed = 1.0

position = Vector2( -90, 0 )

[node name="mechanics_hint" type="Node2D" parent="." index="10"]

visible = false
position = Vector2( 84.0639, -60.2972 )
__meta__ = {
"_edit_group_": true
}

[node name="mechanics_container" type="PanelContainer" parent="mechanics_hint" index="0"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = 247.0
margin_bottom = 70.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
_sections_unfolded = [ "Rect" ]
__meta__ = {
"_edit_group_": true
}

[node name="mechanics_panel" type="Panel" parent="mechanics_hint/mechanics_container" index="0"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 7.0
margin_top = 7.0
margin_right = 304.0
margin_bottom = 127.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1

[node name="mechanics_vbox" type="VBoxContainer" parent="mechanics_hint/mechanics_container/mechanics_panel" index="0"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
alignment = 0
_sections_unfolded = [ "Rect" ]

[node name="Label" type="Label" parent="mechanics_hint/mechanics_container/mechanics_panel/mechanics_vbox" index="0"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 297.0
margin_bottom = 14.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Shiv: A Sorcery dealing 2 damage."
autowrap = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[node name="Label2" type="Label" parent="mechanics_hint/mechanics_container/mechanics_panel/mechanics_vbox" index="1"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 18.0
margin_right = 297.0
margin_bottom = 49.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Battlecry: The effect trigger when you play this card from your hand."
autowrap = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[node name="Label3" type="Label" parent="mechanics_hint/mechanics_container/mechanics_panel/mechanics_vbox" index="2"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 53.0
margin_right = 297.0
margin_bottom = 84.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Deathrottle: Do something when this familiar dies."
autowrap = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[node name="Label4" type="Label" parent="mechanics_hint/mechanics_container/mechanics_panel/mechanics_vbox" index="3"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 88.0
margin_right = 297.0
margin_bottom = 102.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Do even more"
autowrap = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[node name="Label5" type="Label" parent="mechanics_hint/mechanics_container/mechanics_panel/mechanics_vbox" index="4"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 106.0
margin_right = 297.0
margin_bottom = 120.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Yet Another Text"
autowrap = true
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[node name="Label6" type="Label" parent="mechanics_hint/mechanics_container/mechanics_panel/mechanics_vbox" index="5"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 124.0
margin_right = 297.0
margin_bottom = 138.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Breaking the Layout!"
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1

[connection signal="mouse_entered" from="area" to="." method="_on_Area2D_mouse_entered"]

[connection signal="mouse_exited" from="area" to="." method="_on_Area2D_mouse_exited"]
Expand Down
50 changes: 30 additions & 20 deletions Scenes/CardImages.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,17 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="FlyingBoar" type="Sprite" parent="." index="29"]
[node name="ArcaneGatling" type="Sprite" parent="." index="29"]

modulate = Color( 1.1, 0.3, 1.1, 1 )
position = Vector2( 0.126114, 684.005 )
scale = Vector2( 0.055, 0.055 )
texture = ExtResource( 18 )
region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="FlyingBoar" type="Sprite" parent="." index="30"]

position = Vector2( 141.998, 549.484 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -326,7 +336,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="PackWolf" type="Sprite" parent="." index="30"]
[node name="PackWolf" type="Sprite" parent="." index="31"]

position = Vector2( 427.213, 549.484 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -335,7 +345,7 @@ region_enabled = true
region_rect = Rect2( 100, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="Spearman" type="Sprite" parent="." index="31"]
[node name="Spearman" type="Sprite" parent="." index="32"]

position = Vector2( 560.999, 549.484 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -344,7 +354,7 @@ region_enabled = true
region_rect = Rect2( -100, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="BuyARound" type="Sprite" parent="." index="32"]
[node name="BuyARound" type="Sprite" parent="." index="33"]

position = Vector2( 696.255, 549.484 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -353,7 +363,7 @@ region_enabled = true
region_rect = Rect2( -50, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="ToKu" type="Sprite" parent="." index="33"]
[node name="ToKu" type="Sprite" parent="." index="34"]

position = Vector2( 836.657, 549.484 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -362,7 +372,7 @@ region_enabled = true
region_rect = Rect2( -50, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="HiredArm" type="Sprite" parent="." index="34"]
[node name="HiredArm" type="Sprite" parent="." index="35"]

position = Vector2( 973.384, 548.748 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -371,7 +381,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="Smash" type="Sprite" parent="." index="35"]
[node name="Smash" type="Sprite" parent="." index="36"]

position = Vector2( 1108.64, 548.748 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -380,7 +390,7 @@ region_enabled = true
region_rect = Rect2( -100, -150, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="BattleBot" type="Sprite" parent="." index="36"]
[node name="BattleBot" type="Sprite" parent="." index="37"]

position = Vector2( 1248.31, 548.748 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -390,7 +400,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Offset", "Region", "Transform", "Visibility" ]

[node name="ScytheCrawler" type="Sprite" parent="." index="37"]
[node name="ScytheCrawler" type="Sprite" parent="." index="38"]

modulate = Color( 0.875, 0.641724, 0.587891, 1 )
self_modulate = Color( 1.2, 0.9, 0.92, 1 )
Expand All @@ -401,7 +411,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="SpellShaper" type="Sprite" parent="." index="38"]
[node name="SpellShaper" type="Sprite" parent="." index="39"]

position = Vector2( 143.468, 412.757 )
scale = Vector2( 0.055, 0.055 )
Expand All @@ -410,7 +420,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="Shiv" type="Sprite" parent="." index="39"]
[node name="Shiv" type="Sprite" parent="." index="40"]

modulate = Color( 1.18, 1.29, 1.16, 1 )
self_modulate = Color( 0.39997, 0.96875, 0.367065, 1 )
Expand All @@ -421,7 +431,7 @@ region_enabled = true
region_rect = Rect2( 0, 0, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="BladeDance" type="Sprite" parent="." index="40"]
[node name="BladeDance" type="Sprite" parent="." index="41"]

position = Vector2( 424.272, 412.757 )
scale = Vector2( 0.165, 0.165 )
Expand All @@ -430,7 +440,7 @@ region_enabled = true
region_rect = Rect2( -50, 350, 735.806, 760.333 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="StoneGiant" type="Sprite" parent="." index="41"]
[node name="StoneGiant" type="Sprite" parent="." index="42"]

modulate = Color( 1, 0.75, 0.75, 1 )
self_modulate = Color( 1, 1.2, 0.6, 1 )
Expand All @@ -441,7 +451,7 @@ region_enabled = true
region_rect = Rect2( 0, -100, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="Dragon" type="Sprite" parent="." index="42"]
[node name="Dragon" type="Sprite" parent="." index="43"]

modulate = Color( 0.878906, 0.418854, 0.418854, 1 )
self_modulate = Color( 1.1, 0.696259, 0.696259, 1 )
Expand All @@ -452,7 +462,7 @@ region_enabled = true
region_rect = Rect2( 100, -150, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="FormOfDragon" type="Sprite" parent="." index="43"]
[node name="FormOfDragon" type="Sprite" parent="." index="44"]

modulate = Color( 1, 0.995483, 0.710938, 1 )
self_modulate = Color( 0.636719, 0.701996, 1, 1 )
Expand All @@ -463,7 +473,7 @@ region_enabled = true
region_rect = Rect2( 100, -150, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="TheMaw" type="Sprite" parent="." index="44"]
[node name="TheMaw" type="Sprite" parent="." index="45"]

modulate = Color( 1, 0.995483, 0.710938, 1 )
self_modulate = Color( 0.636719, 0.701996, 1, 1 )
Expand All @@ -474,7 +484,7 @@ region_enabled = true
region_rect = Rect2( 1000, 350, 1140, 1140 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="SewerDweller" type="Sprite" parent="." index="45"]
[node name="SewerDweller" type="Sprite" parent="." index="46"]

modulate = Color( 0.403333, 1, 1, 1 )
self_modulate = Color( 0.636719, 1.1, 0.542206, 1 )
Expand All @@ -485,7 +495,7 @@ region_enabled = true
region_rect = Rect2( 100, -150, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="SpikedWall" type="Sprite" parent="." index="46"]
[node name="SpikedWall" type="Sprite" parent="." index="47"]

modulate = Color( 0.403333, 1, 1, 1 )
self_modulate = Color( 0.636719, 1.1, 0.542206, 1 )
Expand All @@ -496,7 +506,7 @@ region_enabled = true
region_rect = Rect2( 50, 500, 2281, 2281 )
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="IceWall" type="Sprite" parent="." index="47"]
[node name="IceWall" type="Sprite" parent="." index="48"]

position = Vector2( 559.02, 137.833 )
scale = Vector2( 0.24993, 0.140221 )
Expand All @@ -506,7 +516,7 @@ region_rect = Rect2( 250, 550, 500, 900 )
region_filter_clip = true
_sections_unfolded = [ "Region", "Transform", "Visibility" ]

[node name="PowerPotion" type="Sprite" parent="." index="48"]
[node name="PowerPotion" type="Sprite" parent="." index="49"]

position = Vector2( 141.011, 0 )
scale = Vector2( 0.055, 0.055 )
Expand Down
6 changes: 3 additions & 3 deletions Scenes/Game.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,9 @@ text = "Return to Menu."
flat = false
align = 1

[node name="pause_container" type="PanelContainer" parent="." index="16"]
[node name="cards" type="Node" parent="." index="16"]

[node name="pause_container" type="PanelContainer" parent="." index="17"]

editor/display_folded = true
anchor_left = 0.0
Expand Down Expand Up @@ -903,8 +905,6 @@ lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Grow Direction", "Size Flags" ]

[node name="cards" type="Node" parent="." index="17"]

[node name="elements" type="Node" parent="." index="18"]

[node name="effects" type="Node" parent="." index="19"]
Expand Down
Loading

0 comments on commit 3a15f75

Please sign in to comment.