Patch bugs

Killarexe · Killarexe · commit 3ad48d4c8295 · 2024-11-30T21:43:05.000+01:00
diff --git a/assets/style/default_theme.tres b/assets/style/default_theme.tres
diff --git a/data/tiles/acceleration_tile.tres b/data/tiles/acceleration_tile.tres
@@ -0,0 +1,13 @@
+[gd_resource type="Resource" script_class="EditorTile" load_steps=2 format=3 uid="uid://cuas8bedcqnm1"]
+
+[ext_resource type="Script" path="res://scripts/uis/level_editor/tiles/EditorTile.gd" id="1_yat05"]
+
+[resource]
+script = ExtResource("1_yat05")
+tile_dictionary = {
+Vector2i(0, 0): Vector2i(0, 9)
+}
+icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 19
diff --git a/data/tiles/blue_spike.tres b/data/tiles/blue_spike.tres
@@ -8,3 +8,6 @@ tile_dictionary = {
 Vector2i(0, 0): Vector2i(8, 9)
 }
 icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 6
diff --git a/data/tiles/blue_square.tres b/data/tiles/blue_square.tres
@@ -8,3 +8,6 @@ tile_dictionary = {
 Vector2i(0, 0): Vector2i(1, 6)
 }
 icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 7
diff --git a/data/tiles/bush.tres b/data/tiles/bush.tres
@@ -13,4 +13,6 @@ Vector2i(1, -1): Vector2i(7, 4),
 Vector2i(1, 0): Vector2i(7, 5)
 }
 icon_region = Rect2i(80, 64, 48, 32)
+center_tile = Vector2i(-1, -1)
 terrain = -1
+scene_tile_id = -1
diff --git a/data/tiles/checkpoint.tres b/data/tiles/checkpoint.tres
@@ -8,3 +8,6 @@ tile_dictionary = {
 Vector2i(0, 0): Vector2i(4, 3)
 }
 icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 1
diff --git a/data/tiles/door.tres b/data/tiles/door.tres
@@ -9,3 +9,6 @@ Vector2i(0, 0): Vector2i(2, 6),
 Vector2i(0, 1): Vector2i(2, 7)
 }
 icon_region = Rect2i(32, 96, 16, 32)
+center_tile = Vector2i(0, -1)
+terrain = -1
+scene_tile_id = 2
diff --git a/data/tiles/flowered_bush.tres b/data/tiles/flowered_bush.tres
@@ -13,3 +13,6 @@ Vector2i(1, -1): Vector2i(7, 6),
 Vector2i(1, 0): Vector2i(7, 7)
 }
 icon_region = Rect2i(80, 96, 48, 32)
+center_tile = Vector2i(-1, -1)
+terrain = -1
+scene_tile_id = -1
diff --git a/data/tiles/grass.tres b/data/tiles/grass.tres
@@ -8,4 +8,6 @@ tile_dictionary = {
 Vector2i(0, 0): Vector2i(1, 0)
 }
 icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
 terrain = 0
+scene_tile_id = -1
diff --git a/data/tiles/jumping_tile.tres b/data/tiles/jumping_tile.tres
@@ -0,0 +1,13 @@
+[gd_resource type="Resource" script_class="EditorTile" load_steps=2 format=3 uid="uid://dombi6rc6tvs6"]
+
+[ext_resource type="Script" path="res://scripts/uis/level_editor/tiles/EditorTile.gd" id="1_3acww"]
+
+[resource]
+script = ExtResource("1_3acww")
+tile_dictionary = {
+Vector2i(0, 0): Vector2i(0, 8)
+}
+icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 18
diff --git a/data/tiles/off.tres b/data/tiles/off.tres
@@ -7,4 +7,7 @@ script = ExtResource("1_rr3xj")
 tile_dictionary = {
 Vector2i(0, 0): Vector2i(0, 6)
 }
-id = "off"
+icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 5
diff --git a/data/tiles/red_spike.tres b/data/tiles/red_spike.tres
@@ -7,4 +7,7 @@ script = ExtResource("1_4fl8m")
 tile_dictionary = {
 Vector2i(0, 0): Vector2i(2, 9)
 }
-id = "blue_spike"
+icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 3
diff --git a/data/tiles/red_square.tres b/data/tiles/red_square.tres
@@ -7,4 +7,7 @@ script = ExtResource("1_aan7s")
 tile_dictionary = {
 Vector2i(0, 0): Vector2i(1, 7)
 }
