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

Commit

Permalink
More Splashes, New Evie Sprite, Web Release
Browse files Browse the repository at this point in the history
 - More Splashes
 - New Evie Sprite [by: @creta]
 - HTML Release
  • Loading branch information
AndusDEV committed Sep 25, 2022
1 parent aa65d6f commit 39ed4d1
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 69 deletions.
42 changes: 24 additions & 18 deletions scenes/MainMenu.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,14 @@ code = ExtResource( 10 )
[node name="Sprite" type="Sprite" parent="Splash"]
visible = false
position = Vector2( 544, 320 )
scale = Vector2( 1, 1 )
texture = ExtResource( 9 )

[node name="Buttons" type="VBoxContainer" parent="."]
anchor_top = 1.0
anchor_bottom = 1.0
margin_left = 12.0
margin_top = -136.0
margin_right = 128.0
margin_top = -122.0
margin_right = 138.0
__meta__ = {
"_edit_group_": true
}
Expand Down Expand Up @@ -105,23 +104,25 @@ flat = true
align = 0

[node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = 912.0
margin_top = 506.0
margin_right = 1092.0
margin_bottom = 586.0
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -136.0
margin_top = -80.0
__meta__ = {
"_edit_group_": true
}

[node name="ExtrasButton" type="Button" parent="VBoxContainer"]
margin_right = 180.0
margin_right = 136.0
margin_bottom = 38.0
theme = ExtResource( 3 )
text = "EXTRAS"

[node name="CreditsButton" type="Button" parent="VBoxContainer"]
margin_top = 42.0
margin_right = 180.0
margin_right = 136.0
margin_bottom = 80.0
theme = ExtResource( 3 )
text = "CREDITS"
Expand All @@ -130,8 +131,9 @@ clip_text = true
icon_align = 1

[node name="GameJoltButton" type="Button" parent="."]
margin_left = 832.0
margin_right = 1088.0
anchor_left = 1.0
anchor_right = 1.0
margin_left = -256.0
margin_bottom = 48.0
theme = ExtResource( 3 )
disabled = true
Expand All @@ -157,31 +159,35 @@ anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
margin_left = -109.0
margin_left = -136.0
margin_top = -40.0
margin_right = 109.0
margin_right = 136.0
theme = ExtResource( 6 )
custom_constants/separation = 13
alignment = 1
__meta__ = {
"_edit_group_": true
}

[node name="GithubButton" type="Button" parent="HBoxContainer"]
margin_right = 64.0
margin_left = 3.0
margin_right = 67.0
margin_bottom = 40.0
custom_colors/font_color_focus = Color( 0, 0.368627, 1, 1 )
custom_colors/font_color_hover = Color( 0, 0.368627, 1, 1 )
text = "Github"

[node name="BugsButton" type="Button" parent="HBoxContainer"]
margin_left = 77.0
margin_right = 169.0
margin_left = 80.0
margin_right = 172.0
margin_bottom = 40.0
custom_colors/font_color_focus = Color( 1, 0, 0, 1 )
custom_colors/font_color_hover = Color( 1, 0, 0, 1 )
text = "MM_BUGS"

[node name="WebsiteButton" type="Button" parent="HBoxContainer"]
margin_left = 182.0
margin_right = 266.0
margin_left = 185.0
margin_right = 269.0
margin_bottom = 40.0
custom_colors/font_color_focus = Color( 0, 0.368627, 1, 1 )
custom_colors/font_color_hover = Color( 0, 0.368627, 1, 1 )
Expand Down
5 changes: 3 additions & 2 deletions scenes/misc/PauseController.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ text = "SystemTime"
align = 2

[node name="PhotoButton" type="Button" parent="Panel"]
margin_left = 920.0
margin_right = 1088.0
anchor_left = 1.0
anchor_right = 1.0
margin_left = -168.0
margin_bottom = 40.0
theme = ExtResource( 2 )
disabled = true
Expand Down
57 changes: 25 additions & 32 deletions scenes/player/Player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
[ext_resource path="res://scenes/settings/Settings.tscn" type="PackedScene" id=3]

[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 5.625, 2.1875 )
extents = Vector2( 14, 7.03126 )

[sub_resource type="Animation" id=2]
[sub_resource type="Animation" id=27]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:frame")
Expand All @@ -19,10 +19,10 @@ tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ 0 ]
"values": [ 10 ]
}

[sub_resource type="Animation" id=19]
[sub_resource type="Animation" id=32]
resource_name = "idle"
loop = true
tracks/0/type = "value"
Expand All @@ -32,15 +32,14 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.5 ),
"transitions": PoolRealArray( 1, 1 ),
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ 12, 13 ]
"values": [ 1 ]
}

[sub_resource type="Animation" id=3]
[sub_resource type="Animation" id=28]
resource_name = "walk_down"
length = 0.75
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:frame")
Expand All @@ -49,15 +48,14 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.2, 0.4, 0.6 ),
"times": PoolRealArray( 0, 0.25, 0.5, 0.75 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 1,
"values": [ 0, 1, 2, 1 ]
}

