Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/guluc3m/morgana
Browse files Browse the repository at this point in the history
  • Loading branch information
Patataman committed Oct 26, 2020
2 parents f9cef36 + 7c582eb commit 810bc3e
Show file tree
Hide file tree
Showing 7 changed files with 137 additions and 0 deletions.
16 changes: 16 additions & 0 deletions adri_sandbox/CardBase.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
extends MarginContainer


# Declare member variables here. Examples:
# var a = 2
# var b = "text"


# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.


# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
53 changes: 53 additions & 0 deletions adri_sandbox/CardBase.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
[gd_scene load_steps=6 format=2]

[ext_resource path="res://assets/sprites/cards_ilustrations/ilustration_placeholder.png" type="Texture" id=1]
[ext_resource path="res://assets/sprites/cards_marks/mark_placeholder.png" type="Texture" id=2]
[ext_resource path="res://assets/fonts/Comfortaa-Bold.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://adri_sandbox/CardBase.gd" type="Script" id=4]

[sub_resource type="DynamicFont" id=1]
size = 7
font_data = ExtResource( 3 )

[node name="CardBase" type="MarginContainer"]
margin_right = 80.0
margin_bottom = 120.0
script = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Mark" type="Sprite" parent="."]
position = Vector2( 40, 60 )
texture = ExtResource( 2 )

[node name="Ilustration" type="Sprite" parent="."]
position = Vector2( 40, 40 )
texture = ExtResource( 1 )

[node name="Cost" type="Label" parent="."]
margin_left = 5.0
margin_top = 5.0
margin_right = 15.0
margin_bottom = 19.0
text = "2"

[node name="Dexterity" type="Label" parent="."]
margin_left = 65.0
margin_top = 5.0
margin_right = 75.0
margin_bottom = 19.0
text = "4"
__meta__ = {
"_editor_description_": ""
}

[node name="Description" type="RichTextLabel" parent="."]
margin_left = 10.0
margin_top = 70.0
margin_right = 70.0
margin_bottom = 110.0
custom_fonts/normal_font = SubResource( 1 )
tab_size = 1
text = "Soy una carta super poderosa.
WAAAA"
Binary file added assets/fonts/Comfortaa-Bold.ttf
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/ilustration_placeholder.png-95c2972abc8312d6a1f64684c068066f.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/sprites/cards_ilustrations/ilustration_placeholder.png"
dest_files=[ "res://.import/ilustration_placeholder.png-95c2972abc8312d6a1f64684c068066f.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
Binary file added assets/sprites/cards_marks/mark_placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions assets/sprites/cards_marks/mark_placeholder.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/mark_placeholder.png-65baf779dcaf2bba9243ea6f401a94d0.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/sprites/cards_marks/mark_placeholder.png"
dest_files=[ "res://.import/mark_placeholder.png-65baf779dcaf2bba9243ea6f401a94d0.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

0 comments on commit 810bc3e

Please sign in to comment.