Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Some small changes for 0.5.0 Early tests
Browse files Browse the repository at this point in the history
  • Loading branch information
AndusDEV committed Aug 15, 2023
1 parent 2e2ed2b commit d1a6d0d
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 43 deletions.
16 changes: 16 additions & 0 deletions EarlyWatermark.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[gd_scene load_steps=2 format=2]

[ext_resource path="res://fonts/comfortaa/SmallTextTheme.tres" type="Theme" id=1]

[node name="EarlyWatermark" type="CanvasLayer"]

[node name="Label" type="Label" parent="."]
anchor_top = 1.0
anchor_bottom = 1.0
margin_top = -40.0
margin_right = 256.0
theme = ExtResource( 1 )
custom_colors/font_color = Color( 1, 1, 1, 0.403922 )
text = "0.5.0 Early Test"
align = 1
valign = 1
23 changes: 10 additions & 13 deletions addons/dialogue_manager/example_balloon/example_balloon.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ content_margin_left = 20.0
content_margin_right = 20.0
content_margin_top = 3.0
content_margin_bottom = 3.0
bg_color = Color( 0.823529, 0.890196, 0.968627, 1 )
bg_color = Color( 0, 0.439216, 0.631373, 1 )
corner_radius_top_left = 5
corner_radius_top_right = 5
corner_radius_bottom_right = 5
Expand Down Expand Up @@ -47,25 +47,24 @@ size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/margin_right = 30
custom_constants/margin_top = 20
custom_constants/margin_left = 30
custom_constants/margin_left = 25
custom_constants/margin_bottom = 20

[node name="VBox" type="VBoxContainer" parent="Balloon/Margin"]
margin_left = 30.0
margin_left = 25.0
margin_top = 20.0
margin_right = 30.0
margin_bottom = 654.0
margin_right = 25.0
margin_bottom = 1434.0
size_flags_horizontal = 3
size_flags_vertical = 3
custom_constants/separation = 5

[node name="Character" type="RichTextLabel" parent="Balloon/Margin/VBox"]
modulate = Color( 1, 1, 1, 0.470588 )
margin_bottom = 160.0
margin_bottom = 360.0
rect_min_size = Vector2( 0, 30 )
mouse_filter = 1
size_flags_horizontal = 3
custom_colors/default_color = Color( 0, 0, 0, 1 )
custom_fonts/normal_font = ExtResource( 3 )
bbcode_enabled = true
bbcode_text = "Character"
Expand All @@ -75,21 +74,20 @@ fit_content_height = true
scroll_active = false

[node name="Dialogue" parent="Balloon/Margin/VBox" instance=ExtResource( 7 )]
margin_top = 165.0
margin_top = 365.0
margin_right = 0.0
margin_bottom = 629.0
margin_bottom = 1409.0
rect_clip_content = false
mouse_filter = 1
custom_colors/default_color = Color( 0, 0, 0, 1 )
custom_fonts/italics_font = ExtResource( 5 )
custom_fonts/bold_font = ExtResource( 6 )
custom_fonts/normal_font = ExtResource( 3 )
bbcode_text = "This is a bunch of dialogue!"
text = "This is a bunch of dialogue!"

[node name="Responses" type="VBoxContainer" parent="Balloon/Margin/VBox"]
margin_top = 634.0
margin_bottom = 634.0
margin_top = 1414.0
margin_bottom = 1414.0
size_flags_horizontal = 3
size_flags_vertical = 3

Expand All @@ -100,7 +98,6 @@ margin_right = 1890.0
margin_bottom = 1060.0
rect_min_size = Vector2( 0, 45 )
size_flags_horizontal = 3
custom_colors/default_color = Color( 0, 0, 0, 1 )
custom_fonts/italics_font = ExtResource( 5 )
custom_fonts/bold_font = ExtResource( 6 )
custom_fonts/normal_font = ExtResource( 3 )
Expand Down
4 changes: 2 additions & 2 deletions addons/dialogue_manager/example_balloon/font_normal.tres
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_resource type="DynamicFont" load_steps=2 format=2]

