Skip to content

Commit

Permalink
Merge pull request #13 from the-dev-bin/add-more-art
Browse files Browse the repository at this point in the history
Add more art
  • Loading branch information
Nezteb authored Jul 29, 2024
2 parents 11995b8 + e425bd1 commit 64b2974
Show file tree
Hide file tree
Showing 17 changed files with 137 additions and 39 deletions.
Binary file added godot/assets/cauldron.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 godot/assets/cauldron.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cfjh31t2y8ri0"
path="res://.godot/imported/cauldron.png-c19e57c44accdaef2cb751d843a6ad41.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/cauldron.png"
dest_files=["res://.godot/imported/cauldron.png-c19e57c44accdaef2cb751d843a6ad41.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added godot/assets/enemy.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 godot/assets/enemy.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ckcwyo7tloicu"
path="res://.godot/imported/enemy.png-63f114c7bb3f2105c232c34f647cbc2d.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/enemy.png"
dest_files=["res://.godot/imported/enemy.png-63f114c7bb3f2105c232c34f647cbc2d.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added godot/assets/player.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 godot/assets/player.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://eme3gd7omh7u"
path="res://.godot/imported/player.png-be2216fcaabb5c62aa2466cd9a5726a8.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/player.png"
dest_files=["res://.godot/imported/player.png-be2216fcaabb5c62aa2466cd9a5726a8.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
2 changes: 1 addition & 1 deletion godot/enemies/godot_enemy.tres
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ defense = 0
[resource]
script = ExtResource("1_0o1tj")
name = "Godot Test Enemy"
sprite = "res://icon.svg"
sprite = "res://assets/enemy.png"
actions = Array[ExtResource("1_aahbp")]([SubResource("Resource_fro0g"), SubResource("Resource_w0tuc")])
stats = SubResource("Resource_uq4uh")
2 changes: 1 addition & 1 deletion godot/ingredients/resources/cube_block.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://8p82vshqls3p"]
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://dyinoj814hd6i"]

[ext_resource type="Script" path="res://ingredient_actions/actions/defend_action.gd" id="1_ow2ti"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_6un3w"]
Expand Down
2 changes: 1 addition & 1 deletion godot/ingredients/resources/disconnected_block.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://curs4gmtnp140"]
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://bmc7tg6f5xuyc"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_p7vqq"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_7vwyi"]
Expand Down
2 changes: 1 addition & 1 deletion godot/ingredients/resources/hook_block.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://crywtu8cg1y53"]
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://b2pm4xtysqn01"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_4378i"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_6i7m1"]
Expand Down
2 changes: 1 addition & 1 deletion godot/ingredients/resources/t_block.tres
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://dnfyhrn54p1s"]
[gd_resource type="Resource" script_class="Ingredient" load_steps=4 format=3 uid="uid://cu8vnp1iqf1wm"]

[ext_resource type="Script" path="res://ingredient_actions/actions/attack_action.gd" id="1_43irh"]
[ext_resource type="Script" path="res://scenes/ingredient_block/ingredient_resource.gd" id="2_caslh"]
Expand Down
8 changes: 4 additions & 4 deletions godot/loot_tables/resources/base_table.tres
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
[ext_resource type="Script" path="res://loot_tables/loot_table.gd" id="1_pcdo4"]
[ext_resource type="Resource" uid="uid://bahbxo6wc30m4" path="res://ingredients/resources/godot_single.tres" id="2_0u5as"]
[ext_resource type="Resource" uid="uid://cyhd24hu3rkmq" path="res://ingredients/resources/l_block.tres" id="3_g1scy"]
[ext_resource type="Resource" uid="uid://8p82vshqls3p" path="res://ingredients/resources/cube_block.tres" id="4_53rnb"]
[ext_resource type="Resource" uid="uid://curs4gmtnp140" path="res://ingredients/resources/disconnected_block.tres" id="5_pwyps"]
[ext_resource type="Resource" uid="uid://crywtu8cg1y53" path="res://ingredients/resources/hook_block.tres" id="6_xjkps"]
[ext_resource type="Resource" uid="uid://dnfyhrn54p1s" path="res://ingredients/resources/t_block.tres" id="7_8ewyt"]
[ext_resource type="Resource" uid="uid://dyinoj814hd6i" path="res://ingredients/resources/cube_block.tres" id="4_53rnb"]
[ext_resource type="Resource" uid="uid://bmc7tg6f5xuyc" path="res://ingredients/resources/disconnected_block.tres" id="5_pwyps"]
[ext_resource type="Resource" uid="uid://b2pm4xtysqn01" path="res://ingredients/resources/hook_block.tres" id="6_xjkps"]
[ext_resource type="Resource" uid="uid://cu8vnp1iqf1wm" path="res://ingredients/resources/t_block.tres" id="7_8ewyt"]

[sub_resource type="Resource" id="Resource_rwm6v"]
script = ExtResource("1_5p5ur")
Expand Down
2 changes: 0 additions & 2 deletions godot/scenes/enemy/enemy.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ intent_icons = Array[String](["res://assets/kenney_assets/board_game_icons/sword

[node name="EnemySprite" type="Sprite2D" parent="."]
unique_name_in_owner = true
modulate = Color(0.305799, 0.563055, 0.608372, 1)
texture = ExtResource("1_q1r4t")

[node name="IntentIcon" type="Sprite2D" parent="."]
unique_name_in_owner = true
Expand Down
5 changes: 4 additions & 1 deletion godot/scenes/main_menu_scene.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
color = Color(0.14902, 0.0509804, 0.203922, 1)
color = Color(0.0925905, 0.0238464, 0.132337, 1)

[node name="CenterContainer" type="CenterContainer" parent="UI"]
anchors_preset = 15
Expand Down Expand Up @@ -76,6 +76,9 @@ text = "Jigglebox and Nezteb"
label_settings = SubResource("LabelSettings_2ikbh")
horizontal_alignment = 1

[node name="Control" type="Control" parent="UI/CenterContainer/VBoxContainer"]
layout_mode = 2

[node name="FadeOverlay" parent="UI" instance=ExtResource("3_kf1us")]
unique_name_in_owner = true
visible = false
Expand Down
5 changes: 2 additions & 3 deletions godot/scenes/player/player.tscn
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
[gd_scene load_steps=4 format=3 uid="uid://dw74q47ldjy8w"]

[ext_resource type="Script" path="res://scenes/player/player.gd" id="1_uqa0n"]
[ext_resource type="Texture2D" uid="uid://dmelj2qgr8w7k" path="res://icon.svg" id="2_s86pq"]
[ext_resource type="Texture2D" uid="uid://eme3gd7omh7u" path="res://assets/player.png" id="2_lr5om"]
[ext_resource type="PackedScene" uid="uid://cq5hja7dqauom" path="res://ui/components/health_bar/health_bar_container.tscn" id="3_wjw0q"]

[node name="Player" type="Node2D"]
script = ExtResource("1_uqa0n")

[node name="Icon" type="Sprite2D" parent="."]
modulate = Color(0.514846, 0.715107, 0, 1)
texture = ExtResource("2_s86pq")
texture = ExtResource("2_lr5om")

[node name="HealthBarContainer" parent="." instance=ExtResource("3_wjw0q")]
unique_name_in_owner = true
Expand Down
12 changes: 4 additions & 8 deletions godot/ui/components/game_logo.tscn
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
[gd_scene load_steps=2 format=3 uid="uid://b4blrdjthcxnn"]

[ext_resource type="Texture2D" uid="uid://dmelj2qgr8w7k" path="res://icon.svg" id="1_scjn5"]
[ext_resource type="Texture2D" uid="uid://cfjh31t2y8ri0" path="res://assets/cauldron.png" id="1_n322q"]

[node name="GameLogo" type="CenterContainer"]
offset_right = 128.0
offset_bottom = 128.0

[node name="MarginContainer" type="MarginContainer" parent="."]
offset_right = 148.0
offset_bottom = 148.0
layout_mode = 2
theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 10
theme_override_constants/margin_bottom = 10

[node name="TextureRect" type="TextureRect" parent="MarginContainer"]
offset_left = 10.0
offset_top = 10.0
offset_right = 138.0
offset_bottom = 138.0
texture = ExtResource("1_scjn5")
layout_mode = 2
texture = ExtResource("1_n322q")
stretch_mode = 2
Loading

0 comments on commit 64b2974

Please sign in to comment.