-id = "blue_square"
+icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 4
diff --git a/data/tiles/spike.tres b/data/tiles/spike.tres
@@ -7,4 +7,7 @@ script = ExtResource("1_p7elv")
 tile_dictionary = {
 Vector2i(0, 0): Vector2i(0, 4)
 }
-id = "spike"
+icon_region = Rect2i(-1, -1, -1, -1)
+center_tile = Vector2i(0, 0)
+terrain = -1
+scene_tile_id = 8
diff --git a/scenes/uis/LevelEditor.tscn b/scenes/uis/LevelEditor.tscn
@@ -248,9 +248,10 @@ _data = {
 "show": SubResource("Animation_uquq7")
 }
 
-[node name="LevelEditor" type="Node" node_paths=PackedStringArray("level_map", "level_gui", "level_settings", "brush", "tiles_button", "player_sprite")]
+[node name="LevelEditor" type="Node" node_paths=PackedStringArray("level_map", "level_editor_camera", "level_gui", "level_settings", "brush", "tiles_button", "player_sprite")]
 script = ExtResource("1_6j8q1")
 level_map = NodePath("DefaultLevel")
+level_editor_camera = NodePath("Camera2D/LevelEditorCamera")
 level_gui = NodePath("GUI")
 level_settings = NodePath("GUI/LevelSettingsMenu")
 brush = NodePath("Camera2D/BrushComponent")
@@ -407,7 +408,7 @@ control = NodePath("../ColorRect")
 brush = NodePath("../../../Camera2D/BrushComponent")
 
 [node name="FileDialog" type="FileDialog" parent="GUI/Menu"]
-title = "Load level"
+title = "Open a File"
 size = Vector2i(1280, 720)
 visible = true
 borderless = true
diff --git a/scripts/level/tiles/JumpingTileComponent.gd b/scripts/level/tiles/JumpingTileComponent.gd
@@ -11,8 +11,7 @@ func _ready() -> void:
 func on_body_entered(body: Node2D) -> void:
 	if body is PlayerComponent && !is_player_entered:
 		is_player_entered = true
-		var original_jump_force: float = body.controller.JUMP_FORCE
 		body.controller.JUMP_FORCE *= 1.25
 		await body.controller.on_jump
-		body.controller.JUMP_FORCE = original_jump_force
+		body.controller.JUMP_FORCE /= 1.25
 		is_player_entered = false
diff --git a/scripts/uis/level_editor/BrushComponent.gd b/scripts/uis/level_editor/BrushComponent.gd
@@ -53,3 +53,4 @@ func _process(delta: float) -> void:
 func set_selected_tile(new_tile: EditorTile) -> void:
 	selected_tile = new_tile
 	tile_sprite.texture = new_tile.get_icon(level)
+	tile_sprite.offset = new_tile.center_tile * 16
diff --git a/scripts/uis/level_editor/LevelEditor.gd b/scripts/uis/level_editor/LevelEditor.gd
@@ -2,6 +2,7 @@ extends Node
 class_name LevelEditor
 
 @export var level_map: LevelPlayer
+@export var level_editor_camera: LevelEditorCamera
 @export var level_gui: LevelEditorGUI
 @export var level_settings: LevelSettingsMenu
 @export var brush: BrushComponent
@@ -51,6 +52,7 @@ func on_play_button_pressed() -> void:
 	level_gui.camera.enabled = is_playing
 	level_gui.grid.visible = is_playing
 	player_sprite.visible = is_playing
+	level_editor_camera.can_move = is_playing
 	if is_playing:
 		level_map.set_mode(LevelPlayer.Mode.EDIT)
 	else:
@@ -77,9 +79,6 @@ func load_level(path: String) -> void:
 	if level_id.is_empty():
 		PopUpFrame.pop_translated("popup.failed_load_level.invaild_id")
 		return
-	if LevelManager.get_level(level_id) != null:
-		PopUpFrame.pop(TranslationServer.translate("popup.failed_load_level.sheared_id") % level_id, error_icon)
-		return
 	if LevelManager.get_level(level_id) == null:
 		var new_file: FileAccess = FileAccess.open(LevelManager.EXTERNAL_LEVELS_DIR + "/" + file_name, FileAccess.WRITE_READ)
 		var new_file_error: Error = FileAccess.get_open_error()
diff --git a/scripts/uis/level_editor/LevelEditorCamera.gd b/scripts/uis/level_editor/LevelEditorCamera.gd
@@ -20,6 +20,7 @@ var start_angle: float = 0.0
 
 var is_panning: bool = false
 var is_drag: bool = false
+var can_move: bool = true
 
 func _unhandled_input(event):
 	if !(Game.is_mobile || debug_mode):