[sub_resource type="Animation" id=4]
[sub_resource type="Animation" id=29]
resource_name = "walk_left"
length = 0.75
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:frame")
Expand All @@ -66,15 +64,14 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.2, 0.4, 0.6 ),
"times": PoolRealArray( 0, 0.25, 0.5, 0.75 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 1,
"values": [ 3, 4, 5, 4 ]
}

[sub_resource type="Animation" id=5]
[sub_resource type="Animation" id=30]
resource_name = "walk_right"
length = 0.75
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:frame")
Expand All @@ -83,15 +80,14 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.2, 0.4, 0.6 ),
"times": PoolRealArray( 0, 0.25, 0.5, 0.75 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 1,
"values": [ 6, 7, 8, 7 ]
}

[sub_resource type="Animation" id=6]
[sub_resource type="Animation" id=31]
resource_name = "walk_up"
length = 0.75
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:frame")
Expand All @@ -100,7 +96,7 @@ tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.2, 0.4, 0.6 ),
"times": PoolRealArray( 0, 0.25, 0.5, 0.75 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ),
"update": 1,
"values": [ 9, 10, 11, 10 ]
Expand Down Expand Up @@ -169,11 +165,7 @@ start_node = "Idle"

[node name="Player" type="KinematicBody2D"]
position = Vector2( 44, 24 )
scale = Vector2( 1.6, 1.6 )
script = ExtResource( 2 )
__meta__ = {
"_edit_group_": true
}

[node name="Camera2D" type="Camera2D" parent="."]
modulate = Color( 1, 1, 1, 0.498039 )
Expand All @@ -185,20 +177,21 @@ smoothing_speed = 3.0
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
hframes = 3
vframes = 5
vframes = 4
frame = 10

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 0, 9.6875 )
scale = Vector2( 0.999999, 0.999999 )
position = Vector2( 0, 20.0312 )
scale = Vector2( 0.999998, 0.999998 )
shape = SubResource( 1 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/RESET = SubResource( 2 )
anims/idle = SubResource( 19 )
anims/walk_down = SubResource( 3 )
anims/walk_left = SubResource( 4 )
anims/walk_right = SubResource( 5 )
anims/walk_up = SubResource( 6 )
anims/RESET = SubResource( 27 )
anims/idle = SubResource( 32 )
anims/walk_down = SubResource( 28 )
anims/walk_left = SubResource( 29 )
anims/walk_right = SubResource( 30 )
anims/walk_up = SubResource( 31 )

[node name="AnimationTree" type="AnimationTree" parent="."]
tree_root = SubResource( 12 )
Expand Down
7 changes: 7 additions & 0 deletions scripts/MainMenu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ func _ready():
$GJAcc.text = "GameJolt:\n" + GameJoltAPI.username
$Splashes.text = splashtext()
$GameInfo/GameVersion.text = get_ver(gameVerFile)
ifHTML()
$CanvasLayer/Settings/Panel.visible = false
$Buttons/StartButton.grab_focus()

Expand Down Expand Up @@ -88,3 +89,9 @@ func splashtext():
func _on_SplashCheatCode_cheat_activated():
$Splashes.text = "The cake is a lie"
$Splash/Sprite.visible = true

func ifHTML():
var os = OS.get_name()
if os == "HTML5":
$Splashes.text = "So you're a web gamer huh?"
$GameInfo/GameVersion.text = "v. Always latest B)"
10 changes: 3 additions & 7 deletions scripts/misc/PauseController.gd
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,16 @@ func clockTimerInit():
func _on_Timer_timeout():
$Panel/SystemTime.text = String(OS.get_time()["hour"]) + ":" + String(OS.get_time()["minute"]) + ":" + String(OS.get_time()["second"])


func _on_ExitButton_focus_entered():
$QuitPanel/PleaseDont.visible = true


func _on_ExitButton_focus_exited():
$QuitPanel/PleaseDont.visible = false


func _on_PhotoButton_pressed():
pass

func getLangs():
if !$Settings/Panel/Other/LangButton.get_item_id(1):
$Settings/Panel/Other/LangButton.add_item("English", 1)
$Settings/Panel/Other/LangButton.add_item("Polski", 2)
$Settings/Panel/Other/LangButton.add_item("Deutsch", 3)
$Settings/Panel/Other/LangButton.add_item("English", 1)
$Settings/Panel/Other/LangButton.add_item("Polski", 2)
$Settings/Panel/Other/LangButton.add_item("Deutsch", 3)
4 changes: 2 additions & 2 deletions scripts/misc/Utils.gd
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func load_file(file_path):

func get_random_word_from_file(file_path):
var text = load_file(file_path).strip_edges()
var words = text.split(",")
var words = text.split("|")
for i in range(words.size()):
words[i] = words[i].replace(",", "")
words[i] = words[i].replace("|", "")
return words[randi() % words.size()]
2 changes: 1 addition & 1 deletion splashes.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Now in Beta!,https://lpie.andus.dev/,Made by LonelyPie,Download now! wait.. nvm,<3
Now in Beta!|https://lpie.andus.dev/|Made by LonelyPie|Download now! wait.. nvm|<3|Bugs? Nah, bug-free!|Never give up!|Share with friends
Binary file modified sprites/characters/player/player.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions todo.txt

This file was deleted.

2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v. 0.1.1
v. 0.1.2

0 comments on commit 39ed4d1

Please sign in to comment.