From 78b4a3bba20d14952db4389a2354fca93e436335 Mon Sep 17 00:00:00 2001 From: megamichi Date: Tue, 22 Oct 2024 19:52:35 +0200 Subject: [PATCH] - Fixing Commit --- assets/Ground/f.png | Bin 8037 -> 8527 bytes code/GUI/restartschild.gd | 4 +- code/global.gd | 10 ++ code/main.gd | 6 +- export_presets.cfg | 6 +- project.godot | 2 +- scenes/Main.tscn | 146 ++++++++++++------ scenes/easteregg/easteregg.gd | 2 +- scenes/easteregg/easteregg.tscn | 1 + scenes/hindernis/Spawner/hindernis_spawner.gd | 3 +- scenes/hindernis/hindernis.gd | 9 +- scenes/hindernis/hindernis.tscn | 2 +- scenes/hindernis/hindernisse.png | Bin 2907 -> 2712 bytes scenes/schild.tscn | 8 +- 14 files changed, 133 insertions(+), 66 deletions(-) diff --git a/assets/Ground/f.png b/assets/Ground/f.png index 1e8507997cac0a0f3a2b94abc7e450c188b94061..79e54f6fa98ecb877a94c842dcb9bbbaa190b9a2 100644 GIT binary patch delta 8163 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 void: await $AnimationPlayer.animation_finished hide() - + +func _on_back_pressed() -> void: + $"/root/Global".reset_game() diff --git a/code/global.gd b/code/global.gd index ac42bc1..2e23c48 100644 --- a/code/global.gd +++ b/code/global.gd @@ -45,3 +45,13 @@ func write_save(): ) print("saved: ",content) data.store_string(content) + + +func reset_game(): + speed = 100 + score = 0 + active_biom = "n" + gamerunning = false + _ready() + $/root/Game/Fade/FadeAnimation.play("fade") + get_tree().reload_current_scene() diff --git a/code/main.gd b/code/main.gd index 05d5f17..bbd9f88 100644 --- a/code/main.gd +++ b/code/main.gd @@ -1,6 +1,7 @@ extends Node func _ready() -> void: + $Fade/FadeAnimation.play_backwards("fade") $Screen/Background/Floor/EasterEggFixCollision.disabled = false $Gui/HiscoreContainer.show() %ScoreContainer.hide() @@ -18,6 +19,7 @@ func start_game(): $"/root/Global".start.emit() $"/root/Global".score = 0 $"/root/Global".speed = 100 + print("game started") func _on_level_up_timer_timeout() -> void: if $"/root/Global".speed < $"/root/Global".maxspeed: @@ -30,7 +32,3 @@ func _score() -> void: elif $Screen/Duck.alive: $"/root/Global".score += 10 %ScoreContainer/score.text = str($"/root/Global".score) - -func _process(delta): - pass - diff --git a/export_presets.cfg b/export_presets.cfg index 939489a..6b8af5f 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="builds/DuckRun_v2.2.0iconfix.apk" +export_path="builds/DuckRun_v2.3.0.apk" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -31,7 +31,7 @@ architectures/armeabi-v7a=true architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false -version/code=9 +version/code=10 version/name="" package/unique_name="at.megamichi.duckrun" package/name="DuckRun" @@ -226,7 +226,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="builds/DuckRun_v2.2.0.zip" +export_path="builds/DuckRun_v2.3.0.zip" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false diff --git a/project.godot b/project.godot index 29e8023..ce8e34e 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="DuckRun" -config/version="2.2.0" +config/version="2.3.0" run/main_scene="res://scenes/Main.tscn" config/features=PackedStringArray("4.3") boot_splash/image="res://icon.png" diff --git a/scenes/Main.tscn b/scenes/Main.tscn index 0d2963a..8501524 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=3 uid="uid://bb5qp5868y5i"] +[gd_scene load_steps=41 format=3 uid="uid://bb5qp5868y5i"] [ext_resource type="Script" path="res://code/main.gd" id="1_ar2ah"] [ext_resource type="PackedScene" uid="uid://8v5mbbnddorh" path="res://scenes/Duck/Duck.tscn" id="2"] @@ -6,26 +6,62 @@ [ext_resource type="Script" path="res://scenes/ground/spawner/ground_spawner.gd" id="3_va7mo"] [ext_resource type="Script" path="res://scenes/hindernis/Spawner/hindernis_spawner.gd" id="4_oc6me"] [ext_resource type="PackedScene" uid="uid://cjq8kb0mhjh8r" path="res://scenes/ground/ground.tscn" id="4_tt0te"] -[ext_resource type="PackedScene" uid="uid://dm307sj4nenjt" path="res://scenes/schild.tscn" id="5_ewtcf"] -[ext_resource type="Texture2D" uid="uid://do0okfxenx2ci" path="res://assets/GUI/restart button.png" id="6_boo0r"] -[ext_resource type="Script" path="res://scenes/easteregg/Spawner/easteregg_spawner.gd" id="8_awkaj"] -[ext_resource type="Script" path="res://code/GUI/gui.gd" id="8_t3tw7"] -[ext_resource type="Script" path="res://code/GUI/startschild.gd" id="10_tn1on"] -[ext_resource type="Texture2D" uid="uid://d2i2d0rmdtklc" path="res://assets/GUI/start button.png" id="11_4sha5"] [ext_resource type="Script" path="res://scenes/Wolke/Spawner/wolken_spawner.gd" id="11_x2wm3"] -[ext_resource type="Texture2D" uid="uid://dqvnnd3o1eele" path="res://assets/GUI/settings button.png" id="13_0b7u8"] -[ext_resource type="Texture2D" uid="uid://46wo0ufacs5d" path="res://assets/GUI/sound button.png" id="13_hvt5m"] -[ext_resource type="Texture2D" uid="uid://bj7bgtdcbdald" path="res://assets/GUI/logo.png" id="14_4hepj"] -[ext_resource type="Texture2D" uid="uid://nvn254p6tk8j" path="res://assets/GUI/back button.png" id="15_wi7xd"] -[ext_resource type="Script" path="res://code/GUI/settingsschild.gd" id="16_0wi25"] -[ext_resource type="Texture2D" uid="uid://bf82voofmvdj4" path="res://assets/GUI/theme_slider/slider.png" id="17_41xdg"] +[ext_resource type="Script" path="res://scenes/easteregg/Spawner/easteregg_spawner.gd" id="12_hl8it"] +[ext_resource type="FontFile" uid="uid://ddvhypxkj8a1b" path="res://Megamichisfont-small.otf" id="13_666gv"] +[ext_resource type="Script" path="res://code/hiscore.gd" id="14_ah063"] +[ext_resource type="PackedScene" uid="uid://dm307sj4nenjt" path="res://scenes/schild.tscn" id="15_1xp2x"] +[ext_resource type="Script" path="res://code/GUI/settingsschild.gd" id="16_4ssry"] +[ext_resource type="Texture2D" uid="uid://nvn254p6tk8j" path="res://assets/GUI/back button.png" id="17_3kek5"] +[ext_resource type="Texture2D" uid="uid://bf82voofmvdj4" path="res://assets/GUI/theme_slider/slider.png" id="18_u2no7"] +[ext_resource type="Texture2D" uid="uid://46wo0ufacs5d" path="res://assets/GUI/sound button.png" id="19_vwek8"] [ext_resource type="AudioStream" uid="uid://drriw1cka4m3" path="res://assets/audio/gui-in.ogg" id="20_eihxi"] -[ext_resource type="Script" path="res://code/hiscore.gd" id="21_5nnhv"] +[ext_resource type="Texture2D" uid="uid://do0okfxenx2ci" path="res://assets/GUI/restart button.png" id="20_gdgit"] [ext_resource type="AudioStream" uid="uid://ctt1kb2a66yyl" path="res://assets/audio/boing.mp3" id="21_ch5yv"] [ext_resource type="AudioStream" uid="uid://bktthpfrs0118" path="res://assets/audio/gui-out.ogg" id="21_frskh"] -[ext_resource type="FontFile" uid="uid://ddvhypxkj8a1b" path="res://Megamichisfont-small.otf" id="21_uy1pc"] +[ext_resource type="Script" path="res://code/GUI/startschild.gd" id="21_owbcl"] [ext_resource type="AudioStream" uid="uid://c4wrtvywao1jn" path="res://assets/audio/duckrun.wav" id="22_ijpe0"] -[ext_resource type="Script" path="res://code/score.gd" id="22_m4aei"] +[ext_resource type="Texture2D" uid="uid://d2i2d0rmdtklc" path="res://assets/GUI/start button.png" id="22_x686b"] +[ext_resource type="Texture2D" uid="uid://dqvnnd3o1eele" path="res://assets/GUI/settings button.png" id="23_on2gf"] +[ext_resource type="Texture2D" uid="uid://bj7bgtdcbdald" path="res://assets/GUI/logo.png" id="24_8b8my"] +[ext_resource type="Script" path="res://code/score.gd" id="25_2prek"] + +[sub_resource type="Animation" id="Animation_yef6t"] +resource_name = "fade" +length = 0.1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.1), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(1, 1, 1, 1), Color(0, 0, 0, 1)] +} + +[sub_resource type="Animation" id="Animation_28fei"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:color") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.0001), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Color(1, 1, 1, 1), Color(0, 0, 0, 1)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_s1fwp"] +_data = { +"RESET": SubResource("Animation_28fei"), +"fade": SubResource("Animation_yef6t") +} [sub_resource type="Animation" id="Animation_4fx6d"] resource_name = "Fade" @@ -236,9 +272,9 @@ expand_margin_top = 1.0 expand_margin_bottom = 2.0 anti_aliasing = false -[sub_resource type="Theme" id="Theme_0130c"] -HSlider/icons/grabber = ExtResource("17_41xdg") -HSlider/icons/grabber_highlight = ExtResource("17_41xdg") +[sub_resource type="Theme" id="Theme_fcgbk"] +HSlider/icons/grabber = ExtResource("18_u2no7") +HSlider/icons/grabber_highlight = ExtResource("18_u2no7") HSlider/styles/grabber_area = SubResource("StyleBoxEmpty_jin1w") HSlider/styles/grabber_area_highlight = SubResource("StyleBoxEmpty_g0rdc") HSlider/styles/slider = SubResource("StyleBoxFlat_xb3tf") @@ -246,6 +282,14 @@ HSlider/styles/slider = SubResource("StyleBoxFlat_xb3tf") [node name="Game" type="Node"] script = ExtResource("1_ar2ah") +[node name="Fade" type="CanvasModulate" parent="."] + +[node name="FadeAnimation" type="AnimationPlayer" parent="Fade"] +unique_name_in_owner = true +libraries = { +"": SubResource("AnimationLibrary_s1fwp") +} + [node name="Screen" type="Node2D" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="Screen"] @@ -315,15 +359,14 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("8_t3tw7") metadata/_edit_lock_ = true [node name="EastereggSpawner" type="Marker2D" parent="Gui"] position = Vector2(81, -18) -script = ExtResource("8_awkaj") +script = ExtResource("12_hl8it") [node name="HiscoreContainer" type="VBoxContainer" parent="Gui"] -layout_mode = 1 +layout_mode = 0 offset_left = 1.0 offset_top = 1.0 offset_right = 66.0 @@ -332,18 +375,18 @@ theme_override_constants/separation = 0 [node name="hiscore_text" type="Label" parent="Gui/HiscoreContainer"] layout_mode = 2 -theme_override_fonts/font = ExtResource("21_uy1pc") +theme_override_fonts/font = ExtResource("13_666gv") theme_override_font_sizes/font_size = 8 text = "Your Highscore:" [node name="hiscore" type="Label" parent="Gui/HiscoreContainer"] layout_mode = 2 -theme_override_fonts/font = ExtResource("21_uy1pc") +theme_override_fonts/font = ExtResource("13_666gv") theme_override_font_sizes/font_size = 8 text = "0" -script = ExtResource("21_5nnhv") +script = ExtResource("14_ah063") -[node name="Settings" parent="Gui" instance=ExtResource("5_ewtcf")] +[node name="Settings" parent="Gui" instance=ExtResource("15_1xp2x")] visible = false layout_mode = 1 anchors_preset = 1 @@ -359,7 +402,7 @@ grow_horizontal = 0 size_flags_horizontal = 8 size_flags_vertical = 4 stretch_mode = 2 -script = ExtResource("16_0wi25") +script = ExtResource("16_4ssry") [node name="BackButton" type="TextureButton" parent="Gui/Settings"] layout_mode = 1 @@ -367,7 +410,7 @@ offset_left = 2.0 offset_top = 79.0 offset_right = 17.0 offset_bottom = 94.0 -texture_normal = ExtResource("15_wi7xd") +texture_normal = ExtResource("17_3kek5") [node name="ColorLabel" type="Label" parent="Gui/Settings"] layout_mode = 0 @@ -375,7 +418,7 @@ offset_left = 5.0 offset_top = 98.0 offset_right = 62.0 offset_bottom = 115.0 -theme_override_fonts/font = ExtResource("21_uy1pc") +theme_override_fonts/font = ExtResource("13_666gv") theme_override_font_sizes/font_size = 8 text = "Color" @@ -385,7 +428,7 @@ offset_left = 5.0 offset_top = 127.0 offset_right = 45.0 offset_bottom = 150.0 -theme_override_fonts/font = ExtResource("21_uy1pc") +theme_override_fonts/font = ExtResource("13_666gv") theme_override_font_sizes/font_size = 8 text = "Music:" @@ -398,7 +441,7 @@ offset_left = 32.0 offset_top = 93.0 offset_right = 26.1 offset_bottom = 34.0 -theme = SubResource("Theme_0130c") +theme = SubResource("Theme_fcgbk") value = 17.0 allow_greater = true allow_lesser = true @@ -412,7 +455,7 @@ offset_left = 5.0 offset_top = 131.0 offset_right = 12.1 offset_bottom = 72.0 -theme = SubResource("Theme_0130c") +theme = SubResource("Theme_fcgbk") value = 20.0 allow_greater = true allow_lesser = true @@ -431,10 +474,9 @@ offset_bottom = 2.0 grow_horizontal = 0 grow_vertical = 0 toggle_mode = true -texture_normal = ExtResource("13_hvt5m") +texture_normal = ExtResource("19_vwek8") -[node name="GameOverSchild" parent="Gui" instance=ExtResource("5_ewtcf")] -visible = false +[node name="GameOverSchild" parent="Gui" instance=ExtResource("15_1xp2x")] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -463,10 +505,24 @@ offset_top = -23.3 offset_right = -8.0 offset_bottom = -8.3 scale = Vector2(3, 3) -texture_normal = ExtResource("6_boo0r") +texture_normal = ExtResource("20_gdgit") stretch_mode = 1 -[node name="StartSchild" parent="Gui" instance=ExtResource("5_ewtcf")] +[node name="back" type="TextureButton" parent="Gui/GameOverSchild"] +texture_repeat = 2 +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.5 +anchor_top = 0.762 +anchor_right = 0.5 +anchor_bottom = 0.762 +offset_left = -48.0 +offset_top = -35.3 +offset_right = -33.0 +offset_bottom = -20.3 +texture_normal = ExtResource("17_3kek5") + +[node name="StartSchild" parent="Gui" instance=ExtResource("15_1xp2x")] visible = false layout_mode = 1 anchors_preset = 6 @@ -482,7 +538,7 @@ grow_horizontal = 0 grow_vertical = 2 size_flags_vertical = 4 stretch_mode = 2 -script = ExtResource("10_tn1on") +script = ExtResource("21_owbcl") [node name="Start" type="TextureButton" parent="Gui/StartSchild"] texture_repeat = 2 @@ -499,7 +555,7 @@ offset_bottom = -8.55 grow_horizontal = 2 grow_vertical = 2 scale = Vector2(3, 3) -texture_normal = ExtResource("11_4sha5") +texture_normal = ExtResource("22_x686b") stretch_mode = 1 [node name="Settings" type="TextureButton" parent="Gui/StartSchild"] @@ -517,7 +573,7 @@ offset_bottom = -8.55 grow_horizontal = 2 grow_vertical = 2 scale = Vector2(3, 3) -texture_normal = ExtResource("13_0b7u8") +texture_normal = ExtResource("23_on2gf") stretch_mode = 1 [node name="Logo" type="TextureButton" parent="Gui/StartSchild"] @@ -536,7 +592,7 @@ grow_vertical = 0 rotation = -0.413643 size_flags_horizontal = 4 size_flags_vertical = 4 -texture_normal = ExtResource("14_4hepj") +texture_normal = ExtResource("24_8b8my") [node name="ScoreContainer" type="HBoxContainer" parent="Gui"] unique_name_in_owner = true @@ -549,17 +605,17 @@ offset_top = 17.0 offset_right = 29.0 offset_bottom = 24.0 grow_horizontal = 2 -script = ExtResource("22_m4aei") +script = ExtResource("25_2prek") [node name="text" type="Label" parent="Gui/ScoreContainer"] layout_mode = 2 -theme_override_fonts/font = ExtResource("21_uy1pc") +theme_override_fonts/font = ExtResource("13_666gv") theme_override_font_sizes/font_size = 8 text = "Score:" [node name="score" type="Label" parent="Gui/ScoreContainer"] layout_mode = 2 -theme_override_fonts/font = ExtResource("21_uy1pc") +theme_override_fonts/font = ExtResource("13_666gv") theme_override_font_sizes/font_size = 8 text = " " @@ -589,7 +645,6 @@ bus = &"Background" [connection signal="timeout" from="Screen/Day-NightTimer" to="Screen/Day-NightTimer" method="_change_time"] [connection signal="timeout" from="Screen/Background/WolkenSpawner/WolkenTimer" to="Screen/Background/WolkenSpawner" method="_spawn"] [connection signal="screen_entered" from="Screen/Background/GroundSpawner/Ground" to="Screen/Background/GroundSpawner" method="_on_ground_sprite_screen_entered"] -[connection signal="gameover" from="Screen/Duck" to="Gui/HiscoreContainer/hiscore" method="set_new_hiscore"] [connection signal="gameover" from="Screen/Duck" to="Gui/GameOverSchild" method="_on_duck_gameover"] [connection signal="timeout" from="Screen/LevelUpTimer" to="." method="_on_level_up_timer_timeout"] [connection signal="timeout" from="Screen/SpawnTimer" to="Screen/HindernissSpawner" method="_spawn"] @@ -598,6 +653,7 @@ bus = &"Background" [connection signal="value_changed" from="Gui/Settings/VolumeSlider" to="Gui/Settings" method="_volume_slider_changed"] [connection signal="toggled" from="Gui/Settings/SoundToggleButton" to="Gui/Settings" method="_on_sound_button_toggled"] [connection signal="pressed" from="Gui/GameOverSchild/Restart" to="Gui/GameOverSchild" method="_on_restart_pressed"] +[connection signal="pressed" from="Gui/GameOverSchild/back" to="Gui/GameOverSchild" method="_on_back_pressed"] [connection signal="pressed" from="Gui/StartSchild/Start" to="Gui/StartSchild" method="_on_start_pressed"] [connection signal="pressed" from="Gui/StartSchild/Settings" to="Gui/StartSchild" method="_on_settings_pressed"] [connection signal="pressed" from="Gui/StartSchild/Logo" to="Gui/EastereggSpawner" method="_spawn"] diff --git a/scenes/easteregg/easteregg.gd b/scenes/easteregg/easteregg.gd index 5a6ddc2..6215bce 100644 --- a/scenes/easteregg/easteregg.gd +++ b/scenes/easteregg/easteregg.gd @@ -3,7 +3,7 @@ extends RigidBody2D # Called when the node enters the scene tree for the first time. func _ready() -> void: - $Sprite.frame = randi_range(0,4) + $Sprite.frame = randi_range(0,12) position.x += randi_range(-10,10) diff --git a/scenes/easteregg/easteregg.tscn b/scenes/easteregg/easteregg.tscn index 7567843..48ad433 100644 --- a/scenes/easteregg/easteregg.tscn +++ b/scenes/easteregg/easteregg.tscn @@ -19,4 +19,5 @@ position = Vector2(0, -7) texture = ExtResource("1_al4up") offset = Vector2(0, 0.5) hframes = 5 +vframes = 3 frame = 3 diff --git a/scenes/hindernis/Spawner/hindernis_spawner.gd b/scenes/hindernis/Spawner/hindernis_spawner.gd index 14e251f..1cc3ceb 100644 --- a/scenes/hindernis/Spawner/hindernis_spawner.gd +++ b/scenes/hindernis/Spawner/hindernis_spawner.gd @@ -15,8 +15,7 @@ func _spawn() -> void: var v2 = 2.0 - (speed / 260) #print(str(v1)," ",str(v2)) - $"../SpawnTimer".wait_time = randf_range(v1,v2) - #print("speed: ",speed) + $"../SpawnTimer".wait_time = randf_range(v1,v2) add_child(hindernis) func del_all(): diff --git a/scenes/hindernis/hindernis.gd b/scenes/hindernis/hindernis.gd index 06212ed..489b438 100644 --- a/scenes/hindernis/hindernis.gd +++ b/scenes/hindernis/hindernis.gd @@ -4,12 +4,13 @@ extends CharacterBody2D func _ready() -> void: + $"Sprite".frame_coords.x = randi_range(0,4) if $"/root/Global".active_biom == "w": - $"Sprite".frame = randi_range(5,9) - if $"/root/Global".active_biom == "s": - $"Sprite".frame = randi_range(10,12) + $"Sprite".frame_coords.y = 1 + elif $"/root/Global".active_biom == "s": + $"Sprite".frame_coords.y = 2 else: - $"Sprite".frame = randi_range(0,4) + $"Sprite".frame_coords.y = 0 func _process(delta: float) -> void: speed = $"/root/Global".speed diff --git a/scenes/hindernis/hindernis.tscn b/scenes/hindernis/hindernis.tscn index fbfac0f..2aace84 100644 --- a/scenes/hindernis/hindernis.tscn +++ b/scenes/hindernis/hindernis.tscn @@ -21,7 +21,7 @@ texture = ExtResource("2_thg8w") offset = Vector2(0, 0.5) hframes = 5 vframes = 3 -frame = 9 +frame = 14 region_enabled = true region_rect = Rect2(0, 0, 80, 48) diff --git a/scenes/hindernis/hindernisse.png b/scenes/hindernis/hindernisse.png index 825fee2e0bd67979b9040516974a60072efd4cca..34b6d982641756f900d1460dd8d7f255a0abe886 100644 GIT binary patch delta 2301 zcmVqdL3lC}?BNr?2Paar40 z1K@xRg4p}PQ3(LME?r{VM_+gWmSy46um2VbWFmE5?%uQ4*`7ErBSWlKB@zkY*{;^_ ziRzc2i*v&g0Q!I0PI%7Yao}iARc107w=tj3}{+7{8i^ zC_DXQ-^WnfS#v|0q{0IL+qUu7-d=VV&BIA0J%SOuqRhRl72Pd{Gy25cYER%+r}QG zf&&0cD@oKR0A93FHq@f-WH#r4fBzH!kk5Fh$MLIaj~h7=JQbn}E)1d?x+=um6SuH? z&tB}_v)6wNk@SsW-vU6x+76#oc*SDT^W#MQTewCYo~rSyX#l{cg#}}ul@dYJ=fgmV zNoL=IAFM$-u+GlT!2T@2FcHL+)Ts+``T0nAoPRzt0AIgELf{)TLe_>E8r4TgBqn&4 z)tDPtt7Y=FKo^>1Sr%;D_FN!}PF--4(#Cc3_~?K2=K%nv**IQ#bJXo~`S*ta0C!7^ zcr+8ksS9!W_NyW5(xhSAAk}?g&Lgz~&U$aOCoh2vGC$9|^I$VNe*8E9U}R*Z>0<$4 z{}zesxi)wI#q1nDdi{BnX5+Z_$3+0ZqnQ|hSn!Ex*+L@6Q7HR!TvN$IH-|5T^A9or zyjg!(*QSL9w7*eu|Md?aJ`8||_xB-wTi3>Q^LQ~khy7ced%2!#!}VMnKD#gQXeNe7 zGcoMnBC&sq#HJ^h`Io|&Ne~{Ov>pslSm>%rGH@ZyNry*T&O(|(7;v1Ysx%vSx9^rz zCj!0@u2!XIDPzO$Is-s*VX;{B0aRV5!s~zQ>l40bVS;GNvK%}TEslE)@ZJh}3Q<9Z ziJkvcfSfAz(%`^mLbw5O2THA6o^q{$=X?2`F8SL(KP8h%fl5WX@OJIk>i&PI zU)ZJOkvoz5tTe#Jg>y}sy8(z-*1W7zrMvEnufKDD1X0)Ifg5u2zzyT|ClB0^;=^YI zK~vqhasYLQM7&}57^i~ir1`~Z%r8#6`+7Uj2uFgbf|@*VL#D^N zJ@cRn+6a)q0YImfLeVZG6e8Uuw;wcz>F}fURYdUS7pL)fs>%*)esP+G2RP0mC^|&y zW11IPfb!sFS+vXOv{G&zK{SeUhFTXTq^VDH;qTFgcJG=t-m>0PRw@#^c5HuT!#GL^ ztBwQ=098=5O+bw<WLQOK(81l)6RC25F8i)dBUPkkbxxsTwL zrz+4z@Ms>SV;ZAW5{DkX0Q_}d88Ha=rq!^^)_B0C5$8d_!orqUqklwrKm*Fem;V9K2;r#k00&fh ztXohRQ|W`}8R**kz@>j_?S0_#wc76ke;n%JAOE6g#T+;=$bWD0qtKN^bJLj8-#7=# zW8P)Ec+c=8uISv^syumm>EGa)r2er-|2{8FfBI!b_Wv_{>>hR8bguVspJ4Y%+#D#6 zRV2Y1pRKq*wVur%eeGwG@Itr&W4QV#qpZM$d?9*wWNaYAOq>A+1UeSCR^gLO7e?VXF#qpJiE*-1+{Yii`@6^cb5xrKw(RZ+acb zL8Nd68evTPVX#axeUGwQ68$9rrTSi}(a@E}#{Mt0`VxQe(AiqCg*1UWch;LMI0eBC zOC0X^hmXzY=iC=M4;FGkL-y+lr*Hv^_mV;$tH^tW0=9K^1s)r;CRE+11ELT%B@hlC z=RVuEake-pPj5RD$=%r}f!u$C`^b-<_0@^~lAA<)Z7(^cZw}nn)rEV70`3(GQO3q< z=uARn6aIBM5O4r<$LR2E+ct)->BH~kYAJJ|?@1&q8%KE}A?cxPnh&ES1r8eLKvVJ{ z2Yx$U0~f~f+Fjomf*ts@VE?NZ0b0tVoUUvF$km_Imy%3Y%W0g{^&gdLGSS=Dv_kqH Xz++8#2WeFk00000NkvXXu0mjfoGpUH delta 2498 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 M07*qoM6N<$f=