[ext_resource path="res://addons/dialogue_manager/portrait_balloon/Press_Start_2P/PressStart2P-Regular.ttf" type="DynamicFontData" id=1]
[ext_resource path="res://addons/dialogue_manager/example_balloon/Open_Sans/OpenSans-Regular.ttf" type="DynamicFontData" id=1]

[resource]
size = 15
size = 25
font_data = ExtResource( 1 )
18 changes: 18 additions & 0 deletions levels/test_level/dialogues/translations/TestDialogue.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"

msgid "Hi. Do you want a quest?"
msgstr "Hi. Do you want a quest?"

msgid "Yeah!"
msgstr "Yeah!"

msgid "Nah, not really."
msgstr "Nah, not really."

msgid "Alright! To complete the quest find 2 LonelyPie logos."
msgstr "Alright! To complete the quest find 2 LonelyPie logos."

msgid "I gave you a quest already!"
msgstr "I gave you a quest already!"
2 changes: 2 additions & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ CursorOptions="*res://scripts/Cursor.gd"
Inv="*res://scenes/inventory/Inventory.tscn"
FirebaseLogin="*res://scripts/account/FirebaseLogin.gd"
CloudSaving="*res://scripts/account/CloudSaving.gd"
EarlyWatermark="*res://EarlyWatermark.tscn"

[debug]

