forked from 2121578/gai-ca2
Added auto-waking toggle with auto-follow and zoom, and better different screen sizes support
Yan Wittmann
parent
d026c07804
commit
dc3ead30b4
Binary file not shown.
|
Before Width: | Height: | Size: 941 KiB After Width: | Height: | Size: 436 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=50 format=4 uid="uid://b88asko1ugyd2"]
|
||||
[gd_scene load_steps=46 format=4 uid="uid://b88asko1ugyd2"]
|
||||
|
||||
[ext_resource type="Script" path="res://scripts/global/GameManager.gd" id="1_eeg2d"]
|
||||
[ext_resource type="Script" path="res://scripts/tilemap/World.gd" id="1_k0rw8"]
|
||||
|
|
@ -46,72 +46,6 @@
|
|||
[ext_resource type="Script" path="res://scripts/player/tree/impl/game/camp/TaskPutInventoryContentInCamp.gd" id="39_8rirr"]
|
||||
[ext_resource type="Script" path="res://scripts/player/tree/impl/game/camp/TaskCampSleep.gd" id="39_nbuyx"]
|
||||
|
||||
[sub_resource type="Animation" id="Animation_utk5y"]
|
||||
resource_name = "Fade in"
|
||||
length = 3.0
|
||||
tracks/0/type = "value"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/path = NodePath("Camera2D/ColorRect:color")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = {
|
||||
"times": PackedFloat32Array(1, 3),
|
||||
"transitions": PackedFloat32Array(1, 1),
|
||||
"update": 0,
|
||||
"values": [Color(0, 0, 0, 1), Color(0, 0, 0, 0)]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id="Animation_wbxrc"]
|
||||
resource_name = "Fade out"
|
||||
length = 3.0
|
||||
tracks/0/type = "value"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = false
|
||||
tracks/0/path = NodePath("Camera2D/ColorRect:color")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = {
|
||||
"times": PackedFloat32Array(0, 2),
|
||||
"transitions": PackedFloat32Array(1, 1),
|
||||
"update": 0,
|
||||
"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)]
|
||||
}
|
||||
tracks/1/type = "value"
|
||||
tracks/1/imported = false
|
||||
tracks/1/enabled = true
|
||||
tracks/1/path = NodePath("Camera2D/Sprite2D:visible")
|
||||
tracks/1/interp = 1
|
||||
tracks/1/loop_wrap = true
|
||||
tracks/1/keys = {
|
||||
"times": PackedFloat32Array(0),
|
||||
"transitions": PackedFloat32Array(1),
|
||||
"update": 1,
|
||||
"values": [false]
|
||||
}
|
||||
|
||||
[sub_resource type="Animation" id="Animation_tc843"]
|
||||
length = 0.001
|
||||
tracks/0/type = "value"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/path = NodePath("Camera2D/ColorRect:color")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = {
|
||||
"times": PackedFloat32Array(0),
|
||||
"transitions": PackedFloat32Array(1),
|
||||
"update": 0,
|
||||
"values": [Color(0, 0, 0, 0)]
|
||||
}
|
||||
|
||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_y25dn"]
|
||||
_data = {
|
||||
"Fade in": SubResource("Animation_utk5y"),
|
||||
"Fade out": SubResource("Animation_wbxrc"),
|
||||
"RESET": SubResource("Animation_tc843")
|
||||
}
|
||||
|
||||
[node name="Island-scene" type="Node2D"]
|
||||
script = ExtResource("1_eeg2d")
|
||||
metadata/_edit_vertical_guides_ = [1900.0, 4004.0]
|
||||
|
|
@ -121,28 +55,6 @@ metadata/_edit_horizontal_guides_ = [2097.0]
|
|||
position = Vector2(2451, 3007)
|
||||
script = ExtResource("2_k51iv")
|
||||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="Camera2D"]
|
||||
z_index = 1
|
||||
position = Vector2(1.50008, -2.00003)
|
||||
scale = Vector2(0.347656, 0.373264)
|
||||
texture = ExtResource("3_oufrl")
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="Camera2D"]
|
||||
top_level = true
|
||||
z_index = 1
|
||||
offset_left = -6230.0
|
||||
offset_top = -4497.0
|
||||
offset_right = 5463.0
|
||||
offset_bottom = 4961.0
|
||||
color = Color(0, 0, 0, 0)
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="Camera2D"]
|
||||
root_node = NodePath("../..")
|
||||
libraries = {
|
||||
"": SubResource("AnimationLibrary_y25dn")
|
||||
}
|
||||
movie_quit_on_finish = true
|
||||
|
||||
[node name="CanvasLayer" type="CanvasLayer" parent="Camera2D"]
|
||||
|
||||
[node name="Vignette" type="ColorRect" parent="Camera2D/CanvasLayer"]
|
||||
|
|
@ -157,6 +69,7 @@ size_flags_horizontal = 4
|
|||
[node name="TopLeftContainer" type="MarginContainer" parent="Camera2D/CanvasLayer"]
|
||||
offset_right = 204.0
|
||||
offset_bottom = 122.0
|
||||
scale = Vector2(1.3, 1.3)
|
||||
theme_override_constants/margin_left = 5
|
||||
theme_override_constants/margin_top = 5
|
||||
|
||||
|
|
@ -291,6 +204,7 @@ anchor_bottom = 1.0
|
|||
offset_top = -5.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 0
|
||||
size_flags_vertical = 8
|
||||
theme_override_constants/margin_left = 5
|
||||
theme_override_constants/margin_bottom = 5
|
||||
|
||||
|
|
@ -304,6 +218,7 @@ size_flags_vertical = 8
|
|||
unique_name_in_owner = true
|
||||
position = Vector2i(0, 36)
|
||||
size = Vector2i(1075, 225)
|
||||
visible = false
|
||||
script = ExtResource("5_ecfvx")
|
||||
|
||||
[node name="GraphEdit" type="GraphEdit" parent="Camera2D/CanvasLayer/TreeVisualizer"]
|
||||
|
|
@ -321,6 +236,12 @@ show_grid_buttons = false
|
|||
show_minimap_button = false
|
||||
show_arrange_button = false
|
||||
|
||||
[node name="IntroImage" type="Sprite2D" parent="Camera2D"]
|
||||
visible = false
|
||||
z_index = 1
|
||||
scale = Vector2(0.347656, 0.373264)
|
||||
texture = ExtResource("3_oufrl")
|
||||
|
||||
[node name="Tileset" type="Node2D" parent="."]
|
||||
script = ExtResource("1_k0rw8")
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,11 @@ key_6={
|
|||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":54,"key_label":0,"unicode":54,"location":0,"echo":false,"script":null)
|
||||
]
|
||||
}
|
||||
auto_tick={
|
||||
"deadzone": 0.5,
|
||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
|
||||
]
|
||||
}
|
||||
|
||||
[rendering]
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ enum Event {
|
|||
};
|
||||
#
|
||||
static var events: Array[TrackedEvent] = []
|
||||
static var max_events: int = 20
|
||||
static var max_events: int = 14
|
||||
static var callbacks: Array[Callable] = []
|
||||
|
||||
|
||||
|
|
@ -79,9 +79,9 @@ static func populate_visual_log_create_label(event: TrackedEvent, container: Con
|
|||
elif event_id == Event.GAME_STATE_WIN:
|
||||
text = "Game won"
|
||||
elif event_id == Event.NEW_EXPLORATION_GOAL:
|
||||
text = "New exploration goal " + str(params["goal"])
|
||||
text = "New goal " + str(params["goal"])
|
||||
elif event_id == Event.EXPLORATION_GOAL_REACHED:
|
||||
text = "Exploration goal reached " + str(params["goal"])
|
||||
text = "Goal reached"
|
||||
elif event_id == Event.TEMPERATURE_COLD:
|
||||
text = "Temperature is cold: -" + str(params["temperature"])
|
||||
elif event_id == Event.TIME_SUNDOWN:
|
||||
|
|
@ -91,6 +91,7 @@ static func populate_visual_log_create_label(event: TrackedEvent, container: Con
|
|||
|
||||
var event_label: Label = Label.new()
|
||||
event_label.text = text
|
||||
event_label.add_theme_font_size_override("font_size", 24 * game_manager.calculate_scale(Vector2(1200, 1200)).y)
|
||||
event_label.add_theme_color_override("font_color", Color(0, 0, 0))
|
||||
|
||||
var event_container: HBoxContainer = HBoxContainer.new()
|
||||
|
|
@ -101,6 +102,8 @@ static func populate_visual_log_create_label(event: TrackedEvent, container: Con
|
|||
if item_texture:
|
||||
var item_texture_rect: TextureRect = TextureRect.new()
|
||||
item_texture_rect.texture = item_texture
|
||||
item_texture_rect.set_expand_mode(TextureRect.EXPAND_FIT_WIDTH)
|
||||
item_texture_rect.set_stretch_mode(TextureRect.STRETCH_KEEP_ASPECT_CENTERED)
|
||||
event_container.add_child(item_texture_rect)
|
||||
|
||||
container.add_child(event_container)
|
||||
|
|
|
|||
|
|
@ -14,11 +14,14 @@ var tilemap_types: TileMapTileTypes = TileMapTileTypes.new()
|
|||
@onready var temperature_resistance_bar: ProgressBar = %TemperatureResistanceBar
|
||||
|
||||
var tilemap_navigation: TilemapNavigation = TilemapNavigation.new()
|
||||
var waiting_for_input = true
|
||||
|
||||
@onready var tree_visualizer: BehaviorTreeVisualizer = %TreeVisualizer
|
||||
@onready var animation_player = $Camera2D/AnimationPlayer
|
||||
@onready var sprite = $Camera2D/Sprite2D
|
||||
@onready var color_rect = $Camera2D/ColorRect
|
||||
|
||||
#
|
||||
var waiting_for_input: bool = true
|
||||
|
||||
@onready var intro_image: Sprite2D = $Camera2D/IntroImage
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
tilemap_navigation.world = world
|
||||
|
|
@ -28,33 +31,21 @@ func _ready() -> void:
|
|||
world.step_visualizer.game_manager = self
|
||||
world.step_visualizer.world = world
|
||||
update_bars()
|
||||
if animation_player and sprite:
|
||||
animation_player.play("Fade in")
|
||||
print("Warte auf Tasteneingabe...")
|
||||
await wait_for_key_press()
|
||||
animation_player.play("Fade out")
|
||||
await get_tree().create_timer(3.0).timeout
|
||||
call_deferred("defer_ready")
|
||||
else:
|
||||
print("Knoten nicht gefunden!")
|
||||
call_deferred("defer_ready")
|
||||
|
||||
|
||||
func defer_ready() -> void:
|
||||
tree_visualizer.behavior_tree = player.behavior_tree
|
||||
tree_visualizer.build_tree()
|
||||
|
||||
intro_image.visible = true
|
||||
await wait_for_key_press()
|
||||
get_tree().create_tween().tween_method(set_intro_opacity, 1.0, 0.0, 1.0)
|
||||
|
||||
|
||||
# game_ticker.start()
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if Input.is_action_just_pressed("key_6"):
|
||||
camera.go_to_zooming(Vector2(517.469787597656, 289.846008300781), 1.771561)
|
||||
if Input.is_action_just_pressed("key_3"):
|
||||
camera.go_to_zooming(Vector2(789.883972167969, 450.102813720703), 0.56015348434448)
|
||||
if Input.is_action_just_pressed("key_9"):
|
||||
world.camp_manager.campfire_light()
|
||||
world.camp_manager.sleep_effect()
|
||||
world.camp_manager.campfire_extinguish()
|
||||
if Input.is_action_just_pressed("force_game_tick"):
|
||||
Task.print_behavior_tree_evaluation = true
|
||||
_on_game_tick_timeout()
|
||||
|
|
@ -63,7 +54,30 @@ func _process(delta: float) -> void:
|
|||
_on_game_tick_timeout()
|
||||
if Input.is_action_just_pressed("key_2"):
|
||||
toggle_temperature_layer()
|
||||
camera.print_config()
|
||||
if Input.is_action_just_pressed("auto_tick"):
|
||||
if game_ticker.is_stopped():
|
||||
game_ticker.start()
|
||||
else:
|
||||
game_ticker.stop()
|
||||
|
||||
if intro_image.is_visible():
|
||||
intro_image.set_scale(calculate_scale(intro_image.texture.get_size()))
|
||||
|
||||
|
||||
func calculate_scale(image_size: Vector2) -> Vector2:
|
||||
var viewport_size: Vector2 = world.get_viewport_rect().size
|
||||
var scale: float = viewport_size.x / image_size.x
|
||||
return Vector2(scale, scale)
|
||||
|
||||
|
||||
# SECTION: intro
|
||||
|
||||
func set_intro_opacity(opacity: float) -> void:
|
||||
intro_image.set_modulate(Color(1, 1, 1, opacity))
|
||||
|
||||
|
||||
# SECTION: game tick
|
||||
|
||||
func player_health_depleted():
|
||||
# TODO
|
||||
|
|
@ -86,9 +100,40 @@ func _on_game_tick_timeout() -> void:
|
|||
update_bars()
|
||||
handle_result_game_state(player.behavior_tree.blackboard)
|
||||
|
||||
if not game_ticker.is_stopped():
|
||||
camera_follow_player()
|
||||
|
||||
timer_on_game_tick_timeout.stop()
|
||||
|
||||
|
||||
func camera_follow_player() -> void:
|
||||
var player_position: Vector2 = world.tilemap_player.cell_to_local(player.board_position)
|
||||
var targeted_position = null
|
||||
|
||||
if player.behavior_tree.blackboard.has("path"):
|
||||
var path: Array = player.behavior_tree.blackboard["path"]
|
||||
if path.size() > 0:
|
||||
targeted_position = world.tilemap_player.cell_to_local(path[path.size() - 1])
|
||||
|
||||
if not targeted_position:
|
||||
camera.go_to(player_position)
|
||||
return
|
||||
|
||||
var avg_position = (player_position + targeted_position) / 2
|
||||
var distance: float = player_position.distance_to(targeted_position)
|
||||
if distance < 200:
|
||||
camera.go_to_zooming(avg_position, distance_to_zoom_level(200))
|
||||
else:
|
||||
var zoom_level: float = distance_to_zoom_level(distance)
|
||||
camera.go_to_zooming(avg_position, zoom_level)
|
||||
|
||||
|
||||
func distance_to_zoom_level(distance: float) -> float:
|
||||
var a: float = 862.08
|
||||
var b: float = 274.13
|
||||
return a / (distance + b)
|
||||
|
||||
|
||||
func handle_result_game_state(blackboard: Dictionary) -> void:
|
||||
if blackboard.has("game_state_win"):
|
||||
EventsTracker.track(EventsTracker.Event.GAME_STATE_WIN)
|
||||
|
|
@ -125,9 +170,11 @@ func toggle_temperature_layer() -> void:
|
|||
|
||||
|
||||
func wait_for_key_press():
|
||||
waiting_for_input = true
|
||||
while waiting_for_input:
|
||||
await get_tree().process_frame
|
||||
|
||||
|
||||
func _input(event):
|
||||
if event is InputEventKey and event.pressed:
|
||||
waiting_for_input = false
|
||||
|
|
|
|||
Loading…
Reference in New Issue