diff --git a/.import/.gdignore b/.import/.gdignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.import/.gdignore @@ -0,0 +1 @@ + diff --git a/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.md5 b/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.md5 index d6f9e81..52f5ed5 100644 --- a/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.md5 +++ b/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.md5 @@ -1,3 +1,3 @@ -source_md5="190ce74cfcc2f3ec48cb3a2464d44a0d" -dest_md5="796a016a75f650de1fc73647eb630ed4" +source_md5="46ef344e8f3ce182a06d0e446fc79f2b" +dest_md5="938077cad9e74c281ea8293cab93e116" diff --git a/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.stex b/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.stex index cbc8116..9924bc1 100644 Binary files a/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.stex and b/.import/bucket.png-dbd711fd083337c7d4cdca1838d7ff42.stex differ diff --git a/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.md5 b/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.md5 index 37a997b..a654343 100644 --- a/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.md5 +++ b/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.md5 @@ -1,3 +1,3 @@ -source_md5="be72581f8d77b814ac9889fc93c8b461" -dest_md5="57eb06d1fda0d5237f36ce2742847772" +source_md5="0ae6819d1c72602759296f9495d4291c" +dest_md5="200c6dad20dbce726f8b88c8784bdcf8" diff --git a/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.stex b/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.stex index 57a9acf..281288e 100644 Binary files a/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.stex and b/.import/tileset.png-c5c93db513ddde95335a41f222b4a0c0.stex differ diff --git a/Aseprite/bucket.ase b/Aseprite/bucket.ase index 11947c4..ca329e4 100644 Binary files a/Aseprite/bucket.ase and b/Aseprite/bucket.ase differ diff --git a/Aseprite/cannon.ase b/Aseprite/cannon.ase index 4cb4082..ba1beea 100644 Binary files a/Aseprite/cannon.ase and b/Aseprite/cannon.ase differ diff --git a/Ball/Ball.gd b/Ball/Ball.gd index f53f6f0..51d6682 100644 --- a/Ball/Ball.gd +++ b/Ball/Ball.gd @@ -53,7 +53,7 @@ func bounce_of(collider): apply_central_impulse(Vector2(0, -64)) func aim(): - cameraTransform.position = Vector2.ZERO + get_local_mouse_position().normalized() * 10 + cameraTransform.global_position = self.global_position + get_local_mouse_position().normalized() * 10 spawn_trajectory_dots() if(Input.is_action_just_released("shoot")): cameraTransform.position = Vector2.ZERO + linear_velocity.normalized() * 10 diff --git a/Ball/Ball.tscn b/Ball/Ball.tscn index 5feb9ae..0868ae1 100644 --- a/Ball/Ball.tscn +++ b/Ball/Ball.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Ball/sprite.png" type="Texture" id=1] [ext_resource path="res://Ball/Ball.gd" type="Script" id=2] @@ -8,6 +8,7 @@ [ext_resource path="res://Effects/greenParticle.png" type="Texture" id=6] [ext_resource path="res://Ball/aimingArrow.png" type="Texture" id=7] [ext_resource path="res://Ball/Arrow.gd" type="Script" id=8] +[ext_resource path="res://Ball/CameraTransform.gd" type="Script" id=9] [sub_resource type="ParticlesMaterial" id=1] lifetime_randomness = 0.5 @@ -74,7 +75,10 @@ linear_velocity = Vector2( 0, -10 ) script = ExtResource( 2 ) [node name="CameraTransform" type="RemoteTransform2D" parent="."] +pause_mode = 2 +position = Vector2( 0, 108 ) remote_path = NodePath("../../../Camera2D") +script = ExtResource( 9 ) [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0, -10 ) diff --git a/Ball/CameraTransform.gd b/Ball/CameraTransform.gd new file mode 100644 index 0000000..f1e4e11 --- /dev/null +++ b/Ball/CameraTransform.gd @@ -0,0 +1,4 @@ +extends RemoteTransform2D + +func _ready() -> void: + global_position = Vector2(384 / 2, 102) diff --git a/Bucket/Bucket.tscn b/Bucket/Bucket.tscn index 0dfa56d..e612659 100644 --- a/Bucket/Bucket.tscn +++ b/Bucket/Bucket.tscn @@ -27,6 +27,7 @@ z_index = -10 texture = ExtResource( 2 ) [node name="Bucketfront" type="Sprite" parent="."] +position = Vector2( 0, 5 ) z_index = 10 texture = ExtResource( 1 ) diff --git a/Bucket/bucket.png b/Bucket/bucket.png index 2e1f4b4..2b5d42c 100644 Binary files a/Bucket/bucket.png and b/Bucket/bucket.png differ diff --git a/Bucket/bucket.png.import b/Bucket/bucket.png.import index 2343a7d..75af449 100644 --- a/Bucket/bucket.png.import +++ b/Bucket/bucket.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Cannon/Cannon.tscn b/Cannon/Cannon.tscn index 7fbd01e..be6b340 100644 --- a/Cannon/Cannon.tscn +++ b/Cannon/Cannon.tscn @@ -7,13 +7,13 @@ position = Vector2( 192, 4 ) texture = ExtResource( 1 ) [node name="Left" type="Sprite" parent="."] -position = Vector2( -101.375, 0 ) -scale = Vector2( 34.25, 1 ) +position = Vector2( -169, 0 ) +scale = Vector2( 58.05, 1 ) texture = ExtResource( 1 ) hframes = 6 [node name="Right" type="Sprite" parent="."] -position = Vector2( 102.375, 0 ) -scale = Vector2( 34.25, 1 ) +position = Vector2( 134.688, 0 ) +scale = Vector2( 45.325, 1 ) texture = ExtResource( 1 ) hframes = 6 diff --git a/Cannon/tileset.png b/Cannon/tileset.png index 2e56f82..57963e4 100644 Binary files a/Cannon/tileset.png and b/Cannon/tileset.png differ diff --git a/Cannon/tileset.png.import b/Cannon/tileset.png.import index ef4b3d7..ea7ec36 100644 --- a/Cannon/tileset.png.import +++ b/Cannon/tileset.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/Menu/MainMenu.tscn b/Menu/MainMenu.tscn index 1cf8dbe..b425e89 100644 --- a/Menu/MainMenu.tscn +++ b/Menu/MainMenu.tscn @@ -129,6 +129,7 @@ margin_bottom = 165.0 [node name="MainMenuCam" type="Camera2D" parent="."] pause_mode = 2 +position = Vector2( 192, 108 ) current = true zoom = Vector2( 0.975, 0.975 ) limit_left = 0 diff --git a/Menu/MainMenuCam.gd b/Menu/MainMenuCam.gd index 49723ca..42ccf1f 100644 --- a/Menu/MainMenuCam.gd +++ b/Menu/MainMenuCam.gd @@ -1,4 +1,4 @@ extends Camera2D -func _process(delta: float) -> void: +func _process(_delta: float) -> void: global_position = lerp(global_position, get_global_mouse_position(), 0.05) diff --git a/Menu/Theme.sync-conflict-20211005-192154-INKEX2M.tres b/Menu/Theme.sync-conflict-20211005-192154-INKEX2M.tres deleted file mode 100644 index e78c98a..0000000 --- a/Menu/Theme.sync-conflict-20211005-192154-INKEX2M.tres +++ /dev/null @@ -1,642 +0,0 @@ -[gd_resource type="Theme" load_steps=31 format=2] - -[ext_resource path="res://Font/Yoster-island/Yoster16.tres" type="DynamicFont" id=1] -[ext_resource path="res://Font/Yoster-island/Yoster.ttf" type="DynamicFontData" id=2] -[ext_resource path="res://Menu/Icons/check/check1.png" type="Texture" id=3] -[ext_resource path="res://Menu/Icons/check/check2.png" type="Texture" id=4] - -[sub_resource type="DynamicFont" id=1] -font_data = ExtResource( 2 ) - -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) - -[sub_resource type="StyleBoxFlat" id=3] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0, 0, 0, 0 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.968627, 1, 0.682353, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=4] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 1, 0.701961, 0.796078, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=5] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=6] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0.588235, 0.984314, 0.780392, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=7] -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=8] -bg_color = Color( 0.588235, 0.984314, 0.780392, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=9] -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -expand_margin_top = 14.0 -expand_margin_bottom = 14.0 - -[sub_resource type="DynamicFont" id=10] -size = 18 -outline_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -font_data = ExtResource( 2 ) - -[sub_resource type="StyleBoxFlat" id=11] -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=12] -content_margin_left = 2.0 -content_margin_right = 2.0 -content_margin_top = 2.0 -content_margin_bottom = 2.0 -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -corner_detail = 1 -expand_margin_left = 2.0 -expand_margin_right = 2.0 -expand_margin_top = 2.0 -expand_margin_bottom = 2.0 - -[sub_resource type="StyleBoxFlat" id=13] - -[sub_resource type="StyleBoxFlat" id=14] - -[sub_resource type="StyleBoxFlat" id=15] -content_margin_left = 2.0 -content_margin_right = 2.0 -content_margin_top = 2.0 -content_margin_bottom = 2.0 -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) - -[sub_resource type="StyleBoxFlat" id=16] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=17] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=18] -content_margin_left = 4.0 -content_margin_right = 4.0 -content_margin_top = 4.0 -content_margin_bottom = 4.0 -bg_color = Color( 0.588235, 0.984314, 0.780392, 1 ) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=19] -bg_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=20] - -[sub_resource type="StyleBoxFlat" id=21] -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) - -[sub_resource type="StyleBoxFlat" id=22] - -[sub_resource type="StyleBoxFlat" id=23] -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=24] -bg_color = Color( 1, 0.701961, 0.796078, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=25] -bg_color = Color( 0.588235, 0.984314, 0.780392, 1 ) -border_width_left = 2 -border_width_top = 2 -border_width_right = 2 -border_width_bottom = 2 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[sub_resource type="StyleBoxFlat" id=26] -content_margin_right = 16.0 -bg_color = Color( 0.847059, 0.74902, 0.847059, 1 ) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) - -[resource] -default_font = ExtResource( 1 ) -Button/colors/font_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -Button/colors/font_color_disabled = Color( 0.454902, 0.337255, 0.607843, 1 ) -Button/colors/font_color_hover = Color( 0.454902, 0.337255, 0.607843, 1 ) -Button/colors/font_color_pressed = Color( 0.454902, 0.337255, 0.607843, 1 ) -Button/constants/hseparation = 2 -Button/fonts/font = SubResource( 1 ) -Button/styles/disabled = SubResource( 2 ) -Button/styles/focus = SubResource( 3 ) -Button/styles/hover = SubResource( 4 ) -Button/styles/normal = SubResource( 5 ) -Button/styles/pressed = SubResource( 6 ) -CheckBox/colors/font_color = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_hover = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) -CheckBox/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -CheckBox/constants/check_vadjust = 0 -CheckBox/constants/hseparation = 4 -CheckBox/fonts/font = null -CheckBox/icons/checked = ExtResource( 4 ) -CheckBox/icons/radio_checked = null -CheckBox/icons/radio_unchecked = null -CheckBox/icons/unchecked = ExtResource( 3 ) -CheckBox/styles/disabled = null -CheckBox/styles/focus = null -CheckBox/styles/hover = null -CheckBox/styles/hover_pressed = null -CheckBox/styles/normal = null -CheckBox/styles/pressed = null -CheckButton/colors/font_color = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_hover_pressed = Color( 0, 0, 0, 1 ) -CheckButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -CheckButton/constants/check_vadjust = 0 -CheckButton/constants/hseparation = 4 -CheckButton/fonts/font = null -CheckButton/icons/off = null -CheckButton/icons/off_disabled = null -CheckButton/icons/on = null -CheckButton/icons/on_disabled = null -CheckButton/styles/disabled = null -CheckButton/styles/focus = null -CheckButton/styles/hover = null -CheckButton/styles/hover_pressed = null -CheckButton/styles/normal = null -CheckButton/styles/pressed = null -ColorPicker/constants/h_width = 30 -ColorPicker/constants/label_width = 10 -ColorPicker/constants/margin = 4 -ColorPicker/constants/sv_height = 256 -ColorPicker/constants/sv_width = 256 -ColorPicker/icons/add_preset = null -ColorPicker/icons/color_hue = null -ColorPicker/icons/color_sample = null -ColorPicker/icons/overbright_indicator = null -ColorPicker/icons/preset_bg = null -ColorPicker/icons/screen_picker = null -ColorPickerButton/colors/font_color = Color( 0, 0, 0, 1 ) -ColorPickerButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -ColorPickerButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -ColorPickerButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -ColorPickerButton/constants/hseparation = 2 -ColorPickerButton/fonts/font = null -ColorPickerButton/icons/bg = null -ColorPickerButton/styles/disabled = null -ColorPickerButton/styles/focus = null -ColorPickerButton/styles/hover = null -ColorPickerButton/styles/normal = null -ColorPickerButton/styles/pressed = null -Dialogs/constants/button_margin = 32 -Dialogs/constants/margin = 8 -FileDialog/colors/file_icon_modulate = Color( 0, 0, 0, 1 ) -FileDialog/colors/files_disabled = Color( 0, 0, 0, 1 ) -FileDialog/colors/folder_icon_modulate = Color( 0, 0, 0, 1 ) -FileDialog/icons/file = null -FileDialog/icons/folder = null -FileDialog/icons/parent_folder = null -FileDialog/icons/reload = null -FileDialog/icons/toggle_hidden = null -Fonts/fonts/large = null -Fonts/fonts/normal = ExtResource( 1 ) -GraphEdit/colors/activity = Color( 0, 0, 0, 1 ) -GraphEdit/colors/grid_major = Color( 0, 0, 0, 1 ) -GraphEdit/colors/grid_minor = Color( 0, 0, 0, 1 ) -GraphEdit/colors/selection_fill = Color( 0, 0, 0, 1 ) -GraphEdit/colors/selection_stroke = Color( 0, 0, 0, 1 ) -GraphEdit/constants/bezier_len_neg = 160 -GraphEdit/constants/bezier_len_pos = 80 -GraphEdit/constants/port_grab_distance_horizontal = 48 -GraphEdit/constants/port_grab_distance_vertical = 6 -GraphEdit/icons/minimap = null -GraphEdit/icons/minus = null -GraphEdit/icons/more = null -GraphEdit/icons/reset = null -GraphEdit/icons/snap = null -GraphEdit/styles/bg = null -GraphEditMinimap/colors/resizer_color = Color( 0, 0, 0, 1 ) -GraphEditMinimap/icons/resizer = null -GraphEditMinimap/styles/bg = null -GraphEditMinimap/styles/camera = null -GraphEditMinimap/styles/node = null -GraphNode/colors/close_color = Color( 0, 0, 0, 1 ) -GraphNode/colors/resizer_color = Color( 0, 0, 0, 1 ) -GraphNode/colors/title_color = Color( 0, 0, 0, 1 ) -GraphNode/constants/close_offset = 18 -GraphNode/constants/port_offset = 3 -GraphNode/constants/separation = 1 -GraphNode/constants/title_offset = 20 -GraphNode/fonts/title_font = null -GraphNode/icons/close = null -GraphNode/icons/port = null -GraphNode/icons/resizer = null -GraphNode/styles/breakpoint = null -GraphNode/styles/comment = null -GraphNode/styles/commentfocus = null -GraphNode/styles/defaultfocus = null -GraphNode/styles/defaultframe = null -GraphNode/styles/frame = null -GraphNode/styles/position = null -GraphNode/styles/selectedframe = null -GridContainer/constants/hseparation = 4 -GridContainer/constants/vseparation = 4 -HBoxContainer/constants/separation = 4 -HScrollBar/icons/decrement = null -HScrollBar/icons/decrement_highlight = null -HScrollBar/icons/increment = null -HScrollBar/icons/increment_highlight = null -HScrollBar/styles/grabber = null -HScrollBar/styles/grabber_highlight = null -HScrollBar/styles/grabber_pressed = null -HScrollBar/styles/scroll = null -HScrollBar/styles/scroll_focus = null -HSeparator/constants/separation = 4 -HSeparator/styles/separator = null -HSlider/icons/grabber = null -HSlider/icons/grabber_disabled = null -HSlider/icons/grabber_highlight = null -HSlider/icons/tick = null -HSlider/styles/grabber_area = SubResource( 7 ) -HSlider/styles/grabber_area_highlight = SubResource( 8 ) -HSlider/styles/slider = SubResource( 9 ) -HSplitContainer/constants/autohide = 1 -HSplitContainer/constants/separation = 12 -HSplitContainer/icons/grabber = null -HSplitContainer/styles/bg = null -Icons/icons/close = null -ItemList/colors/font_color = Color( 0, 0, 0, 1 ) -ItemList/colors/font_color_selected = Color( 0, 0, 0, 1 ) -ItemList/colors/guide_color = Color( 0, 0, 0, 1 ) -ItemList/constants/hseparation = 4 -ItemList/constants/icon_margin = 4 -ItemList/constants/line_separation = 2 -ItemList/constants/vseparation = 2 -ItemList/fonts/font = null -ItemList/styles/bg = null -ItemList/styles/bg_focus = null -ItemList/styles/cursor = null -ItemList/styles/cursor_unfocused = null -ItemList/styles/selected = null -ItemList/styles/selected_focus = null -Label/colors/font_color = Color( 0.454902, 0.337255, 0.607843, 1 ) -Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) -Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) -Label/constants/line_spacing = 3 -Label/constants/shadow_as_outline = 0 -Label/constants/shadow_offset_x = 1 -Label/constants/shadow_offset_y = 1 -Label/fonts/font = SubResource( 10 ) -Label/styles/normal = null -LineEdit/colors/clear_button_color = Color( 0, 0, 0, 1 ) -LineEdit/colors/clear_button_color_pressed = Color( 0, 0, 0, 1 ) -LineEdit/colors/cursor_color = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) -LineEdit/colors/font_color_uneditable = Color( 0, 0, 0, 1 ) -LineEdit/colors/selection_color = Color( 0, 0, 0, 1 ) -LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null -LineEdit/icons/clear = null -LineEdit/styles/focus = null -LineEdit/styles/normal = null -LineEdit/styles/read_only = null -LinkButton/colors/font_color = Color( 0, 0, 0, 1 ) -LinkButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -LinkButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -LinkButton/constants/underline_spacing = 2 -LinkButton/fonts/font = null -LinkButton/styles/focus = null -MarginContainer/constants/margin_bottom = 0 -MarginContainer/constants/margin_left = 0 -MarginContainer/constants/margin_right = 0 -MarginContainer/constants/margin_top = 0 -MenuButton/colors/font_color = Color( 0, 0, 0, 1 ) -MenuButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -MenuButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -MenuButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -MenuButton/constants/hseparation = 3 -MenuButton/fonts/font = null -MenuButton/styles/disabled = null -MenuButton/styles/focus = null -MenuButton/styles/hover = null -MenuButton/styles/normal = null -MenuButton/styles/pressed = null -OptionButton/colors/font_color = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -OptionButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -OptionButton/constants/arrow_margin = 2 -OptionButton/constants/hseparation = 2 -OptionButton/fonts/font = null -OptionButton/icons/arrow = null -OptionButton/styles/disabled = null -OptionButton/styles/focus = null -OptionButton/styles/hover = null -OptionButton/styles/normal = null -OptionButton/styles/pressed = null -Panel/styles/panel = SubResource( 11 ) -PanelContainer/styles/panel = SubResource( 12 ) -PopupDialog/styles/panel = SubResource( 13 ) -PopupMenu/colors/font_color = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_accel = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_hover = Color( 0, 0, 0, 1 ) -PopupMenu/colors/font_color_separator = Color( 0, 0, 0, 1 ) -PopupMenu/constants/hseparation = 4 -PopupMenu/constants/vseparation = 4 -PopupMenu/fonts/font = null -PopupMenu/icons/checked = null -PopupMenu/icons/radio_checked = null -PopupMenu/icons/radio_unchecked = null -PopupMenu/icons/submenu = null -PopupMenu/icons/unchecked = null -PopupMenu/styles/hover = null -PopupMenu/styles/labeled_separator_left = null -PopupMenu/styles/labeled_separator_right = null -PopupMenu/styles/panel = null -PopupMenu/styles/panel_disabled = null -PopupMenu/styles/separator = null -PopupPanel/styles/panel = SubResource( 14 ) -ProgressBar/colors/font_color = Color( 0, 0, 0, 1 ) -ProgressBar/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -ProgressBar/fonts/font = null -ProgressBar/styles/bg = null -ProgressBar/styles/fg = null -RichTextLabel/colors/default_color = Color( 0, 0, 0, 1 ) -RichTextLabel/colors/font_color_selected = Color( 0, 0, 0, 1 ) -RichTextLabel/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -RichTextLabel/colors/selection_color = Color( 0, 0, 0, 1 ) -RichTextLabel/constants/line_separation = 1 -RichTextLabel/constants/shadow_as_outline = 0 -RichTextLabel/constants/shadow_offset_x = 1 -RichTextLabel/constants/shadow_offset_y = 1 -RichTextLabel/constants/table_hseparation = 3 -RichTextLabel/constants/table_vseparation = 3 -RichTextLabel/fonts/bold_font = null -RichTextLabel/fonts/bold_italics_font = null -RichTextLabel/fonts/italics_font = null -RichTextLabel/fonts/mono_font = null -RichTextLabel/fonts/normal_font = null -RichTextLabel/styles/focus = null -RichTextLabel/styles/normal = null -ScrollContainer/styles/bg = SubResource( 15 ) -SpinBox/icons/updown = null -TabContainer/colors/font_color_bg = Color( 0, 0, 0, 1 ) -TabContainer/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -TabContainer/colors/font_color_fg = Color( 0, 0, 0, 1 ) -TabContainer/constants/hseparation = 4 -TabContainer/constants/label_valign_bg = 2 -TabContainer/constants/label_valign_fg = 0 -TabContainer/constants/side_margin = 8 -TabContainer/constants/top_margin = 24 -TabContainer/fonts/font = null -TabContainer/icons/decrement = null -TabContainer/icons/decrement_highlight = null -TabContainer/icons/increment = null -TabContainer/icons/increment_highlight = null -TabContainer/icons/menu = null -TabContainer/icons/menu_highlight = null -TabContainer/styles/panel = SubResource( 16 ) -TabContainer/styles/tab_bg = SubResource( 17 ) -TabContainer/styles/tab_disabled = null -TabContainer/styles/tab_fg = SubResource( 18 ) -Tabs/colors/font_color_bg = Color( 0.454902, 0.337255, 0.607843, 1 ) -Tabs/colors/font_color_disabled = Color( 0.454902, 0.337255, 0.607843, 1 ) -Tabs/colors/font_color_fg = Color( 0.454902, 0.337255, 0.607843, 1 ) -Tabs/constants/hseparation = 8 -Tabs/constants/label_valign_bg = 2 -Tabs/constants/label_valign_fg = 0 -Tabs/constants/top_margin = 24 -Tabs/fonts/font = null -Tabs/icons/close = null -Tabs/icons/decrement = null -Tabs/icons/decrement_highlight = null -Tabs/icons/increment = null -Tabs/icons/increment_highlight = null -Tabs/styles/button = SubResource( 19 ) -Tabs/styles/button_pressed = null -Tabs/styles/panel = SubResource( 20 ) -Tabs/styles/tab_bg = SubResource( 21 ) -Tabs/styles/tab_disabled = null -Tabs/styles/tab_fg = null -TextEdit/colors/background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/bookmark_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/brace_mismatch_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/breakpoint_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/caret_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/code_folding_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_background_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_existing_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_font_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_scroll_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/completion_selected_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/current_line_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/executing_line_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/font_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/font_color_readonly = Color( 0, 0, 0, 1 ) -TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) -TextEdit/colors/function_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/line_number_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/mark_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/member_variable_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/number_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/safe_line_number_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/selection_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/symbol_color = Color( 0, 0, 0, 1 ) -TextEdit/colors/word_highlighted_color = Color( 0, 0, 0, 1 ) -TextEdit/constants/completion_lines = 7 -TextEdit/constants/completion_max_width = 50 -TextEdit/constants/completion_scroll_width = 3 -TextEdit/constants/line_spacing = 4 -TextEdit/fonts/font = null -TextEdit/icons/fold = null -TextEdit/icons/folded = null -TextEdit/icons/space = null -TextEdit/icons/tab = null -TextEdit/styles/completion = null -TextEdit/styles/focus = null -TextEdit/styles/normal = null -TextEdit/styles/read_only = null -ToolButton/colors/font_color = Color( 0, 0, 0, 1 ) -ToolButton/colors/font_color_disabled = Color( 0, 0, 0, 1 ) -ToolButton/colors/font_color_hover = Color( 0, 0, 0, 1 ) -ToolButton/colors/font_color_pressed = Color( 0, 0, 0, 1 ) -ToolButton/constants/hseparation = 3 -ToolButton/fonts/font = null -ToolButton/styles/disabled = null -ToolButton/styles/focus = null -ToolButton/styles/hover = null -ToolButton/styles/normal = null -ToolButton/styles/pressed = null -TooltipLabel/colors/font_color = Color( 0, 0, 0, 1 ) -TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 1 ) -TooltipLabel/constants/shadow_offset_x = 1 -TooltipLabel/constants/shadow_offset_y = 1 -TooltipLabel/fonts/font = null -TooltipPanel/styles/panel = SubResource( 22 ) -Tree/colors/custom_button_font_highlight = Color( 0, 0, 0, 1 ) -Tree/colors/drop_position_color = Color( 0, 0, 0, 1 ) -Tree/colors/font_color = Color( 0, 0, 0, 1 ) -Tree/colors/font_color_selected = Color( 0, 0, 0, 1 ) -Tree/colors/guide_color = Color( 0, 0, 0, 1 ) -Tree/colors/relationship_line_color = Color( 0, 0, 0, 1 ) -Tree/colors/title_button_color = Color( 0, 0, 0, 1 ) -Tree/constants/button_margin = 4 -Tree/constants/draw_guides = 1 -Tree/constants/draw_relationship_lines = 0 -Tree/constants/hseparation = 4 -Tree/constants/item_margin = 12 -Tree/constants/scroll_border = 4 -Tree/constants/scroll_speed = 12 -Tree/constants/vseparation = 4 -Tree/fonts/font = null -Tree/fonts/title_button_font = null -Tree/icons/arrow = null -Tree/icons/arrow_collapsed = null -Tree/icons/checked = null -Tree/icons/select_arrow = null -Tree/icons/unchecked = null -Tree/icons/updown = null -Tree/styles/bg = null -Tree/styles/bg_focus = null -Tree/styles/button_pressed = null -Tree/styles/cursor = null -Tree/styles/cursor_unfocused = null -Tree/styles/custom_button = null -Tree/styles/custom_button_hover = null -Tree/styles/custom_button_pressed = null -Tree/styles/selected = null -Tree/styles/selected_focus = null -Tree/styles/title_button_hover = null -Tree/styles/title_button_normal = null -Tree/styles/title_button_pressed = null -VBoxContainer/constants/separation = 4 -VScrollBar/icons/decrement = null -VScrollBar/icons/decrement_highlight = null -VScrollBar/icons/increment = null -VScrollBar/icons/increment_highlight = null -VScrollBar/styles/grabber = SubResource( 23 ) -VScrollBar/styles/grabber_highlight = SubResource( 24 ) -VScrollBar/styles/grabber_pressed = SubResource( 25 ) -VScrollBar/styles/scroll = SubResource( 26 ) -VScrollBar/styles/scroll_focus = null -VSeparator/constants/separation = 4 -VSeparator/styles/separator = null -VSlider/icons/grabber = null -VSlider/icons/grabber_disabled = null -VSlider/icons/grabber_highlight = null -VSlider/icons/tick = null -VSlider/styles/grabber_area = null -VSlider/styles/grabber_area_highlight = null -VSlider/styles/slider = null -VSplitContainer/constants/autohide = 1 -VSplitContainer/constants/separation = 12 -VSplitContainer/icons/grabber = null -VSplitContainer/styles/bg = null -WindowDialog/colors/title_color = Color( 0, 0, 0, 1 ) -WindowDialog/constants/close_h_ofs = 18 -WindowDialog/constants/close_v_ofs = 18 -WindowDialog/constants/scaleborder_size = 4 -WindowDialog/constants/title_height = 20 -WindowDialog/fonts/title_font = null -WindowDialog/icons/close = null -WindowDialog/icons/close_highlight = null -WindowDialog/styles/panel = null diff --git a/Menu/Theme.tres b/Menu/Theme.tres index 2c09d2f..b06434d 100644 --- a/Menu/Theme.tres +++ b/Menu/Theme.tres @@ -214,6 +214,7 @@ border_color = Color( 0.454902, 0.337255, 0.607843, 1 ) default_font = ExtResource( 1 ) Button/colors/font_color = Color( 0.454902, 0.337255, 0.607843, 1 ) Button/colors/font_color_disabled = Color( 0.454902, 0.337255, 0.607843, 1 ) +Button/colors/font_color_focus = Color( 0.454902, 0.337255, 0.607843, 1 ) Button/colors/font_color_hover = Color( 0.454902, 0.337255, 0.607843, 1 ) Button/colors/font_color_pressed = Color( 0.454902, 0.337255, 0.607843, 1 ) Button/constants/hseparation = 2 diff --git a/Pegs/Yellow/PowerupCards.gd b/Pegs/Yellow/PowerupCards.gd index d9e75ec..d9d69c1 100644 --- a/Pegs/Yellow/PowerupCards.gd +++ b/Pegs/Yellow/PowerupCards.gd @@ -3,7 +3,7 @@ extends Node2D var scenes = [] func _ready(): - GameStats.connect("powerup_picked", self, "queue_free") + var _connect = GameStats.connect("powerup_picked", self, "queue_free") scenes.append("res://Pegs/Yellow/PowerupCards/Scattershot.tscn") scenes.append("res://Pegs/Yellow/PowerupCards/Spring.tscn") diff --git a/Stages/Camera.gd b/Stages/Camera.gd index 7292c67..47b7e8b 100644 --- a/Stages/Camera.gd +++ b/Stages/Camera.gd @@ -1,5 +1,6 @@ extends Camera2D - +func _ready() -> void: + global_position = Vector2(384 / 2, -102) func _process(_delta): if GameStats.camera_fx: diff --git a/Stages/EmptyStage.tscn b/Stages/EmptyStage.tscn index 0a3a252..f0441d9 100644 --- a/Stages/EmptyStage.tscn +++ b/Stages/EmptyStage.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=2] +[gd_scene load_steps=26 format=2] [ext_resource path="res://Cannon/Cannon.tscn" type="PackedScene" id=1] [ext_resource path="res://Borders/tileset.png" type="Texture" id=2] @@ -143,11 +143,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) } ] 1/z_index = 0 -[sub_resource type="StreamTexture" id=11] -resource_local_to_scene = true -flags = 2 -load_path = "res://.import/sprite.png-06fb0593a7d59b4a8e86f4e1f0b64ea8.stex" - [sub_resource type="RectangleShape2D" id=12] extents = Vector2( 192, 10 ) @@ -171,7 +166,7 @@ show_collision = true collision_use_kinematic = true collision_mask = 0 format = 1 -tile_data = PoolIntArray( -655360, 1, 1, -655359, 1, 1, -655358, 1, 1, -655357, 1, 1, -655356, 1, 1, -655355, 1, 1, -655354, 1, 1, -655353, 1, 1, -655352, 1, 1, -655351, 1, 1, -655350, 1, 1, -655349, 1, 1, -655348, 1, 1, -655347, 1, 1, -655346, 1, 1, -655345, 1, 1, -655344, 1, 1, -655343, 1, 1, -655342, 1, 1, -655341, 1, 1, -655340, 1, 1, -655339, 1, 1, -655338, 1, 1, -655337, 1, 1, -655336, 1, 1, -655335, 1, 1, -655334, 1, 1, -655333, 1, 1, -655332, 1, 1, -655331, 1, 1, -655330, 1, 1, -655329, 1, 1, -655328, 1, 1, -655327, 1, 1, -655326, 1, 1, -655325, 1, 1, -655324, 1, 1, -655323, 1, 1, -655322, 1, 1, -655321, 1, 1, -655320, 1, 1, -655319, 1, 1, -655318, 1, 1, -655317, 1, 1, -655316, 1, 1, -655315, 1, 1, -655314, 1, 1, -655313, 1, 1, -589824, 1, 1, -589777, 1, 1, -524288, 1, 1, -524241, 1, 1, -458752, 1, 1, -458705, 1, 1, -393216, 1, 1, -393169, 1, 1, -327680, 1, 1, -327633, 1, 1, -262144, 1, 1, -262097, 1, 1, -196608, 1, 1, -196561, 1, 1, -131072, 1, 1, -131025, 1, 1, -65536, 1, 1, -65489, 1, 1, 0, 1, 1, 47, 1, 1, 65536, 1, 65538, 65583, 1, 1, 131072, 1, 65538, 131119, 1, 1, 196608, 1, 65538, 196655, 1, 1, 262144, 1, 65538, 262191, 1, 1, 327680, 1, 65538, 327727, 1, 1, 393216, 1, 65538, 393263, 1, 1, 458752, 1, 65538, 458799, 1, 1, 524288, 1, 65538, 524335, 1, 1, 589824, 1, 65538, 589871, 1, 1, 655360, 1, 65538, 655407, 1, 1, 720896, 1, 65538, 720943, 1, 1, 786432, 1, 65538, 786479, 1, 1, 851968, 1, 65538, 852015, 1, 1, 917504, 1, 65538, 917551, 1, 1, 983040, 1, 65538, 983087, 1, 1, 1048576, 1, 65538, 1048623, 1, 1, 1114112, 1, 65538, 1114159, 1, 1, 1179648, 1, 65538, 1179695, 1, 1, 1245184, 1, 65538, 1245231, 1, 1, 1310720, 1, 65537, 1310767, 1, 1, 1376256, 1, 1, 1376303, 1, 1, 1441792, 1, 1, 1441839, 1, 1, 1507328, 1, 1, 1507375, 1, 1, 1572864, 1, 1, 1572911, 1, 1, 1638400, 1, 1, 1638447, 1, 1, 1703936, 1, 1, 1703983, 1, 1, 1769472, 1, 1, 1769519, 1, 1, 1835008, 1, 1, 1835055, 1, 1, 1900544, 1, 1, 1900591, 1, 1, 1966080, 1, 1, 1966127, 1, 1, 2031616, 1, 1, 2031663, 1, 1, 2097152, 1, 1, 2097199, 1, 1, 2162688, 1, 1, 2162735, 1, 1, 2228224, 1, 1, 2228271, 1, 1 ) +tile_data = PoolIntArray( -655360, 1, 1, -655359, 1, 1, -655358, 1, 1, -655357, 1, 1, -655356, 1, 1, -655355, 1, 1, -655354, 1, 1, -655353, 1, 1, -655352, 1, 1, -655351, 1, 1, -655350, 1, 1, -655349, 1, 1, -655348, 1, 1, -655347, 1, 1, -655346, 1, 1, -655345, 1, 1, -655344, 1, 1, -655343, 1, 1, -655342, 1, 1, -655341, 1, 1, -655340, 1, 1, -655339, 1, 1, -655338, 1, 1, -655337, 1, 1, -655336, 1, 1, -655335, 1, 1, -655334, 1, 1, -655333, 1, 1, -655332, 1, 1, -655331, 1, 1, -655330, 1, 1, -655329, 1, 1, -655328, 1, 1, -655327, 1, 1, -655326, 1, 1, -655325, 1, 1, -655324, 1, 1, -655323, 1, 1, -655322, 1, 1, -655321, 1, 1, -655320, 1, 1, -655319, 1, 1, -655318, 1, 1, -655317, 1, 1, -655316, 1, 1, -655315, 1, 1, -655314, 1, 1, -655313, 1, 1, -589824, 1, 1, -589777, 1, 1, -524288, 1, 1, -524241, 1, 1, -458752, 1, 1, -458705, 1, 1, -393216, 1, 1, -393169, 1, 1, -327680, 1, 1, -327633, 1, 1, -262144, 1, 1, -262097, 1, 1, -196608, 1, 1, -196561, 1, 1, -131072, 1, 1, -131025, 1, 1, -65536, 1, 1, -65489, 1, 1, 65532, 1, 65538, 65533, 1, 65538, 65534, 1, 65538, 65535, 1, 65538, 0, 1, 1, 47, 1, 1, 48, 1, 65538, 49, 1, 65538, 50, 1, 65538, 51, 1, 65538, 131068, 1, 65538, 131069, 1, 65538, 131070, 1, 65538, 131071, 1, 65538, 65536, 1, 65538, 65583, 1, 1, 65584, 1, 65538, 65585, 1, 65538, 65586, 1, 65538, 65587, 1, 65538, 196604, 1, 65538, 196605, 1, 65538, 196606, 1, 65538, 196607, 1, 65538, 131072, 1, 65538, 131119, 1, 1, 131120, 1, 65538, 131121, 1, 65538, 131122, 1, 65538, 131123, 1, 65538, 262140, 1, 65538, 262141, 1, 65538, 262142, 1, 65538, 262143, 1, 65538, 196608, 1, 65538, 196655, 1, 1, 196656, 1, 65538, 196657, 1, 65538, 196658, 1, 65538, 196659, 1, 65538, 327676, 1, 65538, 327677, 1, 65538, 327678, 1, 65538, 327679, 1, 65538, 262144, 1, 65538, 262191, 1, 1, 262192, 1, 65538, 262193, 1, 65538, 262194, 1, 65538, 262195, 1, 65538, 393212, 1, 65538, 393213, 1, 65538, 393214, 1, 65538, 393215, 1, 65538, 327680, 1, 65538, 327727, 1, 65538, 327728, 1, 65538, 327729, 1, 65538, 327730, 1, 65538, 327731, 1, 65538, 458748, 1, 65538, 458749, 1, 65538, 458750, 1, 65538, 458751, 1, 65538, 393216, 1, 65538, 393263, 1, 65538, 393264, 1, 65538, 393265, 1, 65538, 393266, 1, 65538, 393267, 1, 65538, 524284, 1, 65538, 524285, 1, 65538, 524286, 1, 65538, 524287, 1, 65538, 458752, 1, 65538, 458799, 1, 65538, 458800, 1, 65538, 458801, 1, 65538, 458802, 1, 65538, 458803, 1, 65538, 589820, 1, 65538, 589821, 1, 65538, 589822, 1, 65538, 589823, 1, 65538, 524288, 1, 65538, 524335, 1, 65538, 524336, 1, 65538, 524337, 1, 65538, 524338, 1, 65538, 524339, 1, 65538, 655356, 1, 65538, 655357, 1, 65538, 655358, 1, 65538, 655359, 1, 65538, 589824, 1, 65538, 589871, 1, 65538, 589872, 1, 65538, 589873, 1, 65538, 589874, 1, 65538, 589875, 1, 65538, 720892, 1, 65538, 720893, 1, 65538, 720894, 1, 65538, 720895, 1, 65538, 655360, 1, 65538, 655407, 1, 65538, 655408, 1, 65538, 655409, 1, 65538, 655410, 1, 65538, 655411, 1, 65538, 786428, 1, 65538, 786429, 1, 65538, 786430, 1, 65538, 786431, 1, 65538, 720896, 1, 65538, 720943, 1, 65538, 720944, 1, 65538, 720945, 1, 65538, 720946, 1, 65538, 720947, 1, 65538, 851964, 1, 65538, 851965, 1, 65538, 851966, 1, 65538, 851967, 1, 65538, 786432, 1, 65538, 786479, 1, 1, 786480, 1, 65538, 786481, 1, 65538, 786482, 1, 65538, 786483, 1, 65538, 917500, 1, 65538, 917501, 1, 65538, 917502, 1, 65538, 917503, 1, 65538, 851968, 1, 65538, 852015, 1, 1, 852016, 1, 65538, 852017, 1, 65538, 852018, 1, 65538, 852019, 1, 65538, 983036, 1, 65538, 983037, 1, 65538, 983038, 1, 65538, 983039, 1, 65538, 917504, 1, 65538, 917551, 1, 1, 917552, 1, 65538, 917553, 1, 65538, 917554, 1, 65538, 917555, 1, 65538, 1048572, 1, 65538, 1048573, 1, 65538, 1048574, 1, 65538, 1048575, 1, 65538, 983040, 1, 65538, 983087, 1, 1, 983088, 1, 65538, 983089, 1, 65538, 983090, 1, 65538, 983091, 1, 65538, 1114108, 1, 65538, 1114109, 1, 65538, 1114110, 1, 65538, 1114111, 1, 65538, 1048576, 1, 65538, 1048623, 1, 1, 1048624, 1, 65538, 1048625, 1, 65538, 1048626, 1, 65538, 1048627, 1, 65538, 1179644, 1, 65538, 1179645, 1, 65538, 1179646, 1, 65538, 1179647, 1, 65538, 1114112, 1, 65538, 1114159, 1, 1, 1114160, 1, 65538, 1114161, 1, 65538, 1114162, 1, 65538, 1114163, 1, 65538, 1245180, 1, 65538, 1245181, 1, 65538, 1245182, 1, 65538, 1245183, 1, 65538, 1179648, 1, 65538, 1179695, 1, 1, 1179696, 1, 65538, 1179697, 1, 65538, 1179698, 1, 65538, 1179699, 1, 65538, 1310716, 1, 65538, 1310717, 1, 65538, 1310718, 1, 65538, 1310719, 1, 65538, 1245184, 1, 65538, 1245231, 1, 1, 1245232, 1, 65538, 1245233, 1, 65538, 1245234, 1, 65538, 1245235, 1, 65538, 1376252, 1, 65538, 1376253, 1, 65538, 1376254, 1, 65538, 1376255, 1, 65538, 1310720, 1, 65537, 1310767, 1, 1, 1310768, 1, 65538, 1310769, 1, 65538, 1310770, 1, 65538, 1310771, 1, 65538, 1441788, 1, 65538, 1441789, 1, 65538, 1441790, 1, 65538, 1441791, 1, 65538, 1376256, 1, 1, 1376303, 1, 65538, 1376304, 1, 65538, 1376305, 1, 65538, 1376306, 1, 65538, 1376307, 1, 65538, 1507324, 1, 65538, 1507325, 1, 65538, 1507326, 1, 65538, 1507327, 1, 65538, 1441792, 1, 1, 1441839, 1, 65538, 1441840, 1, 65538, 1441841, 1, 65538, 1441842, 1, 65538, 1441843, 1, 65538, 1572860, 1, 65538, 1572861, 1, 65538, 1572862, 1, 65538, 1572863, 1, 65538, 1507328, 1, 1, 1507375, 1, 65538, 1507376, 1, 65538, 1507377, 1, 65538, 1507378, 1, 65538, 1507379, 1, 65538, 1638396, 1, 65538, 1638397, 1, 65538, 1638398, 1, 65538, 1638399, 1, 65538, 1572864, 1, 1, 1572911, 1, 65538, 1572912, 1, 65538, 1572913, 1, 65538, 1572914, 1, 65538, 1572915, 1, 65538, 1703932, 1, 65538, 1703933, 1, 65538, 1703934, 1, 65538, 1703935, 1, 65538, 1638400, 1, 1, 1638447, 1, 65538, 1638448, 1, 65538, 1638449, 1, 65538, 1638450, 1, 65538, 1638451, 1, 65538, 1769468, 1, 65538, 1769469, 1, 65538, 1769470, 1, 65538, 1769471, 1, 65538, 1703936, 1, 1, 1703983, 1, 65538, 1703984, 1, 65538, 1703985, 1, 65538, 1703986, 1, 65538, 1703987, 1, 65538, 1835004, 1, 65538, 1835005, 1, 65538, 1835006, 1, 65538, 1835007, 1, 65538, 1769472, 1, 1, 1769519, 1, 65538, 1769520, 1, 65538, 1769521, 1, 65538, 1769522, 1, 65538, 1769523, 1, 65538, 1900540, 1, 65538, 1900541, 1, 65538, 1900542, 1, 65538, 1900543, 1, 65538, 1835008, 1, 1, 1835055, 1, 65538, 1835056, 1, 65538, 1835057, 1, 65538, 1835058, 1, 65538, 1835059, 1, 65538, 1966076, 1, 65538, 1966077, 1, 65538, 1966078, 1, 65538, 1966079, 1, 65538, 1900544, 1, 1, 1900591, 1, 1, 1900592, 1, 65538, 1900593, 1, 65538, 1900594, 1, 65538, 1900595, 1, 65538, 2031612, 1, 65538, 2031613, 1, 65538, 2031614, 1, 65538, 2031615, 1, 65538, 1966080, 1, 1, 1966127, 1, 1, 1966128, 1, 65538, 1966129, 1, 65538, 1966130, 1, 65538, 1966131, 1, 65538, 2097148, 1, 65538, 2097149, 1, 65538, 2097150, 1, 65538, 2097151, 1, 65538, 2031616, 1, 1, 2031663, 1, 1, 2031664, 1, 65538, 2031665, 1, 65538, 2031666, 1, 65538, 2031667, 1, 65538, 2162684, 1, 65538, 2162685, 1, 65538, 2162686, 1, 65538, 2162687, 1, 65538, 2097152, 1, 1, 2097199, 1, 1, 2097200, 1, 65538, 2097201, 1, 65538, 2097202, 1, 65538, 2097203, 1, 65538, 2228220, 1, 65538, 2228221, 1, 65538, 2228222, 1, 65538, 2228223, 1, 65538, 2162688, 1, 65538, 2162735, 1, 1, 2162736, 1, 65538, 2162737, 1, 65538, 2162738, 1, 65538, 2162739, 1, 65538, 2293756, 1, 65538, 2293757, 1, 65538, 2293758, 1, 65538, 2293759, 1, 65538, 2228224, 1, 65538, 2228271, 1, 1, 2228272, 1, 65538, 2228273, 1, 65538, 2228274, 1, 65538, 2228275, 1, 65538 ) [node name="Ball" parent="." instance=ExtResource( 3 )] position = Vector2( 192, 8 ) @@ -182,11 +177,19 @@ can_sleep = false [node name="CameraTransform" parent="Ball" index="0"] remote_path = NodePath("../../Camera") -[node name="Sprite" parent="Ball" index="1"] -texture = SubResource( 11 ) +[node name="ColorRect" type="ColorRect" parent="."] +margin_left = -32.0 +margin_top = -288.0 +margin_right = 416.0 +margin_bottom = 4.0 +color = Color( 0.454902, 0.337255, 0.607843, 1 ) +__meta__ = { +"_edit_use_anchors_": false +} [node name="Camera" type="Camera2D" parent="."] -position = Vector2( 192, 8 ) +pause_mode = 2 +position = Vector2( 192, 116 ) current = true zoom = Vector2( 0.975, 0.975 ) limit_left = 0 @@ -196,10 +199,6 @@ limit_bottom = 216 limit_smoothed = true smoothing_enabled = true smoothing_speed = 2.5 -drag_margin_left = 0.0 -drag_margin_top = 0.0 -drag_margin_right = 0.0 -drag_margin_bottom = 0.0 editor_draw_limits = true editor_draw_drag_margin = true script = ExtResource( 9 ) @@ -246,12 +245,13 @@ position = Vector2( 212, 126 ) position = Vector2( 163, 115 ) [node name="Bucket" parent="." instance=ExtResource( 6 )] -position = Vector2( 192, 209 ) +position = Vector2( 192, 206 ) [node name="HUD" parent="." instance=ExtResource( 7 )] [node name="Pause" parent="." instance=ExtResource( 14 )] [node name="PowerupCards" parent="." instance=ExtResource( 15 )] +position = Vector2( 0, 4 ) [editable path="Ball"] diff --git a/export_presets.cfg b/export_presets.cfg index 19d2aef..0c227c9 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -86,6 +86,7 @@ application/info="Made with Godot Engine" application/icon="" application/identifier="" application/signature="" +application/app_category="Games" application/short_version="1.0" application/version="1.0" application/copyright="" @@ -116,10 +117,20 @@ custom_template/release="" variant/export_type=0 vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false +html/export_icon=true html/custom_html_shell="" html/head_include="" html/canvas_resize_policy=2 +html/focus_canvas_on_start=true html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color( 0, 0, 0, 1 ) [preset.4] @@ -156,20 +167,21 @@ version/name="1.0" package/unique_name="gay.zoebat.$genname" package/name="" package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false launcher_icons/main_192x192="" launcher_icons/adaptive_foreground_432x432="" launcher_icons/adaptive_background_432x432="" graphics/32_bits_framebuffer=true graphics/opengl_debug=false xr_features/xr_mode=0 -xr_features/degrees_of_freedom=0 xr_features/hand_tracking=0 -xr_features/focus_awareness=false screen/immersive_mode=true screen/support_small=true screen/support_normal=true screen/support_large=true screen/support_xlarge=true +user_data_backup/allow=false command_line/extra_args="" apk_expansion/enable=false apk_expansion/SALT="" diff --git a/project.godot b/project.godot index fb2d7d2..fb9d72c 100644 --- a/project.godot +++ b/project.godot @@ -70,13 +70,13 @@ shoot={ } fast_forward={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":2,"pressed":false,"doubleclick":false,"script":null) ] } pause={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] }