@@ -90,7 +91,7 @@ func handle_mouse_pan(event: InputEventMouseMotion):
 		camera.position -= event.relative.rotated(camera.rotation) * pan_speed  / camera.zoom.x
 
 func _process(delta: float):
-	if !(Game.is_mobile || debug_mode):
+	if !(Game.is_mobile || debug_mode) && can_move:
 		is_panning = Input.is_action_pressed("middle_click")
 		if Input.is_action_pressed("left_click"):
 			bush.erase = false
diff --git a/scripts/uis/level_editor/tiles/EditorTile.gd b/scripts/uis/level_editor/tiles/EditorTile.gd
@@ -1,9 +1,13 @@
 extends ResourceElement
 class_name EditorTile
 
+@export_category("Static Tiles propeties")
 @export var tile_dictionary: Dictionary = {}
 @export var icon_region: Rect2i = Rect2i(-1, -1, -1, -1)
+@export var center_tile: Vector2i = Vector2i.ZERO
 @export var terrain: int = -1
+@export_category("Scene Tiles properties")
+@export var scene_tile_id: int = -1
 
 func new(tiles: Dictionary) -> void:
 	self.tile_dictionary = tiles
@@ -27,6 +31,9 @@ func place(level_map: LevelPlayer, tile_pos: Vector2i, place_background: bool =
 	var layer: TileMapLayer = level_map.ground
 	if place_background:
 		layer = level_map.background
+	if scene_tile_id >= 0:
+		layer.set_cell(tile_pos, 0, Vector2i.ZERO, scene_tile_id)
+		return
 	for position in tile_dictionary.keys():
 		layer.set_cell(position + tile_pos, 1, tile_dictionary.get(position))
 		if terrain >= 0:

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,6 @@ tile_dictionary = {`
`8`	`8`	`Vector2i(0, 0): Vector2i(8, 9)`
`9`	`9`	`}`
`10`	`10`	`icon_region = Rect2i(-1, -1, -1, -1)`
	`11`	`+center_tile = Vector2i(0, 0)`
	`12`	`+terrain = -1`
	`13`	`+scene_tile_id = 6`
Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,6 @@ tile_dictionary = {`
`8`	`8`	`Vector2i(0, 0): Vector2i(1, 6)`
`9`	`9`	`}`
`10`	`10`	`icon_region = Rect2i(-1, -1, -1, -1)`
	`11`	`+center_tile = Vector2i(0, 0)`
	`12`	`+terrain = -1`
	`13`	`+scene_tile_id = 7`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,6 @@ Vector2i(1, -1): Vector2i(7, 4),`
`13`	`13`	`Vector2i(1, 0): Vector2i(7, 5)`
`14`	`14`	`}`
`15`	`15`	`icon_region = Rect2i(80, 64, 48, 32)`
	`16`	`+center_tile = Vector2i(-1, -1)`
`16`	`17`	`terrain = -1`
	`18`	`+scene_tile_id = -1`
Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,6 @@ tile_dictionary = {`
`8`	`8`	`Vector2i(0, 0): Vector2i(4, 3)`
`9`	`9`	`}`
`10`	`10`	`icon_region = Rect2i(-1, -1, -1, -1)`
	`11`	`+center_tile = Vector2i(0, 0)`
	`12`	`+terrain = -1`
	`13`	`+scene_tile_id = 1`
Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,6 @@ Vector2i(0, 0): Vector2i(2, 6),`
`9`	`9`	`Vector2i(0, 1): Vector2i(2, 7)`
`10`	`10`	`}`
`11`	`11`	`icon_region = Rect2i(32, 96, 16, 32)`
	`12`	`+center_tile = Vector2i(0, -1)`
	`13`	`+terrain = -1`
	`14`	`+scene_tile_id = 2`
Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,6 @@ Vector2i(1, -1): Vector2i(7, 6),`
`13`	`13`	`Vector2i(1, 0): Vector2i(7, 7)`
`14`	`14`	`}`
`15`	`15`	`icon_region = Rect2i(80, 96, 48, 32)`
	`16`	`+center_tile = Vector2i(-1, -1)`
	`17`	`+terrain = -1`
	`18`	`+scene_tile_id = -1`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@ tile_dictionary = {`
`8`	`8`	`Vector2i(0, 0): Vector2i(1, 0)`
`9`	`9`	`}`
`10`	`10`	`icon_region = Rect2i(-1, -1, -1, -1)`
	`11`	`+center_tile = Vector2i(0, 0)`
`11`	`12`	`terrain = 0`
	`13`	`+scene_tile_id = -1`