diff --git a/.text.csv.kate-swp b/.text.csv.kate-swp new file mode 100644 index 0000000..79700fe Binary files /dev/null and b/.text.csv.kate-swp differ diff --git a/Label2.gd b/Label2.gd index e27a39f..694558e 100644 --- a/Label2.gd +++ b/Label2.gd @@ -19,7 +19,7 @@ func _ready(): else: welcometext = "Welcome back "+playername if housefreedom: - welcometext = welcometext+"\nSteam machines are not dead yet" + welcometext = welcometext+"\nValve corporation promotes enviromental pollution" if OS.get_environment("MANGOHUD").contains("1"): Global.mangohud = true welcometext = welcometext+"\nYour overlay already has a FPS counter, built-in one is disabled" diff --git a/backgounds/Kimberly Arch crying.jpg b/backgounds/Kimberly Arch crying.jpg new file mode 100644 index 0000000..c58ecbe Binary files /dev/null and b/backgounds/Kimberly Arch crying.jpg differ diff --git a/backgounds/Kimberly Arch crying.jpg.import b/backgounds/Kimberly Arch crying.jpg.import new file mode 100644 index 0000000..91d6deb --- /dev/null +++ b/backgounds/Kimberly Arch crying.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://chbs1cqrcbcrm" +path="res://.godot/imported/Kimberly Arch crying.jpg-c9629d3010b4db2f2db2d50e1cba39e5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Kimberly Arch crying.jpg" +dest_files=["res://.godot/imported/Kimberly Arch crying.jpg-c9629d3010b4db2f2db2d50e1cba39e5.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 diff --git a/backgounds/Midori Punishment.jpg b/backgounds/Midori Punishment.jpg new file mode 100644 index 0000000..b3ef91f Binary files /dev/null and b/backgounds/Midori Punishment.jpg differ diff --git a/backgounds/Midori Punishment.jpg.import b/backgounds/Midori Punishment.jpg.import new file mode 100644 index 0000000..1421066 --- /dev/null +++ b/backgounds/Midori Punishment.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://k8ahmljsdidy" +path="res://.godot/imported/Midori Punishment.jpg-e0a7a039209e61cd76dc31f57984155b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Midori Punishment.jpg" +dest_files=["res://.godot/imported/Midori Punishment.jpg-e0a7a039209e61cd76dc31f57984155b.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 diff --git a/backgounds/Midori walking though forest.jpg b/backgounds/Midori walking though forest.jpg new file mode 100644 index 0000000..1658b12 Binary files /dev/null and b/backgounds/Midori walking though forest.jpg differ diff --git a/backgounds/Midori walking though forest.jpg.import b/backgounds/Midori walking though forest.jpg.import new file mode 100644 index 0000000..d536179 --- /dev/null +++ b/backgounds/Midori walking though forest.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvk01b0l15k3u" +path="res://.godot/imported/Midori walking though forest.jpg-dca4081b9c1cb9c527db2ab9b9616775.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Midori walking though forest.jpg" +dest_files=["res://.godot/imported/Midori walking though forest.jpg-dca4081b9c1cb9c527db2ab9b9616775.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 diff --git a/backgounds/wip.gd b/backgounds/wip.gd index a21502e..74eaf21 100644 --- a/backgounds/wip.gd +++ b/backgounds/wip.gd @@ -30,7 +30,7 @@ func _title(): if Global.debug: get_tree().change_scene_to_file("res://levels/ui/scene.tscn") else: - get_tree().change_scene_to_file("res://title.tscn") + get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn") #get_tree().root.add_child(title) #get_tree().root.remove_child(boot) #boot.queue_free() diff --git a/global.gd b/global.gd index 3c94222..737f185 100644 --- a/global.gd +++ b/global.gd @@ -12,7 +12,7 @@ var bossready = false var playerx var playery var ccutscene = null -const cutscenes = [["res://levels/Cutscenes/opening/aboutkaizo.tscn", "res://levels/Cutscenes/opening/midorihello.tscn", "res://music/scholartrip.wav", false], ["res://levels/Cutscenes/opening/midorihello.tscn", "res://levels/Cutscenes/opening/fearlessmidori.tscn", "res://music/scholartrip.wav", false], ["res://levels/Cutscenes/opening/fearlessmidori.tscn", "res://levels/Cutscenes/opening/midoriwaterfall.tscn", "res://music/midorinoakuma.wav", false], ["res://levels/Cutscenes/opening/midoriwaterfall.tscn", "res://levels/Cutscenes/opening/midorireading.tscn", "res://music/midorinoakuma.wav", false], ["res://levels/Cutscenes/opening/midorireading.tscn", "res://levels/Cutscenes/opening/boomboomtorofi.tscn", "res://music/midorinoakuma.wav", false], ["res://levels/Cutscenes/opening/boomboomtorofi.tscn", "res://levels/ui/gameplay.tscn", "res://music/midorinoakuma.wav", true]] +const cutscenes = [["res://levels/Cutscenes/opening/aboutkaizo.tscn", "res://levels/Cutscenes/opening/midorihello.tscn", 18, false], ["res://levels/Cutscenes/opening/midorihello.tscn", "res://levels/Cutscenes/opening/fearlessmidori.tscn", 18, false], ["res://levels/Cutscenes/opening/fearlessmidori.tscn", "res://levels/Cutscenes/opening/midoriwaterfall.tscn", 0, false], ["res://levels/Cutscenes/opening/midoriwaterfall.tscn", "res://levels/Cutscenes/opening/midorireading.tscn", 0, false], ["res://levels/Cutscenes/opening/midorireading.tscn", "res://levels/Cutscenes/opening/boomboomtorofi.tscn", 0, false], ["res://levels/Cutscenes/opening/boomboomtorofi.tscn", "res://levels/ui/gameplay.tscn", 0, true], ["res://levels/Cutscenes/unfunaversary/punishment.tscn", "res://levels/Cutscenes/unfunaversary/sadness.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/sadness.tscn", "res://levels/Cutscenes/unfunaversary/r3.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/r3.tscn", "res://levels/Cutscenes/unfunaversary/firstclass.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/firstclass.tscn", "res://backgounds/result.tscn", 5, true]] const pcnames = ["Midori Asgardius", "Diana Asgardius", null, "Kimberly Arch", null, null, null, null, null, "Natasha Dostoyevsky"] const npcnames = ["Lily", null, null, "Kimberly Arch", null, null, null, null, null, "Natasha Dostoyevsky"] const pcfaces = [["res://sprites/common/midori/face.png"], ["res://sprites/common/tuna/face.png"], [null], ["res://sprites/common/kimberly/face.png"], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/face.png"]] @@ -23,7 +23,7 @@ var cstats = [[800, 200, 52, 12, 136, 25, 800], [1094, 200, 54, 7, 106, 48, 600] var dstats = [[800, 200, 52, 12, 136, 25, 800], [1094, 200, 54, 7, 106, 48, 600], [null], [1143, 200, 59, 5, 117, 18, 650], [null], [null], [null], [null], [null], [1026, 200, 87, 7, 105, 49, 115]] var mstats = [[null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null]] var cdialog = [] -const places = [[[[null, null, false], [null, null, false]], [["res://levels/Testrooms/bullethell.tscn", 11, true], ["res://levels/Testrooms/lilytest.tscn", 6, false]], [["res://levels/Testrooms/dialogtest.tscn", 19, false], ["res://levels/Testrooms/testspawn.tscn", 2 ,false]]], [null, null, null, null, null, null, null, null, null, null, null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/L20.tscn", 3, true]]]] +const places = [[[["res://levels/Ceres/map.tscn", 5, false], [null, null, false]], [["res://levels/Testrooms/bullethell.tscn", 11, true], ["res://levels/Testrooms/lilytest.tscn", 6, false]], [["res://levels/Testrooms/dialogtest.tscn", 19, false], ["res://levels/Testrooms/testspawn.tscn", 2 ,false]]], [null, null, null, null, null, null, null, null, null, null, null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/L20.tscn", 3, true]]]] var cplace = [0,2,1] var dplace = [null, null, null] const pbbullets = ["res://sprites/common/bullet/fireball.tscn", "res://sprites/common/bullet/sword.tscn", null, "res://sprites/common/bullet/arrow.tscn", null, null, null, null, null, "res://sprites/common/bullet/snowflake.tscn"] @@ -50,7 +50,7 @@ var firstrun const musictracks = ["res://music/midorinoakuma.wav", "res://music/seahorse.wav", "res://music/chinesegoat.wav", "res://music/doyoufeelold.wav", "res://music/doyiuneedahealer.wav", "res://music/adayatceres.wav", "res://music/twintroublemakers.wav", "res://music/easyquiz.wav", "res://music/neowave.wav", "res://music/multivectorsubmarines.wav", "res://music/halfgeniegirls.wav", "res://music/rusianmaverickfairy.wav", "res://music/blacksmithofdestruction.wav", "res://music/shininglikefireworks.wav", "res://music/sadtrashcan.wav", "res://music/akikoletter.wav", "res://music/asadcat.wav", "res://music/lilydesire.wav", "res://music/scholartrip.wav", "res://music/quantumice.wav", "res://music/unreeeal.wav", "res://music/alsa.wav", "res://music/silverblue.wav"] const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"] var debug = false -const release = "R0.1.10-alpha" +const release = "R0.1.11-dev" var sk = false var xm = 0 var ym = 0 diff --git a/levels/Ceres/L20.gd b/levels/Ceres/L20.gd index cc15f30..a835c2c 100644 --- a/levels/Ceres/L20.gd +++ b/levels/Ceres/L20.gd @@ -32,6 +32,19 @@ func _input(event): func _winner(): Global.cdialog = [[tr("DIALOG_CERES_L20_3"), true, 0, 0], [tr("DIALOG_CERES_L20_4"), false, 3], [tr("DIALOG_CERES_L20_5"), true, 0, 0]] Global.live = 3 + Global.ccutscene = 6 #talk.queue_free() talk = load("res://levels/ui/talk.tscn").instantiate() get_tree().root.add_child.call(talk) + +func _statrebase(): + if Global.debug: + for i in 4: + if Global.dparty[i][0] != null: + for j in 7: + Global.mstats[Global.dparty[i][0]][j] = Global.basestats[Global.dparty[i][0]][j] * Global.dlevel[Global.dparty[i][0]] + else: + for i in 4: + if Global.party[i][0] != null: + for j in 7: + Global.mstats[Global.party[i][0]][j] = Global.basestats[Global.party[i][0]][j] * Global.level[Global.dparty[i][0]] diff --git a/levels/Ceres/map.gd b/levels/Ceres/map.gd new file mode 100644 index 0000000..727d30b --- /dev/null +++ b/levels/Ceres/map.gd @@ -0,0 +1,20 @@ +extends Node2D + + +# Called when the node enters the scene tree for the first time. +func _ready(): + if !Global.debug: + _statrebase() + Global.live = 1 + #pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + +func _statrebase(): + for i in 4: + if Global.party[i][0] != null: + for j in 7: + Global.cstats[Global.party[i][0]][j] = Global.basestats[Global.party[i][0]][j] * Global.level[Global.dparty[i][0]] diff --git a/levels/Ceres/map.tscn b/levels/Ceres/map.tscn new file mode 100644 index 0000000..8e66435 --- /dev/null +++ b/levels/Ceres/map.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=6 format=3 uid="uid://bomoy5hvs8ldt"] + +[ext_resource type="Script" path="res://levels/Ceres/map.gd" id="1_fb2vd"] +[ext_resource type="Texture2D" uid="uid://kxvipok4tnuw" path="res://backgounds/wip.jpg" id="2_jxya4"] +[ext_resource type="PackedScene" uid="uid://cehe6sm8ly06u" path="res://sprites/common/player/player.tscn" id="3_q2e1y"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_nytv7"] +size = Vector2(20, 761) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_wkumn"] +size = Vector2(1283, 20) + +[node name="Map" type="Node2D"] +script = ExtResource("1_fb2vd") + +[node name="WIP" type="TextureRect" parent="."] +offset_right = 40.0 +offset_bottom = 40.0 +texture = ExtResource("2_jxya4") + +[node name="StaticBody2D" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] +position = Vector2(-11, 361.5) +shape = SubResource("RectangleShape2D_nytv7") + +[node name="StaticBody2D2" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"] +position = Vector2(1293, 358) +shape = SubResource("RectangleShape2D_nytv7") + +[node name="StaticBody2D3" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D3"] +position = Vector2(641.5, -9) +shape = SubResource("RectangleShape2D_wkumn") + +[node name="StaticBody2D4" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D4"] +position = Vector2(644, 731) +shape = SubResource("RectangleShape2D_wkumn") + +[node name="Player" parent="." instance=ExtResource("3_q2e1y")] +position = Vector2(633, 590) diff --git a/levels/Cutscenes/unfunaversary/firstclass.gd b/levels/Cutscenes/unfunaversary/firstclass.gd new file mode 100644 index 0000000..7a25aa1 --- /dev/null +++ b/levels/Cutscenes/unfunaversary/firstclass.gd @@ -0,0 +1,12 @@ +extends Node2D + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + if !Global.debug: + Global.cplace = [0, 0, 0] + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/levels/Cutscenes/unfunaversary/firstclass.tscn b/levels/Cutscenes/unfunaversary/firstclass.tscn new file mode 100644 index 0000000..32e28cf --- /dev/null +++ b/levels/Cutscenes/unfunaversary/firstclass.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=4 format=3 uid="uid://c0087irckk6ls"] + +[ext_resource type="Texture2D" uid="uid://cvk01b0l15k3u" path="res://backgounds/Midori walking though forest.jpg" id="1_3edyj"] +[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="1_7k1pi"] +[ext_resource type="Script" path="res://levels/Cutscenes/unfunaversary/firstclass.gd" id="1_atuct"] + +[node name="Firstclass" type="Node2D"] +script = ExtResource("1_atuct") + +[node name="TextureRect" type="TextureRect" parent="."] +offset_right = 1278.0 +offset_bottom = 600.0 +texture = ExtResource("1_3edyj") + +[node name="Text" type="Label" parent="."] +offset_left = 52.0 +offset_top = 606.0 +offset_right = 1224.0 +offset_bottom = 714.0 +theme_override_font_sizes/font_size = 40 +text = "CUTSCENE_1_3" +horizontal_alignment = 1 + +[node name="Bottomhud" parent="." instance=ExtResource("1_7k1pi")] diff --git a/levels/Cutscenes/unfunaversary/punishment.tscn b/levels/Cutscenes/unfunaversary/punishment.tscn new file mode 100644 index 0000000..286aff1 --- /dev/null +++ b/levels/Cutscenes/unfunaversary/punishment.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=3 format=3 uid="uid://bufn0t2n24ubb"] + +[ext_resource type="Texture2D" uid="uid://k8ahmljsdidy" path="res://backgounds/Midori Punishment.jpg" id="1_gtd13"] +[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="2_iimhu"] + +[node name="Punishment" type="Node2D"] + +[node name="TextureRect" type="TextureRect" parent="."] +offset_right = 1278.0 +offset_bottom = 600.0 +texture = ExtResource("1_gtd13") + +[node name="Text" type="Label" parent="."] +offset_left = 52.0 +offset_top = 606.0 +offset_right = 1224.0 +offset_bottom = 714.0 +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_font_sizes/font_size = 40 +text = "CUTSCENE_1_0" +horizontal_alignment = 1 + +[node name="Bottomhud" parent="." instance=ExtResource("2_iimhu")] diff --git a/levels/Cutscenes/unfunaversary/r3.tscn b/levels/Cutscenes/unfunaversary/r3.tscn new file mode 100644 index 0000000..ae4cc80 --- /dev/null +++ b/levels/Cutscenes/unfunaversary/r3.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=3 format=3 uid="uid://b7l73y65vvix2"] + +[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="1_3j65n"] +[ext_resource type="Texture2D" uid="uid://bxa27c7gnivwx" path="res://backgounds/night-sky-at-ceres.jpg" id="1_p8vly"] + +[node name="R3" type="Node2D"] + +[node name="TextureRect" type="TextureRect" parent="."] +offset_right = 1278.0 +offset_bottom = 600.0 +texture = ExtResource("1_p8vly") + +[node name="Text" type="Label" parent="."] +offset_left = 52.0 +offset_top = 606.0 +offset_right = 1224.0 +offset_bottom = 714.0 +theme_override_font_sizes/font_size = 40 +text = "CUTSCENE_1_2" +horizontal_alignment = 1 + +[node name="Bottomhud" parent="." instance=ExtResource("1_3j65n")] diff --git a/levels/Cutscenes/unfunaversary/sadness.tscn b/levels/Cutscenes/unfunaversary/sadness.tscn new file mode 100644 index 0000000..8dd5ee9 --- /dev/null +++ b/levels/Cutscenes/unfunaversary/sadness.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=3 format=3 uid="uid://ba3q8nwe5yku3"] + +[ext_resource type="Texture2D" uid="uid://chbs1cqrcbcrm" path="res://backgounds/Kimberly Arch crying.jpg" id="1_k6hw6"] +[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="2_n1fd3"] + +[node name="Sadness" type="Node2D"] + +[node name="TextureRect" type="TextureRect" parent="."] +offset_right = 1278.0 +offset_bottom = 600.0 +texture = ExtResource("1_k6hw6") + +[node name="Text" type="Label" parent="."] +offset_left = 52.0 +offset_top = 606.0 +offset_right = 1224.0 +offset_bottom = 714.0 +theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_font_sizes/font_size = 40 +text = "CUTSCENE_1_1" +horizontal_alignment = 1 + +[node name="Bottomhud" parent="." instance=ExtResource("2_n1fd3")] diff --git a/levels/Earth/map.gd b/levels/Earth/map.gd new file mode 100644 index 0000000..58577cf --- /dev/null +++ b/levels/Earth/map.gd @@ -0,0 +1,11 @@ +extends Node2D + + +# 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 diff --git a/levels/Earth/map.tscn b/levels/Earth/map.tscn new file mode 100644 index 0000000..c042152 --- /dev/null +++ b/levels/Earth/map.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=6 format=3 uid="uid://bqthmqpx51x01"] + +[ext_resource type="Script" path="res://levels/Testrooms/testspawn.gd" id="1_82nl8"] +[ext_resource type="Texture2D" uid="uid://kxvipok4tnuw" path="res://backgounds/wip.jpg" id="2_nugl5"] +[ext_resource type="PackedScene" uid="uid://cehe6sm8ly06u" path="res://sprites/common/player/player.tscn" id="3_0rw86"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_nytv7"] +size = Vector2(20, 761) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_wkumn"] +size = Vector2(1283, 20) + +[node name="Testspawn" type="Node2D"] +script = ExtResource("1_82nl8") + +[node name="WIP" type="TextureRect" parent="."] +offset_right = 40.0 +offset_bottom = 40.0 +texture = ExtResource("2_nugl5") + +[node name="StaticBody2D" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] +position = Vector2(-11, 361.5) +shape = SubResource("RectangleShape2D_nytv7") + +[node name="StaticBody2D2" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"] +position = Vector2(1293, 358) +shape = SubResource("RectangleShape2D_nytv7") + +[node name="StaticBody2D3" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D3"] +position = Vector2(641.5, -9) +shape = SubResource("RectangleShape2D_wkumn") + +[node name="StaticBody2D4" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D4"] +position = Vector2(644, 731) +shape = SubResource("RectangleShape2D_wkumn") + +[node name="Player" parent="." instance=ExtResource("3_0rw86")] +position = Vector2(633, 590) diff --git a/levels/ui/Cutscenes.gd b/levels/ui/Cutscenes.gd index 6029ac3..d3ecbb3 100644 --- a/levels/ui/Cutscenes.gd +++ b/levels/ui/Cutscenes.gd @@ -11,10 +11,11 @@ var ishud = true # Called when the node enters the scene tree for the first time. func _ready(): + Global.live = 1 add_child(bgsound) add_child(sfx1) level = load(Global.cutscenes[Global.ccutscene][0]).instantiate() - musictrack = Global.cutscenes[Global.ccutscene][2] + musictrack = Global.musictracks[Global.cutscenes[Global.ccutscene][2]] music = load(musictrack) get_tree().root.add_child.call_deferred(level) get_tree().root.add_child.call_deferred(bhud) @@ -71,9 +72,9 @@ func _input(event): Global.ccutscene += 1 get_tree().root.remove_child(level) level = load(Global.cutscenes[Global.ccutscene][0]).instantiate() - if musictrack != Global.cutscenes[Global.ccutscene][2]: + if musictrack != Global.musictracks[Global.cutscenes[Global.ccutscene][2]]: bgsound.stop() - musictrack = Global.cutscenes[Global.ccutscene][2] + musictrack = Global.musictracks[Global.cutscenes[Global.ccutscene][2]] music = load(musictrack) bgsound.stream = music bgsound.play(0) diff --git a/levels/ui/ceres.gd b/levels/ui/ceres.gd index 02c672b..ca97cc5 100644 --- a/levels/ui/ceres.gd +++ b/levels/ui/ceres.gd @@ -50,3 +50,9 @@ func _on_l_20_pressed(): Global.dplace = [1, 11, 19] Global.live = 1 get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn") + + +func _on_lilytest_pressed() -> void: + Global.dplace = [0, 0, 0] + Global.live = 1 + get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn") diff --git a/levels/ui/ceres.tscn b/levels/ui/ceres.tscn index 231466e..8b7f227 100644 --- a/levels/ui/ceres.tscn +++ b/levels/ui/ceres.tscn @@ -61,7 +61,7 @@ text = "CERES_L20_DESC" layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") -text = "BUTTON_PLACEHOLDER" +text = "MENU_MAP" [node name="Dialogtest" type="Button" parent="VBoxContainer"] layout_mode = 2 @@ -94,4 +94,5 @@ theme_override_styles/focus = SubResource("StyleBoxFlat_r2qrn") text = "BUTTON_RETURN" [connection signal="pressed" from="VBoxContainer/L20" to="." method="_on_l_20_pressed"] +[connection signal="pressed" from="VBoxContainer/Lilytest" to="." method="_on_lilytest_pressed"] [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/ui/credits.tscn b/levels/ui/credits.tscn index d46169c..8bcb328 100644 --- a/levels/ui/credits.tscn +++ b/levels/ui/credits.tscn @@ -92,7 +92,7 @@ Provided as a replacement for a HP 14 laptop that died while running Genshin Imp Steam Deck Arch Linux Rolling Used as development device since 0.0.0-dev release -Provided by Evelyn Freeman +Provided by Evelyn Freeman and killed by Valve Corporation HP Pavilion x360 Debian 12 diff --git a/levels/ui/cscene.gd b/levels/ui/cscene.gd index b8cd5a8..3baf2eb 100644 --- a/levels/ui/cscene.gd +++ b/levels/ui/cscene.gd @@ -67,8 +67,9 @@ func _on_disclaimer_pressed(): func _on_testrooms_pressed(): - #get_tree().change_scene_to_file("res://levels/ui/testrooms.tscn") - pass + #Global.debug = false + Global.ccutscene = 6 + get_tree().change_scene_to_file("res://levels/ui/Cutscenes.tscn") func _on_ceres_pressed(): diff --git a/levels/ui/cscene.tscn b/levels/ui/cscene.tscn index aa233e2..ea1d89e 100644 --- a/levels/ui/cscene.tscn +++ b/levels/ui/cscene.tscn @@ -61,7 +61,7 @@ text = "CUTSCENE_0_NAME" layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs") -text = "BUTTON_PLACEHOLDER" +text = "CUTSCENE_1_NAME" [node name="Ceres" type="Button" parent="VBoxContainer"] layout_mode = 2 diff --git a/levels/ui/gameplay.gd b/levels/ui/gameplay.gd index 0449b4e..91087e5 100644 --- a/levels/ui/gameplay.gd +++ b/levels/ui/gameplay.gd @@ -139,6 +139,7 @@ func _pausemenu(): pmenu = load("res://levels/ui/pause.tscn").instantiate() Global.live = 1 func _exit(): + Global.cdialog = [] Global.exitgame = false ishud = false Global.bossready = false diff --git a/levels/ui/pause.tscn b/levels/ui/pause.tscn index 04b7590..c3bdd7f 100644 --- a/levels/ui/pause.tscn +++ b/levels/ui/pause.tscn @@ -87,29 +87,28 @@ visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Character" +text = "MENU_CHARACTER" [node name="Team" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Team" +text = "MENU_TEAM" [node name="Warp" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Warp -" +text = "MENU_MAP" [node name="Settings" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer"] visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Settings" +text = "MENU_SETTINGS" [node name="VBoxContainer2" type="VBoxContainer" parent="CanvasLayer/HBoxContainer2"] layout_mode = 2 @@ -119,26 +118,26 @@ visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Journal" +text = "MENU_BOUKEN" [node name="Challenges" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Challenges" +text = "MENU_CHALLENGES" [node name="Backpack" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] visible = false layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Backpack" +text = "MENU_BACKPACK" [node name="Exit" type="Button" parent="CanvasLayer/HBoxContainer2/VBoxContainer2"] layout_mode = 2 theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_yb7nc") -text = "Exit" +text = "MENU_EXIT" [connection signal="pressed" from="CanvasLayer/HBoxContainer2/VBoxContainer2/Exit" to="." method="_on_exit_pressed"] diff --git a/sprites/common/player/player.gd b/sprites/common/player/player.gd index 232dc5b..2906c57 100644 --- a/sprites/common/player/player.gd +++ b/sprites/common/player/player.gd @@ -27,40 +27,41 @@ func _physics_process(delta): # Add the gravity. #var velocity = Vector2.ZERO #if Global.live == 1 || (Global.xm == 0 && Global.ym == 0): - velocity = (Vector2.RIGHT.rotated(rotation) * speed * Global.xm * delta)-Vector2.UP.rotated(rotation) * speed * Global.ym * delta - #origmpos = get_viewport().get_mouse_position() - #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: - # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - position += velocity - Global.playerx = position.x - Global.playery = position.y - if Global.ym > 0.3: - angle = 2 - elif Global.ym < -0.3: - angle = 0 - elif Global.xm > 0.3: - angle = 1 - elif Global.xm < -0.3: - angle = 3 - if velocity.y != 0 || velocity.x != 0: - if angle == 0: - anim.play("nwalk") - elif angle == 1: - anim.play("ewalk") - elif angle == 3: - anim.play("wwalk") + if speed != null: + velocity = (Vector2.RIGHT.rotated(rotation) * speed * Global.xm * delta)-Vector2.UP.rotated(rotation) * speed * Global.ym * delta + #origmpos = get_viewport().get_mouse_position() + #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: + # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + position += velocity + Global.playerx = position.x + Global.playery = position.y + if Global.ym > 0.3: + angle = 2 + elif Global.ym < -0.3: + angle = 0 + elif Global.xm > 0.3: + angle = 1 + elif Global.xm < -0.3: + angle = 3 + if velocity.y != 0 || velocity.x != 0: + if angle == 0: + anim.play("nwalk") + elif angle == 1: + anim.play("ewalk") + elif angle == 3: + anim.play("wwalk") + else: + anim.play("swalk") else: - anim.play("swalk") - else: - if angle == 0: - anim.play("nidle") - elif angle == 1: - anim.play("eidle") - elif angle == 3: - anim.play("widle") - else: - anim.play("sidle") - move_and_slide() + if angle == 0: + anim.play("nidle") + elif angle == 1: + anim.play("eidle") + elif angle == 3: + anim.play("widle") + else: + anim.play("sidle") + move_and_slide() func _input(event): if Global.live == 1: diff --git a/text.csv b/text.csv index 3ea7082..13a496e 100644 --- a/text.csv +++ b/text.csv @@ -107,10 +107,15 @@ MENU_BOUKEN;Adventure Journal;Diario de Aventura;冒険日記 MENU_CHALLENGES;Challenges;Desafíos;チャレンジリスト MENU_BACKPACK;Backpack;Mochila;バックパック MENU_EXIT;Return to Title;Regresar a Título;タイトルに戻る -CUTSCENE_0_NAME;Prologue;Prólogo;プロローグ +CUTSCENE_0_NAME;Prologue;Prólogo;面白くない記念日 +CUTSCENE_1_NAME;Unfunaversary;Funaversario;プロローグ CUTSCENE_0_0;most underrated children will be the best magicians\nFalcighol Arch, Kaizo Magic School founder;Los niños más subestimados serán los mejores magos\nFalcighol Arch, fundador de la Escuela de Magia Kaizo;最も過小評価されている子供たちが最高のマジシャンになるだろう\nファルシゴール・アーチ、カイゾー・マジック・スクール創設者 CUTSCENE_0_1;Hello, my name is Midori Asgardius, I am a 15 year old elf girl;Hola, mi nombre es Midori Asgardius,\nSoy una niña elfo de 15 años;こんにちは、私の名前はミドリ・アスガルディウスです。\n15歳のエルフの女の子です CUTSCENE_0_2;They say I run around here and there as if fear didn't exist;Dicen que corro de aquí para allá como si el miedo no existiera;まるで恐怖が存在しないかのように、私はあちこち走り回っていると彼らは言う CUTSCENE_0_3;But I'm actually a pretty shy and reserved girl;Pero en realidad soy una niña bastante tímida y reservada;でも実際は私はかなり内気で控えめな女の子です CUTSCENE_0_4;I love reading, when I concentrate\nno one will bother me;Me encanta leer, cuando me\nconcentro nadie me molestará;私は読書が大好きです。集中すれば誰にも邪魔されません CUTSCENE_0_5;A very funny anecdote was when I set fire to\nmy adoptive mother's, trophy room;Una anécdota muy divertida fue cuando incendié la\nsala de trofeos de mi madre adoptiva;とても面白い逸話は、\n私が養母のトロフィールームに火をつけた時のことです +CUTSCENE_1_0;The punishment that day was very painful\nI was crying for the rest of the day;El castigo de ese dia fue muy doloroso\nEstuve llorando el resto del dia;その日の罰はとても痛かった\n私は一日中泣いていた +CUTSCENE_1_1;According to my father, my adoptive mother was crying as well;Segun mi padre, mi madre adoptiva también estuvo llorando;父によると、養母も泣いていたそうです +CUTSCENE_1_2;Tonight the asteroid in the sky looks beautiful;Esta noche el asteroide en el cielo se ve hermoso;今夜、空の小惑星は美しく見える +CUTSCENE_1_3;Today is my first day of school;Hoy es mi primer dia de clase;今日は学校の初日です