diff --git a/backgounds/Midori Asgardius birth waterfall.jpg b/backgounds/Midori Asgardius birth waterfall.jpg new file mode 100644 index 0000000..3860e90 Binary files /dev/null and b/backgounds/Midori Asgardius birth waterfall.jpg differ diff --git a/backgounds/Midori Asgardius birth waterfall.jpg.import b/backgounds/Midori Asgardius birth waterfall.jpg.import new file mode 100644 index 0000000..edab01d --- /dev/null +++ b/backgounds/Midori Asgardius birth waterfall.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cyl5fve543dvc" +path="res://.godot/imported/Midori Asgardius birth waterfall.jpg-4dff916e2839257afcc4309926d7b477.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Midori Asgardius birth waterfall.jpg" +dest_files=["res://.godot/imported/Midori Asgardius birth waterfall.jpg-4dff916e2839257afcc4309926d7b477.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 Asgardius cheststand.jpg b/backgounds/Midori Asgardius cheststand.jpg new file mode 100644 index 0000000..6919b79 Binary files /dev/null and b/backgounds/Midori Asgardius cheststand.jpg differ diff --git a/backgounds/Midori Asgardius cheststand.jpg.import b/backgounds/Midori Asgardius cheststand.jpg.import new file mode 100644 index 0000000..64a8d86 --- /dev/null +++ b/backgounds/Midori Asgardius cheststand.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d1rcw7akvyooo" +path="res://.godot/imported/Midori Asgardius cheststand.jpg-445eb9af0020ad93e4a4534592f2cdd2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Midori Asgardius cheststand.jpg" +dest_files=["res://.godot/imported/Midori Asgardius cheststand.jpg-445eb9af0020ad93e4a4534592f2cdd2.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/levels/Ceres/L20.gd b/levels/Ceres/L20.gd index 7b0779e..cc15f30 100644 --- a/levels/Ceres/L20.gd +++ b/levels/Ceres/L20.gd @@ -17,13 +17,6 @@ func _process(delta): pass func _physics_process(delta): - if player.velocity.x >= 0 && player.velocity.y >= 0: - if player.position.y < boss.position.y && player.get_index() > boss.get_index(): - move_child(player, boss.get_index() - 1) - print("move up") - elif player.position.y > boss.position.y && player.get_index() < boss.get_index(): - move_child(player, boss.get_index() + 1) - print("move down") if Global.debug: if Global.dstats[Global.dparty[0][0]][0] <= 0 && Global.live == 1: _winner() diff --git a/levels/Cutscenes/opening/midorireading.tscn b/levels/Cutscenes/opening/midorireading.tscn index 44a95b3..88ea113 100644 --- a/levels/Cutscenes/opening/midorireading.tscn +++ b/levels/Cutscenes/opening/midorireading.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://bi8dsxjedvmxw"] +[gd_scene load_steps=3 format=3 uid="uid://bi8dsxjedvmxw"] +[ext_resource type="Texture2D" uid="uid://d1rcw7akvyooo" path="res://backgounds/Midori Asgardius cheststand.jpg" id="1_pt70s"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="2_0wcve"] [node name="Midorireading" type="Node2D"] @@ -7,12 +8,14 @@ [node name="TextureRect" type="TextureRect" parent="."] offset_right = 1278.0 offset_bottom = 600.0 +texture = ExtResource("1_pt70s") [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_0_4" horizontal_alignment = 1 diff --git a/levels/Cutscenes/opening/midoriwaterfall.tscn b/levels/Cutscenes/opening/midoriwaterfall.tscn index 37505e2..783f8c1 100644 --- a/levels/Cutscenes/opening/midoriwaterfall.tscn +++ b/levels/Cutscenes/opening/midoriwaterfall.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://dbho2m55yi3ty"] +[gd_scene load_steps=3 format=3 uid="uid://dbho2m55yi3ty"] +[ext_resource type="Texture2D" uid="uid://cyl5fve543dvc" path="res://backgounds/Midori Asgardius birth waterfall.jpg" id="1_n3nwn"] [ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="2_r0grr"] [node name="Midoriwaterfall" type="Node2D"] @@ -7,10 +8,11 @@ [node name="TextureRect" type="TextureRect" parent="."] offset_right = 1278.0 offset_bottom = 600.0 +texture = ExtResource("1_n3nwn") [node name="Text" type="Label" parent="."] offset_left = 52.0 -offset_top = 606.0 +offset_top = 659.0 offset_right = 1224.0 offset_bottom = 714.0 theme_override_font_sizes/font_size = 40 diff --git a/levels/Testrooms/bullethell.gd b/levels/Testrooms/bullethell.gd index e893e61..45a81ec 100644 --- a/levels/Testrooms/bullethell.gd +++ b/levels/Testrooms/bullethell.gd @@ -16,14 +16,8 @@ func _ready(): func _process(delta): pass -func _physics_process(delta): - if player.velocity.x >= 0 && player.velocity.y >= 0: - if player.position.y < boss.position.y && player.get_index() > boss.get_index(): - move_child(player, boss.get_index() - 1) - print("move up") - elif player.position.y > boss.position.y && player.get_index() < boss.get_index(): - move_child(player, boss.get_index() + 1) - print("move down") +#func _physics_process(delta): +# pass func _input(event): if Global.cdialog.size() != 0 && Global.live == 1: diff --git a/levels/Testrooms/lilytest.gd b/levels/Testrooms/lilytest.gd index b28b9a3..6ad098f 100644 --- a/levels/Testrooms/lilytest.gd +++ b/levels/Testrooms/lilytest.gd @@ -13,11 +13,5 @@ func _ready(): func _process(delta): pass -func _physics_process(delta): - if player.velocity.x >= 0 && player.velocity.y >= 0: - if player.position.y < boss.position.y && player.get_index() > boss.get_index(): - move_child(player, boss.get_index() - 1) - print("move up") - elif player.position.y > boss.position.y && player.get_index() < boss.get_index(): - move_child(player, boss.get_index() + 1) - print("move down") +#func _physics_process(delta): +# pass diff --git a/sprites/common/player/player.gd b/sprites/common/player/player.gd index 661f77e..232dc5b 100644 --- a/sprites/common/player/player.gd +++ b/sprites/common/player/player.gd @@ -26,8 +26,8 @@ func _ready(): func _physics_process(delta): # Add the gravity. #var velocity = Vector2.ZERO - if Global.live == 1: - velocity = (Vector2.RIGHT.rotated(rotation) * speed * Global.xm * delta)-Vector2.UP.rotated(rotation) * speed * Global.ym * delta + #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) @@ -119,11 +119,11 @@ func _charswitch(): print(Global.dparty[Global.dcpchar][0]) print(speed) else: - if csprite != null && speed!=Global.mstats[Global.party[Global.cpchar][0]][6]: + if csprite != null && speed!=Global.mstats[Global.party[csprite][0]][6]: print("Script Kiddie") speed = Global.party/0 else: - speed = Global.mstats[Global.party[Global.dcpchar][0]][6] + speed = Global.mstats[Global.party[Global.cpchar][0]][6] if Global.cpchar != csprite: csprite = Global.cpchar sprite.texture = load(Global.pchars[Global.party[Global.cpchar][0]][Global.party[Global.cpchar][1]]) diff --git a/text.csv b/text.csv index 6f08f28..3ea7082 100644 --- a/text.csv +++ b/text.csv @@ -112,5 +112,5 @@ CUTSCENE_0_0;most underrated children will be the best magicians\nFalcighol Arch 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, cueando me\nconcentro nadie me molestará;私は読書が大好きです。集中すれば誰にも邪魔されません +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私が養母のトロフィールームに火をつけた時のことです