Expand Down Expand Up @@ -506,6 +507,7 @@ translations=PoolStringArray( "res://localization/localizations.en.translation",
translation_remaps={
"res://sprites/gui/mods/mods.png": [ "res://sprites/gui/mods/mods.png:en", "res://sprites/locale_remaps/pl/gui/mods/mods.png:pl", "res://sprites/gui/mods/mods.png:de" ]
}
locale_filter=[ 0, [ "de", "en", "pl" ] ]

[network]

Expand Down
56 changes: 32 additions & 24 deletions scenes/Credits.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,19 @@ anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
margin_left = 672.0
margin_top = 1080.0
margin_right = 1424.0
margin_bottom = 3016.0
margin_left = -288.0
margin_right = 464.0
margin_bottom = 1936.0
alignment = 1
__meta__ = {
"_edit_group_": true,
"_editor_description_": "- Change \"betatester\" to \"player\" on release"
}

[node name="LonelyPieCredits" type="VBoxContainer" parent="CreditsContainer"]
margin_top = 142.0
margin_top = 121.0
margin_right = 752.0
margin_bottom = 810.0
margin_bottom = 830.0
alignment = 1

[node name="Logo" type="TextureRect" parent="CreditsContainer/LonelyPieCredits"]
Expand Down Expand Up @@ -124,41 +123,50 @@ text = "Andus - Main Developer"
align = 1
valign = 1

[node name="ArtistsContainer2" type="VBoxContainer" parent="CreditsContainer/LonelyPieCredits"]
[node name="ArtistsContainer" type="VBoxContainer" parent="CreditsContainer/LonelyPieCredits"]
margin_top = 372.0
margin_right = 752.0
margin_bottom = 509.0
margin_bottom = 550.0

[node name="Name" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer2"]
[node name="Name" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer"]
margin_right = 752.0
margin_bottom = 55.0
theme = ExtResource( 1 )
text = "Artists"
align = 1
valign = 1

[node name="Creta" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer2"]
[node name="Creta" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer"]
margin_top = 59.0
margin_right = 752.0
margin_bottom = 96.0
theme = ExtResource( 5 )
text = "Creta"
text = "Creta - Main Artist"
align = 1
valign = 1

[node name="LucePric" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer2"]
[node name="LucePric" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer"]
margin_top = 100.0
margin_right = 752.0
margin_bottom = 137.0
theme = ExtResource( 5 )
text = "LucePric"
text = "LucePric - Main Artist"
align = 1
valign = 1

[node name="Andus" type="Label" parent="CreditsContainer/LonelyPieCredits/ArtistsContainer"]
margin_top = 141.0
margin_right = 752.0
margin_bottom = 178.0
theme = ExtResource( 5 )
text = "Andus - UI Artist"
align = 1
valign = 1

[node name="StoryContainer" type="VBoxContainer" parent="CreditsContainer/LonelyPieCredits"]
margin_top = 513.0
margin_top = 554.0
margin_right = 752.0
margin_bottom = 609.0
margin_bottom = 650.0

[node name="Name" type="Label" parent="CreditsContainer/LonelyPieCredits/StoryContainer"]
margin_right = 752.0
Expand All @@ -178,22 +186,22 @@ align = 1
valign = 1

[node name="TestersContainer" type="VBoxContainer" parent="CreditsContainer/LonelyPieCredits"]
margin_top = 613.0
margin_top = 654.0
margin_right = 752.0
margin_bottom = 668.0
margin_bottom = 709.0

[node name="Name" type="Label" parent="CreditsContainer/LonelyPieCredits/TestersContainer"]
margin_right = 752.0
margin_bottom = 55.0
theme = ExtResource( 1 )
text = "Playtesters (?)"
text = "Playtesters"
align = 1
valign = 1

[node name="SpecialCredits" type="VBoxContainer" parent="CreditsContainer"]
margin_top = 814.0
margin_top = 834.0
margin_right = 752.0
margin_bottom = 1614.0
margin_bottom = 1634.0
alignment = 1

[node name="Logo" type="TextureRect" parent="CreditsContainer/SpecialCredits"]
Expand Down Expand Up @@ -324,15 +332,15 @@ align = 1
valign = 1

[node name="HSeparator" type="HSeparator" parent="CreditsContainer"]
margin_top = 1618.0
margin_top = 1638.0
margin_right = 752.0
margin_bottom = 1718.0
margin_bottom = 1738.0
custom_constants/separation = 100

[node name="Community" type="Label" parent="CreditsContainer"]
margin_top = 1722.0
margin_top = 1742.0
margin_right = 752.0
margin_bottom = 1794.0
margin_bottom = 1814.0
theme = ExtResource( 2 )
text = "And you, betatester <3"
align = 1
Expand Down
4 changes: 2 additions & 2 deletions scenes/misc/intro/Intro.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0.5, 1.5 ),
"times": PoolRealArray( 0.4, 1.2 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ Color( 0, 0, 0, 1 ), Color( 0, 0, 0, 0 ) ]
Expand Down Expand Up @@ -66,7 +66,7 @@ custom_colors/font_color_shadow = Color( 0.235294, 0.235294, 0.235294, 1 )
custom_constants/shadow_offset_x = 2
custom_constants/shadow_offset_y = 2
bbcode_enabled = true
bbcode_text = "[center][rainbow freq=0.3][tornado radius=5 freq=2]LonelyPie Studio[/tornado][/rainbow][/center]"
bbcode_text = "[center][rainbow freq=0.6][tornado radius=5 freq=4]LonelyPie Studio[/tornado][/rainbow][/center]"
text = "LonelyPie Studio"
scroll_active = false

Expand Down
4 changes: 2 additions & 2 deletions scripts/misc/intro/Intro.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ func _ready():
var prob = randi()%100+1
if prob == 1:
$Logo.texture = load("res://sprites/logo-egg.png")
$Label.bbcode_text = "[center][rainbow freq=0.3][tornado radius=5 freq=2]LaughingPie and Co.[/tornado][/rainbow][/center]"
$Label.bbcode_text = "[center][rainbow freq=0.6][tornado radius=5 freq=4]LaughingPie and Co.[/tornado][/rainbow][/center]"
_play_anim()

func _play_anim():
Expand All @@ -27,7 +27,7 @@ func _play_anim():

func _godot_credits():
$Logo.texture = load("res://sprites/icons/misc/godot_logo.svg")
$Label.bbcode_text = "[center][tornado radius=5 freq=2]Made with Godot[/tornado][/center]"
$Label.bbcode_text = "[center][tornado radius=5 freq=4]Made with Godot[/tornado][/center]"

#func _facts():
# randomize()
Expand Down

0 comments on commit d1a6d0d

Please sign in to comment.