diff --git a/Resources/Locale/locale.csv b/Resources/Locale/locale.csv index 6bd210e..0eadf8a 100644 --- a/Resources/Locale/locale.csv +++ b/Resources/Locale/locale.csv @@ -417,6 +417,7 @@ ENEMY_BLOOPER,,Blooper,Bloups,Blooper,БлУпep,Blooper,,ＢＬＯＯＰＥＲ, ENEMY_HAMMERBRO,,Hammer Bro,Frère Marteau,Brat Młot,Бpateц-moлotok,Martillo Bro,,ＨＡＭＭＥＲ ＢＲＯ,Pareng Martilyo,Hammer-Bruder,Çekİç Kardeş,Palu Saudara,Irmão Martelo,ハンマーブロス ENEMY_THWOMP,,Thwomp,Thwomp,Thwomp,Бamc,,,ＴＨＷＯＭＰ,Thwomp,Thwomp,,Thwomp,Thwomp,ドッスン ENEMY_BOWSER,,Bowser,Bowser,Bowser,БoУзep,,,ＢＯＷＳＥＲ,Haring Kupa,Bowser,,Bowser,Bowser,クッパ +ENEMY_BOWSERBRO,,Bowser Brother,Bowser Brother,Bowser Brother,БoУзep Брат,,,ＢＯＷＳＥＲ ＢＲＯ,Haring Kupa Brother,Bowser Brother,,Bowser Brother,Bowser Brother,クッパ兄さん ENEMY_POKEY,,Pokey,Pokey,Pokey,Пokи,,,ＰＯＫＥＹ,Kaktus,Kaktus,,Pokey,Pokey,サンボ ENEMY_LAKITU,,Lakitu,Lakitu,Lakitu,ЛakиtУ,,,ＬＡＫＩＴＵ,Lakitu,Lakitu,Lakİtu,Lakitu,Lakitu,ジュゲム ENEMY_BULLETBILL,,Bullet Bill,Bill Balle,Pociskowy Bill,ПУля Билл,,,ＢＵＬＬＥＴ ＢＩＬＬ,Bala Bill,Kugelwilli,Mermi Bill,Peluru Bill,Bill Bala,キラー diff --git a/Resources/Locale/locale.de.translation b/Resources/Locale/locale.de.translation index 18b458c..bab890c 100644 Binary files a/Resources/Locale/locale.de.translation and b/Resources/Locale/locale.de.translation differ diff --git a/Resources/Locale/locale.description.translation b/Resources/Locale/locale.description.translation index 6a48050..78dba5e 100644 Binary files a/Resources/Locale/locale.description.translation and b/Resources/Locale/locale.description.translation differ diff --git a/Resources/Locale/locale.en.translation b/Resources/Locale/locale.en.translation index 552ca31..eeea1e2 100644 Binary files a/Resources/Locale/locale.en.translation and b/Resources/Locale/locale.en.translation differ diff --git a/Resources/Locale/locale.es.translation b/Resources/Locale/locale.es.translation index a1a1411..8cc2962 100644 Binary files a/Resources/Locale/locale.es.translation and b/Resources/Locale/locale.es.translation differ diff --git a/Resources/Locale/locale.fil.translation b/Resources/Locale/locale.fil.translation index 17e0964..b6a1832 100644 Binary files a/Resources/Locale/locale.fil.translation and b/Resources/Locale/locale.fil.translation differ diff --git a/Resources/Locale/locale.fr.translation b/Resources/Locale/locale.fr.translation index 8632f1e..ea98e32 100644 Binary files a/Resources/Locale/locale.fr.translation and b/Resources/Locale/locale.fr.translation differ diff --git a/Resources/Locale/locale.ga.translation b/Resources/Locale/locale.ga.translation index f647d63..c98fdf2 100644 Binary files a/Resources/Locale/locale.ga.translation and b/Resources/Locale/locale.ga.translation differ diff --git a/Resources/Locale/locale.id.translation b/Resources/Locale/locale.id.translation index 1d2d724..43f21b6 100644 Binary files a/Resources/Locale/locale.id.translation and b/Resources/Locale/locale.id.translation differ diff --git a/Resources/Locale/locale.it.translation b/Resources/Locale/locale.it.translation index b437d17..c033a0d 100644 Binary files a/Resources/Locale/locale.it.translation and b/Resources/Locale/locale.it.translation differ diff --git a/Resources/Locale/locale.jp.translation b/Resources/Locale/locale.jp.translation index c88ed96..fc03814 100644 Binary files a/Resources/Locale/locale.jp.translation and b/Resources/Locale/locale.jp.translation differ diff --git a/Resources/Locale/locale.pl.translation b/Resources/Locale/locale.pl.translation index 2867390..33def13 100644 Binary files a/Resources/Locale/locale.pl.translation and b/Resources/Locale/locale.pl.translation differ diff --git a/Resources/Locale/locale.pt.translation b/Resources/Locale/locale.pt.translation index dea3f61..76d5e6e 100644 Binary files a/Resources/Locale/locale.pt.translation and b/Resources/Locale/locale.pt.translation differ diff --git a/Resources/Locale/locale.ru.translation b/Resources/Locale/locale.ru.translation index 7218dca..7cc9a7a 100644 Binary files a/Resources/Locale/locale.ru.translation and b/Resources/Locale/locale.ru.translation differ diff --git a/Resources/Locale/locale.tr.translation b/Resources/Locale/locale.tr.translation index 623b8b3..a4aa5ae 100644 Binary files a/Resources/Locale/locale.tr.translation and b/Resources/Locale/locale.tr.translation differ diff --git a/Scenes/Levels/LevelEditor.tscn b/Scenes/Levels/LevelEditor.tscn index 469de53..d502754 100644 --- a/Scenes/Levels/LevelEditor.tscn +++ b/Scenes/Levels/LevelEditor.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=297 format=3 uid="uid://gbcmqonky63j"] +[gd_scene load_steps=299 format=3 uid="uid://gbcmqonky63j"] [ext_resource type="Script" uid="uid://c2lnc7vnq3xth" path="res://Scripts/Classes/Editor/LevelEditor.gd" id="1_0qbyu"] [ext_resource type="PackedScene" uid="uid://bksxgpygrdjl7" path="res://Scenes/Prefabs/LevelBG.tscn" id="1_ujeu4"] @@ -86,7 +86,9 @@ [ext_resource type="PackedScene" uid="uid://coasuq2vsmlce" path="res://Scenes/Prefabs/Entities/Enemies/BooBuddies.tscn" id="57_miwak"] [ext_resource type="PackedScene" uid="uid://bxsay5e6dhcqb" path="res://Scenes/Prefabs/Entities/Enemies/DryBones.tscn" id="58_j12pl"] [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/DryBones.json" id="58_u38n8"] +[ext_resource type="JSON" path="res://Assets/Sprites/Enemies/BowsersBro.json" id="59_kxvns"] [ext_resource type="PackedScene" uid="uid://iq86u4w60yee" path="res://Scenes/Prefabs/Entities/Objects/Firebar.tscn" id="60_01msc"] +[ext_resource type="PackedScene" uid="uid://bjysym6bhxljv" path="res://Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn" id="60_ed30e"] [ext_resource type="JSON" path="res://Assets/Sprites/Enemies/MontyMole.json" id="60_vt1yk"] [ext_resource type="JSON" path="res://Assets/Sprites/Items/PoisonMushroom.json" id="61_8hw1j"] [ext_resource type="PackedScene" uid="uid://bym2j03wxhk3t" path="res://Scenes/Prefabs/Entities/Enemies/MontyMole.tscn" id="61_looxg"] @@ -3009,18 +3011,56 @@ metadata/can_note_store = false metadata/can_lakitu_throw = false metadata/can_pipe_gen = false -[node name="Bowser" parent="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer" groups=["Selectors"] instance=ExtResource("8_wkmjk")] +[node name="Bowsers" type="Control" parent="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer"] +custom_minimum_size = Vector2(16, 16) layout_mode = 2 +mouse_force_pass_scroll_events = false +script = ExtResource("20_jc7xg") + +[node name="Bowser" parent="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Bowsers" groups=["Selectors"] instance=ExtResource("8_wkmjk")] +layout_mode = 1 +anchors_preset = -1 +offset_right = 16.0 +offset_bottom = 16.0 tile_name = "ENEMY_BOWSER" type = 1 icon_texture = ExtResource("40_62ull") icon_region_override = Rect2(8, 16, 16, 16) entity_scene = ExtResource("41_3yhuv") +metadata/_edit_group_ = true metadata/can_be_stored = false metadata/can_note_store = false metadata/can_lakitu_throw = false metadata/can_pipe_gen = false +[node name="BowserBro" parent="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Bowsers" groups=["Selectors"] instance=ExtResource("8_wkmjk")] +layout_mode = 1 +anchors_preset = -1 +offset_right = 16.0 +offset_bottom = 16.0 +tile_name = "ENEMY_BOWSERBRO" +type = 1 +icon_texture = ExtResource("59_kxvns") +icon_region_override = Rect2(8, 16, 16, 16) +entity_scene = ExtResource("60_ed30e") +metadata/_edit_group_ = true +metadata/can_be_stored = false +metadata/can_note_store = false +metadata/can_lakitu_throw = false +metadata/can_pipe_gen = false + +[node name="TextureRect" type="TextureRect" parent="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Bowsers"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +texture = ExtResource("22_3cjpb") +expand_mode = 1 +stretch_mode = 3 + [node name="Pokey" parent="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer" groups=["Selectors"] instance=ExtResource("8_wkmjk")] layout_mode = 2 tile_name = "ENEMY_POKEY" @@ -5307,7 +5347,8 @@ metadata/_custom_type_script = "uid://dt2p68xl462v2" [connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/CheepCheeps/RedCheepCheep" to="." method="on_tile_selected"] [connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Blooper" to="." method="on_tile_selected"] [connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/HammerBro" to="." method="on_tile_selected"] -[connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Bowser" to="." method="on_tile_selected"] +[connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Bowsers/Bowser" to="." method="on_tile_selected"] +[connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Bowsers/BowserBro" to="." method="on_tile_selected"] [connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Pokey" to="." method="on_tile_selected"] [connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/BulletBill" to="." method="on_tile_selected"] [connection signal="tile_selected" from="TileMenu/MarginContainer/VBoxContainer/PanelContainer/TILES/ScrollContainer/VBoxContainer/Enemies/MarginContainer/GridContainer/Boos/Boo" to="." method="on_tile_selected"] diff --git a/Scenes/Levels/SMB1/World-1/-1-1.tscn b/Scenes/Levels/SMB1/World-1/-1-1.tscn index 2070993..af12349 100644 --- a/Scenes/Levels/SMB1/World-1/-1-1.tscn +++ b/Scenes/Levels/SMB1/World-1/-1-1.tscn @@ -15,7 +15,7 @@ [ext_resource type="PackedScene" uid="uid://bney0cc8cfm5s" path="res://Scenes/Prefabs/LevelObjects/EndFinalCastle.tscn" id="16_8q1jv"] [ext_resource type="PackedScene" uid="uid://h7ys3yw5jvx3" path="res://Scenes/Prefabs/LevelObjects/Checkpoint.tscn" id="17_bdyl0"] [ext_resource type="Texture2D" uid="uid://boivfkpqvnx45" path="res://Assets/Sprites/Players/Peach.png" id="17_itite"] -[ext_resource type="PackedScene" uid="uid://duptcik2j0b04" path="res://Scenes/Prefabs/Entities/Enemies/Bowser.tscn" id="18_q6ole"] +[ext_resource type="PackedScene" uid="uid://bjysym6bhxljv" path="res://Scenes/Prefabs/Entities/Enemies/BowsersBro.tscn" id="18_4i10n"] [ext_resource type="PackedScene" uid="uid://r6dlmokkdyar" path="res://Scenes/Prefabs/Entities/Enemies/GreenKoopaTroopa.tscn" id="19_j3p10"] [ext_resource type="PackedScene" uid="uid://dnx48rakxib6u" path="res://Scenes/Prefabs/Entities/Enemies/Goomba.tscn" id="20_4i10n"] [ext_resource type="PackedScene" uid="uid://f48a0jmx334d" path="res://Scenes/Prefabs/Entities/Objects/SmallElevatorPlatform.tscn" id="21_4i10n"] @@ -94,8 +94,9 @@ texture = ExtResource("17_itite") region_enabled = true region_rect = Rect2(16, 0, 16, 32) -[node name="Bowser" parent="." instance=ExtResource("18_q6ole")] +[node name="BowsersBro" parent="." instance=ExtResource("18_4i10n")] position = Vector2(584, 0) +can_fire = false [node name="GreenKoopaTroopa" parent="." instance=ExtResource("19_j3p10")] position = Vector2(760, 0) @@ -124,25 +125,25 @@ position = Vector2(1592, -16) position = Vector2(2008, -96) [connection signal="collected" from="Tiles/Coin" to="Tiles/Coin/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153622" to="Tiles/@Node2D@153622/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153623" to="Tiles/@Node2D@153623/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153624" to="Tiles/@Node2D@153624/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153625" to="Tiles/@Node2D@153625/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153626" to="Tiles/@Node2D@153626/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153627" to="Tiles/@Node2D@153627/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153628" to="Tiles/@Node2D@153628/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153629" to="Tiles/@Node2D@153629/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153630" to="Tiles/@Node2D@153630/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153631" to="Tiles/@Node2D@153631/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153632" to="Tiles/@Node2D@153632/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153633" to="Tiles/@Node2D@153633/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153634" to="Tiles/@Node2D@153634/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153635" to="Tiles/@Node2D@153635/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153636" to="Tiles/@Node2D@153636/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153637" to="Tiles/@Node2D@153637/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153638" to="Tiles/@Node2D@153638/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153639" to="Tiles/@Node2D@153639/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153640" to="Tiles/@Node2D@153640/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153641" to="Tiles/@Node2D@153641/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153642" to="Tiles/@Node2D@153642/LevelPersistance" method="set_as_active"] -[connection signal="collected" from="Tiles/@Node2D@153643" to="Tiles/@Node2D@153643/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190955" to="Tiles/@Node2D@190955/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190956" to="Tiles/@Node2D@190956/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190957" to="Tiles/@Node2D@190957/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190958" to="Tiles/@Node2D@190958/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190959" to="Tiles/@Node2D@190959/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190960" to="Tiles/@Node2D@190960/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190961" to="Tiles/@Node2D@190961/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190962" to="Tiles/@Node2D@190962/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190963" to="Tiles/@Node2D@190963/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190964" to="Tiles/@Node2D@190964/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190965" to="Tiles/@Node2D@190965/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190966" to="Tiles/@Node2D@190966/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190967" to="Tiles/@Node2D@190967/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190968" to="Tiles/@Node2D@190968/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190969" to="Tiles/@Node2D@190969/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190970" to="Tiles/@Node2D@190970/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190971" to="Tiles/@Node2D@190971/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190972" to="Tiles/@Node2D@190972/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190973" to="Tiles/@Node2D@190973/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190974" to="Tiles/@Node2D@190974/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190975" to="Tiles/@Node2D@190975/LevelPersistance" method="set_as_active"] +[connection signal="collected" from="Tiles/@Node2D@190976" to="Tiles/@Node2D@190976/LevelPersistance" method="set_as_active"] diff --git a/Scripts/Classes/CoinHeaven.gd b/Scripts/Classes/CoinHeaven.gd index 050a0b3..22dee6f 100644 --- a/Scripts/Classes/CoinHeaven.gd +++ b/Scripts/Classes/CoinHeaven.gd @@ -13,6 +13,3 @@ func warp_back(player: Player) -> void: await get_tree().create_timer(1, false).timeout PipeArea.exiting_pipe_id = -1 Global.transition_to_scene(Level.vine_return_level) - -func get_room_type() -> Global.Room: - return Global.Room.COIN_HEAVEN diff --git a/Scripts/Classes/LevelClass.gd b/Scripts/Classes/LevelClass.gd index a7abdd5..06c47f3 100644 --- a/Scripts/Classes/LevelClass.gd +++ b/Scripts/Classes/LevelClass.gd @@ -126,7 +126,10 @@ func update_theme() -> void: if Global.current_campaign == "SMBANN": theme_time = "Night" ResourceSetterNew.cache.clear() - Global.current_room = get_room_type() + if self is CoinHeaven: + Global.current_room = Global.Room.COIN_HEAVEN + else: + Global.current_room = get_room_type() Global.current_campaign = campaign Global.level_theme = theme Global.theme_time = theme_time