diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..ddba7d3 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,18 @@ +github: HarmonyHoney +ko_fi: hhoney +custom: + - https://harmonymonroe.itch.io/ + - https://store.steampowered.com/developer/HarmonyMonroe + - https://www.youtube.com/@hhoney7 + +# Unused by keeping here as a reminder +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +polar: # Replace with a single Polar username +buy_me_a_coffee: # Replace with a single Buy Me a Coffee username +thanks_dev: # Replace with a single thanks.dev username diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index bcb2f5c..191445f 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -17,7 +17,7 @@ jobs: options: --privileged steps: - uses: actions/checkout@v4 - - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master + - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: tinycrate.flatpak manifest-path: linux/net.hhoney.tinycrate.yml diff --git a/.github/workflows/godot.yml b/.github/workflows/godot.yml index 19a5e30..733d58d 100644 --- a/.github/workflows/godot.yml +++ b/.github/workflows/godot.yml @@ -8,7 +8,7 @@ on: env: GODOT_VERSION: 3.6 - EXPORT_NAME: tinycrate-linux + EXPORT_NAME: tinycrate-ci jobs: export: @@ -53,4 +53,5 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} run: | - gh release upload '${{ github.ref_name }}' ${{ env.EXPORT_NAME }}.pck --repo '${{ github.repository }}' + mv '${{ env.EXPORT_NAME }}.pck' '${{ env.EXPORT_NAME }}-${{ github.ref_name }}.pck' + gh release upload '${{ github.ref_name }}' '${{ env.EXPORT_NAME }}-${{ github.ref_name }}.pck' --repo '${{ github.repository }}' diff --git a/export/butler_push.bat b/export/butler_push.bat index 67cd04c..b0bcc14 100644 --- a/export/butler_push.bat +++ b/export/butler_push.bat @@ -1,6 +1,6 @@ -butler push win hhoneysoftware/tinycrate-open:windows -butler push linux hhoneysoftware/tinycrate-open:linux -butler push mac hhoneysoftware/tinycrate-open:mac -butler push web hhoneysoftware/tinycrate-open:web -butler push android hhoneysoftware/tinycrate-open:android +butler push win hhoneysoftware/tinycrate:windows +butler push linux hhoneysoftware/tinycrate:linux +butler push mac hhoneysoftware/tinycrate:mac +butler push web hhoneysoftware/tinycrate:web +butler push android hhoneysoftware/tinycrate:android pause \ No newline at end of file diff --git a/export/ready_folders.bat b/export/ready_folders.bat index 883fb8f..e599547 100644 --- a/export/ready_folders.bat +++ b/export/ready_folders.bat @@ -1,9 +1,6 @@ rmdir /s /q android mkdir android -rmdir /s /q android-bundle -mkdir android-bundle - rmdir /s /q linux mkdir linux diff --git a/export/ready_folders.sh b/export/ready_folders.sh index 8d87c73..14a2ffc 100755 --- a/export/ready_folders.sh +++ b/export/ready_folders.sh @@ -1,9 +1,6 @@ rm -rf android mkdir android -rm -rf android-bundle -mkdir android-bundle - rm -rf linux mkdir linux diff --git a/export_presets.cfg b/export_presets.cfg index 19adadb..3506368 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -191,213 +191,6 @@ texture_format/etc2=false [preset.4] -name="Android AAB" -platform="Android" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="export/android-bundle/Tiny-Crate33-11.aab" -script_export_mode=1 -script_encryption_key="" - -[preset.4.options] - -custom_template/debug="" -custom_template/release="" -custom_build/use_custom_build=true -custom_build/export_format=1 -custom_build/min_sdk="" -custom_build/target_sdk="34" -architectures/armeabi-v7a=true -architectures/arm64-v8a=true -architectures/x86=false -architectures/x86_64=false -keystore/debug="" -keystore/debug_user="" -keystore/debug_password="" -keystore/release="C:/Dev/keys/harmony.keystore" -keystore/release_user="harmony" -keystore/release_password="harmony" -one_click_deploy/clear_previous_install=true -version/code=9 -version/name="1.0" -package/unique_name="harmonyhoney.tinycrate2" -package/name="Tiny Crate" -package/signed=true -package/classify_as_game=true -package/retain_data_on_uninstall=false -package/exclude_from_recents=false -launcher_icons/main_192x192="res://media/image/android_icon.png" -launcher_icons/adaptive_foreground_432x432="" -launcher_icons/adaptive_background_432x432="" -graphics/opengl_debug=false -xr_features/xr_mode=0 -xr_features/hand_tracking=0 -xr_features/hand_tracking_frequency=0 -xr_features/passthrough=0 -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="" -apk_expansion/public_key="" -permissions/custom_permissions=PoolStringArray( ) -permissions/access_checkin_properties=false -permissions/access_coarse_location=false -permissions/access_fine_location=false -permissions/access_location_extra_commands=false -permissions/access_mock_location=false -permissions/access_network_state=false -permissions/access_surface_flinger=false -permissions/access_wifi_state=false -permissions/account_manager=false -permissions/add_voicemail=false -permissions/authenticate_accounts=false -permissions/battery_stats=false -permissions/bind_accessibility_service=false -permissions/bind_appwidget=false -permissions/bind_device_admin=false -permissions/bind_input_method=false -permissions/bind_nfc_service=false -permissions/bind_notification_listener_service=false -permissions/bind_print_service=false -permissions/bind_remoteviews=false -permissions/bind_text_service=false -permissions/bind_vpn_service=false -permissions/bind_wallpaper=false -permissions/bluetooth=false -permissions/bluetooth_admin=false -permissions/bluetooth_privileged=false -permissions/brick=false -permissions/broadcast_package_removed=false -permissions/broadcast_sms=false -permissions/broadcast_sticky=false -permissions/broadcast_wap_push=false -permissions/call_phone=false -permissions/call_privileged=false -permissions/camera=false -permissions/capture_audio_output=false -permissions/capture_secure_video_output=false -permissions/capture_video_output=false -permissions/change_component_enabled_state=false -permissions/change_configuration=false -permissions/change_network_state=false -permissions/change_wifi_multicast_state=false -permissions/change_wifi_state=false -permissions/clear_app_cache=false -permissions/clear_app_user_data=false -permissions/control_location_updates=false -permissions/delete_cache_files=false -permissions/delete_packages=false -permissions/device_power=false -permissions/diagnostic=false -permissions/disable_keyguard=false -permissions/dump=false -permissions/expand_status_bar=false -permissions/factory_test=false -permissions/flashlight=false -permissions/force_back=false -permissions/get_accounts=false -permissions/get_package_size=false -permissions/get_tasks=false -permissions/get_top_activity_info=false -permissions/global_search=false -permissions/hardware_test=false -permissions/inject_events=false -permissions/install_location_provider=false -permissions/install_packages=false -permissions/install_shortcut=false -permissions/internal_system_window=false -permissions/internet=true -permissions/kill_background_processes=false -permissions/location_hardware=false -permissions/manage_accounts=false -permissions/manage_app_tokens=false -permissions/manage_documents=false -permissions/manage_external_storage=false -permissions/master_clear=false -permissions/media_content_control=false -permissions/modify_audio_settings=false -permissions/modify_phone_state=false -permissions/mount_format_filesystems=false -permissions/mount_unmount_filesystems=false -permissions/nfc=false -permissions/persistent_activity=false -permissions/post_notifications=false -permissions/process_outgoing_calls=false -permissions/read_calendar=false -permissions/read_call_log=false -permissions/read_contacts=false -permissions/read_external_storage=false -permissions/read_frame_buffer=false -permissions/read_history_bookmarks=false -permissions/read_input_state=false -permissions/read_logs=false -permissions/read_phone_state=false -permissions/read_profile=false -permissions/read_sms=false -permissions/read_social_stream=false -permissions/read_sync_settings=false -permissions/read_sync_stats=false -permissions/read_user_dictionary=false -permissions/reboot=false -permissions/receive_boot_completed=false -permissions/receive_mms=false -permissions/receive_sms=false -permissions/receive_wap_push=false -permissions/record_audio=false -permissions/reorder_tasks=false -permissions/restart_packages=false -permissions/send_respond_via_message=false -permissions/send_sms=false -permissions/set_activity_watcher=false -permissions/set_alarm=false -permissions/set_always_finish=false -permissions/set_animation_scale=false -permissions/set_debug_app=false -permissions/set_orientation=false -permissions/set_pointer_speed=false -permissions/set_preferred_applications=false -permissions/set_process_limit=false -permissions/set_time=false -permissions/set_time_zone=false -permissions/set_wallpaper=false -permissions/set_wallpaper_hints=false -permissions/signal_persistent_processes=false -permissions/status_bar=false -permissions/subscribed_feeds_read=false -permissions/subscribed_feeds_write=false -permissions/system_alert_window=false -permissions/transmit_ir=false -permissions/uninstall_shortcut=false -permissions/update_device_stats=false -permissions/use_credentials=false -permissions/use_sip=false -permissions/vibrate=false -permissions/wake_lock=false -permissions/write_apn_settings=false -permissions/write_calendar=false -permissions/write_call_log=false -permissions/write_contacts=false -permissions/write_external_storage=false -permissions/write_gservices=false -permissions/write_history_bookmarks=false -permissions/write_profile=false -permissions/write_secure_settings=false -permissions/write_settings=false -permissions/write_sms=false -permissions/write_social_stream=false -permissions/write_sync_settings=false -permissions/write_user_dictionary=false - -[preset.5] - name="Android APK" platform="Android" runnable=false @@ -409,7 +202,7 @@ export_path="export/android/Tiny-Crate.apk" script_export_mode=1 script_encryption_key="" -[preset.5.options] +[preset.4.options] custom_template/debug="" custom_template/release="" diff --git a/linux/net.hhoney.tinycrate.metainfo.xml b/linux/net.hhoney.tinycrate.metainfo.xml index 472c9be..e2c12cf 100644 --- a/linux/net.hhoney.tinycrate.metainfo.xml +++ b/linux/net.hhoney.tinycrate.metainfo.xml @@ -59,129 +59,7 @@ - - - -

Updated icon

-
-
- - -

Updated icon and under-the-hood cleanup

-
-
- - -

Patch 13 - Touch Controls Ghosting Fixed

-
    -
  • Little fix for touch controls!
  • -
  • The D-Pad control Actions are swapped when changing between Menu & Gameplay.
  • -
  • Any button held down when finishing a level would stay held down when starting a new level.
  • -
  • Now the actions all release when being swapped (:
  • -
-
-
- - -

Patch 12 / Virtual D-Pad & Title Colors

-
    -
  • Borderless Option
  • -
  • Palette Swaps on Start & Char Menu (-;
  • -
  • Virtual D-Pad Touch Controls !
  • -
  • Engine Upgrade to Godot 3.6
  • -
-
-
- - -

Tiny Patch - Touch Controls Rework & Volume Fix

-
    -
  • I reworked how the virtual joystick works with touch controls! some users had issues, i hope this works for you!
  • -
  • also fixed loading the volume options (-:
  • -
-
-
- - -

Tiny Patch! Victory Bell & Secret Shortcut

-
    -
  • Victory bell chime & blinking timer after finishing a level, or finishing FASTER !
  • -
  • Secret shortcut for Note on 2-1
  • -
-
-
- - -

Character Creator, Online Leaderboards, Speedruns + More!

-

Hello! A lot of love went into this March 2024 Tiny Crate Update (-:

-

Noteworthy changes:

-
    -
  • Character Creator
  • -
-

Style & Name your character! Pick a color for your Hat, Skin, Suit, Eyes & Shoes (= Submit Speedrun High Scores with your username!

-
    -
  • Online Leaderboards / Speedrunning
  • -
  • Speedrun Ghosts!
  • -
-

SilentWolf leaderboard backend has been integrated into Tiny Crate! Press Enter on level select to see the "Fastest Run" + "Fastest Note" high scores. Starting the level from either leaderboard will enable Speedrun Ghosts for that score! Ghosts are replays of your fastest runs completing the level (: Turn Ghosts On + Off in the Pause Menu!

-
    -
  • 10 New Maps!
  • -
  • Unique Color Palette for each world!
  • -
  • Crate Variety / Colors
  • -
-

10 New Maps have been added to level select, with a total of 36 Gems to collect! Each of the 5 Worlds now has a unique color palette standing out from one another (= Crates now pick 1 of 5 different Images to display, reversing the x-axis or color for more variety. Crate palette changed to improve contrast (:

-
    -
  • Rebind Keyboard & GamePad Inputs!
  • -
  • UI Input Display
  • -
-

I had been hearing of players with different keyboard layouts & other people having trouble playing Tiny Crate with the default keybindings! Now you can rebind the controls to any Keyboard or GamePad input you like! (-; These Inputs are shown on the UI in Menus.

-
    -
  • Pause Menu Rebuilt!
  • -
  • Gameplay Stats
  • -
-

Pausing a level will show your fastest runs in the top left corner, along with death accumulated. Options are now accessible through the Pause Menu & Enabling Speedrun Ghosts (:

-
    -
  • Touch Control Improvements!
  • -
-

I developed a new Virtual Joystick for touch screen devices! Mobile gameplay is now more intuitive & accessible with a full joystick to navigate! Coming Soon: X + C buttons will overlap to make double press easier

-
    -
  • Start Menu Overhaul
  • -
  • Save Slots (=
  • -
-

Tiny Crate now has 3 Save Slots holding up to Three different Characters! Erase & Modify saves from the Start Menu <3 This Menu has been redesigned to incorporate new additions (: At the moment, old saves will be discarded, sorry!

-
-
- - -

Secret Update!

-

Find a Music Note hidden in every level! <3

-
-
- - -

Tiny Touch! Touch Control Support! ^.^

-

Tiny Crate is now playable on your mobile devices with Touch Screen support!

-

Touch controls are visible by default on all touch devices!

-

Enable or disable Touch Controls in the options menu on any device!

-
-
- - -

Tiny Update! Fixed Framerate Processing! (:

-

A user reported the game was running too fast for them 0=

-

You'll understand if you use Godot:

-

I had a feeling this would happen as the whole game has been written with _process() xD

-

Now everything runs under _physics_process() at a fixed 60FPS! (:

-

<3 Hopefully this is a smoother experience for everyone! (:

-
-
- - -

Tiny Crate is released! Thanks for playing! <3

-
-
-
- + net.hhoney.tinycrate.desktop CC0-1.0 Unlicense diff --git a/linux/net.hhoney.tinycrate.releases.xml b/linux/net.hhoney.tinycrate.releases.xml new file mode 100644 index 0000000..6927f2f --- /dev/null +++ b/linux/net.hhoney.tinycrate.releases.xml @@ -0,0 +1,153 @@ + + + +

Updated logo and URLs

+
+
+ + +
    +
  • Option for Background Visibility
  • +
  • Adjust visibility from 0% to 100%
  • +
  • HHoney Software Logo color fix
  • +
+
+
+ + +
    +
  • 6 Save Slots
  • +
  • Local High Scores
  • +
  • More support for Touch Screens
  • +
  • Optimize level select screen, much faster
  • +
  • Display global time played on Options Menu
  • +
+

Save and Load Options for:

+
    +
  • Touch Screen: Toggle or Always
  • +
  • Window Size: x and y
  • +
  • View: Window, Window No Border, Fullscreen No Border, Exclusive Fullscreen
  • +
+
+
+ + +

Updated icon

+
+
+ + +

Updated icon and under-the-hood cleanup

+
+
+ + +

Patch 13 - Touch Controls Ghosting Fixed

+
    +
  • Little fix for touch controls!
  • +
  • The D-Pad control Actions are swapped when changing between Menu & Gameplay.
  • +
  • Any button held down when finishing a level would stay held down when starting a new level.
  • +
  • Now the actions all release when being swapped (:
  • +
+
+
+ + +

Patch 12 / Virtual D-Pad & Title Colors

+
    +
  • Borderless Option
  • +
  • Palette Swaps on Start & Char Menu (-;
  • +
  • Virtual D-Pad Touch Controls !
  • +
  • Engine Upgrade to Godot 3.6
  • +
+
+
+ + +

Tiny Patch - Touch Controls Rework & Volume Fix

+
    +
  • I reworked how the virtual joystick works with touch controls! some users had issues, i hope this works for you!
  • +
  • also fixed loading the volume options (-:
  • +
+
+
+ + +

Tiny Patch! Victory Bell & Secret Shortcut

+
    +
  • Victory bell chime & blinking timer after finishing a level, or finishing FASTER !
  • +
  • Secret shortcut for Note on 2-1
  • +
+
+
+ + +

Character Creator, Online Leaderboards, Speedruns + More!

+

Hello! A lot of love went into this March 2024 Tiny Crate Update (-:

+

Noteworthy changes:

+
    +
  • Character Creator
  • +
+

Style & Name your character! Pick a color for your Hat, Skin, Suit, Eyes & Shoes (= Submit Speedrun High Scores with your username!

+
    +
  • Online Leaderboards / Speedrunning
  • +
  • Speedrun Ghosts!
  • +
+

SilentWolf leaderboard backend has been integrated into Tiny Crate! Press Enter on level select to see the "Fastest Run" + "Fastest Note" high scores. Starting the level from either leaderboard will enable Speedrun Ghosts for that score! Ghosts are replays of your fastest runs completing the level (: Turn Ghosts On + Off in the Pause Menu!

+
    +
  • 10 New Maps!
  • +
  • Unique Color Palette for each world!
  • +
  • Crate Variety / Colors
  • +
+

10 New Maps have been added to level select, with a total of 36 Gems to collect! Each of the 5 Worlds now has a unique color palette standing out from one another (= Crates now pick 1 of 5 different Images to display, reversing the x-axis or color for more variety. Crate palette changed to improve contrast (:

+
    +
  • Rebind Keyboard & GamePad Inputs!
  • +
  • UI Input Display
  • +
+

I had been hearing of players with different keyboard layouts & other people having trouble playing Tiny Crate with the default keybindings! Now you can rebind the controls to any Keyboard or GamePad input you like! (-; These Inputs are shown on the UI in Menus.

+
    +
  • Pause Menu Rebuilt!
  • +
  • Gameplay Stats
  • +
+

Pausing a level will show your fastest runs in the top left corner, along with death accumulated. Options are now accessible through the Pause Menu & Enabling Speedrun Ghosts (:

+
    +
  • Touch Control Improvements!
  • +
+

I developed a new Virtual Joystick for touch screen devices! Mobile gameplay is now more intuitive & accessible with a full joystick to navigate! Coming Soon: X + C buttons will overlap to make double press easier

+
    +
  • Start Menu Overhaul
  • +
  • Save Slots (=
  • +
+

Tiny Crate now has 3 Save Slots holding up to Three different Characters! Erase & Modify saves from the Start Menu <3 This Menu has been redesigned to incorporate new additions (: At the moment, old saves will be discarded, sorry!

+
+
+ + +

Secret Update!

+

Find a Music Note hidden in every level! <3

+
+
+ + +

Tiny Touch! Touch Control Support! ^.^

+

Tiny Crate is now playable on your mobile devices with Touch Screen support!

+

Touch controls are visible by default on all touch devices!

+

Enable or disable Touch Controls in the options menu on any device!

+
+
+ + +

Tiny Update! Fixed Framerate Processing! (:

+

A user reported the game was running too fast for them 0=

+

You'll understand if you use Godot:

+

I had a feeling this would happen as the whole game has been written with _process() xD

+

Now everything runs under _physics_process() at a fixed 60FPS! (:

+

<3 Hopefully this is a smoother experience for everyone! (:

+
+
+ + +

Tiny Crate is released! Thanks for playing! <3

+
+
+
diff --git a/linux/net.hhoney.tinycrate.yml b/linux/net.hhoney.tinycrate.yml index 5f31c75..e4f2a49 100644 --- a/linux/net.hhoney.tinycrate.yml +++ b/linux/net.hhoney.tinycrate.yml @@ -28,3 +28,4 @@ modules: - install -Dm644 linux/${FLATPAK_ID}.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg - install -Dm644 linux/${FLATPAK_ID}-symbolic.svg ${FLATPAK_DEST}/share/icons/hicolor/symbolic/apps/${FLATPAK_ID}-symbolic.svg - install -Dm644 linux/${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml + - install -Dm644 linux/${FLATPAK_ID}.releases.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.releases.xml diff --git a/media/image/harmony-monroe-square-margin-white.png b/media/image/harmony-monroe-square-margin-white.png new file mode 100644 index 0000000..29a1e7b Binary files /dev/null and b/media/image/harmony-monroe-square-margin-white.png differ diff --git a/media/image/harmony-monroe-square-white.png b/media/image/harmony-monroe-square-white.png new file mode 100644 index 0000000..8d94fdb Binary files /dev/null and b/media/image/harmony-monroe-square-white.png differ diff --git a/media/image/harmony-monroe-white.png b/media/image/harmony-monroe-white.png new file mode 100644 index 0000000..1b4ea73 Binary files /dev/null and b/media/image/harmony-monroe-white.png differ diff --git a/media/image/screens/1.png b/media/image/screens/1.png index 1287c38..c34e0f5 100644 Binary files a/media/image/screens/1.png and b/media/image/screens/1.png differ diff --git a/media/image/screens/10.png b/media/image/screens/10.png index 705eb7e..d7e1d34 100644 Binary files a/media/image/screens/10.png and b/media/image/screens/10.png differ diff --git a/media/image/screens/5.png b/media/image/screens/5.png index d01d8ca..d5c2d12 100644 Binary files a/media/image/screens/5.png and b/media/image/screens/5.png differ diff --git a/media/image/screens/9.png b/media/image/screens/9.png index b2df8f9..7edf1c8 100644 Binary files a/media/image/screens/9.png and b/media/image/screens/9.png differ diff --git a/media/image/screens/steam/.gdignore b/media/image/screens/steam/.gdignore new file mode 100644 index 0000000..e69de29 diff --git a/media/image/screens/steam/1.png b/media/image/screens/steam/1.png new file mode 100644 index 0000000..ecf39e0 Binary files /dev/null and b/media/image/screens/steam/1.png differ diff --git a/media/image/screens/steam/10.png b/media/image/screens/steam/10.png new file mode 100644 index 0000000..41c06e0 Binary files /dev/null and b/media/image/screens/steam/10.png differ diff --git a/media/image/screens/steam/2.png b/media/image/screens/steam/2.png new file mode 100644 index 0000000..aa0ec33 Binary files /dev/null and b/media/image/screens/steam/2.png differ diff --git a/media/image/screens/steam/3.png b/media/image/screens/steam/3.png new file mode 100644 index 0000000..fe8e62b Binary files /dev/null and b/media/image/screens/steam/3.png differ diff --git a/media/image/screens/steam/4.png b/media/image/screens/steam/4.png new file mode 100644 index 0000000..00dd9e3 Binary files /dev/null and b/media/image/screens/steam/4.png differ diff --git a/media/image/screens/steam/5.png b/media/image/screens/steam/5.png new file mode 100644 index 0000000..13bf872 Binary files /dev/null and b/media/image/screens/steam/5.png differ diff --git a/media/image/screens/steam/6.png b/media/image/screens/steam/6.png new file mode 100644 index 0000000..6edb5d3 Binary files /dev/null and b/media/image/screens/steam/6.png differ diff --git a/media/image/screens/steam/7.png b/media/image/screens/steam/7.png new file mode 100644 index 0000000..9cdc513 Binary files /dev/null and b/media/image/screens/steam/7.png differ diff --git a/media/image/screens/steam/8.png b/media/image/screens/steam/8.png new file mode 100644 index 0000000..db01f8e Binary files /dev/null and b/media/image/screens/steam/8.png differ diff --git a/media/image/screens/steam/9.png b/media/image/screens/steam/9.png new file mode 100644 index 0000000..ade1085 Binary files /dev/null and b/media/image/screens/steam/9.png differ diff --git a/media/image/tinyArrow5.png b/media/image/tinyArrow5.png new file mode 100644 index 0000000..9ff9100 Binary files /dev/null and b/media/image/tinyArrow5.png differ diff --git a/media/image/title_splash-tiny.png b/media/image/title_splash-tiny.png new file mode 100644 index 0000000..13eb78d Binary files /dev/null and b/media/image/title_splash-tiny.png differ diff --git a/project.godot b/project.godot index fab076c..0887fe0 100644 --- a/project.godot +++ b/project.godot @@ -54,11 +54,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://src/class/savedict.gd" }, { -"base": "Resource", -"class": "StagePreview", -"language": "GDScript", -"path": "res://src/stage/preview.gd" -}, { "base": "Actor", "class": "Switch", "language": "GDScript", @@ -79,7 +74,6 @@ _global_script_class_icons={ "Passthrough": "", "Player": "", "SaveDict": "", -"StagePreview": "", "Switch": "", "SwitchBlock": "" } @@ -87,12 +81,12 @@ _global_script_class_icons={ [application] config/name="Tiny Crate" -config/description="Tiny Crate by Harmony Honey -hhoney.net" +config/description="Tiny Crate by Harmony Honey Monroe +harmonymonroe.com" run/main_scene="res://src/menu/splash.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="tiny_crate" -boot_splash/image="res://media/image/title_splash-pixel.png" +boot_splash/image="res://media/image/harmony-monroe-square-white.png" boot_splash/use_filter=false boot_splash/bg_color=Color( 0, 0, 0, 1 ) config/icon="res://media/image/icon.png" @@ -115,8 +109,8 @@ KeyMenu="*res://src/menu/options/KeyMenu.tscn" window/size/width=228 window/size/height=128 -window/size/test_width=1280 -window/size/test_height=720 +window/size/test_width=1140 +window/size/test_height=640 window/dpi/allow_hidpi=true window/stretch/mode="viewport" window/stretch/aspect="keep_height" diff --git a/readme.md b/readme.md index 58408d1..e57328d 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ Made with Godot 3.6 Precision Puzzle Platformer Game -Full Game at [hhoneysoftware.itch.io/tinycrate](https://hhoneysoftware.itch.io/tinycrate) ! (: +Play on itch.io [harmonymonroe.itch.io/tinycrate](https://harmonymonroe.itch.io/tinycrate) ! (: ## License This is free and unencumbered software! See [UNLICENSE](UNLICENSE) for more information. diff --git a/src/actor/BoxSpawner.gd b/src/actor/BoxSpawner.gd index 8d5297f..e9650fe 100644 --- a/src/actor/BoxSpawner.gd +++ b/src/actor/BoxSpawner.gd @@ -13,6 +13,10 @@ export var color := "red" var box = preload("res://src/actor/Box.tscn") func _ready(): + if Shared.is_level_select: + node_anim.advance(0.5) + return + for i in get_tree().get_nodes_in_group("switch_" + color): i.connect("press", self, "release") diff --git a/src/actor/BoxSpawner.tscn b/src/actor/BoxSpawner.tscn index d6c2c8e..a2a4720 100644 --- a/src/actor/BoxSpawner.tscn +++ b/src/actor/BoxSpawner.tscn @@ -96,6 +96,7 @@ vframes = 8 frame = 15 [node name="Sprite2" type="Sprite" parent="."] +visible = false position = Vector2( 4, 4 ) z_index = 50 z_as_relative = false diff --git a/src/actor/Note.gd b/src/actor/Note.gd index e38c12e..f15ef4d 100644 --- a/src/actor/Note.gd +++ b/src/actor/Note.gd @@ -12,6 +12,7 @@ export var palette : PoolColorArray func _ready(): if Shared.is_level_select: visible = false + queue_free() return if Engine.editor_hint: return diff --git a/src/actor/Player.gd b/src/actor/Player.gd index 6ce41ea..cbffde8 100644 --- a/src/actor/Player.gd +++ b/src/actor/Player.gd @@ -71,7 +71,7 @@ func _ready(): btnx_array.append(0) # assign camera target - if !is_attract_mode and Shared.cam: + if !is_attract_mode: Shared.cam.node_target = self Shared.cam.pos_target_offset = Vector2(4, 4) diff --git a/src/actor/Switch.gd b/src/actor/Switch.gd index 9bc9757..d2e3e04 100644 --- a/src/actor/Switch.gd +++ b/src/actor/Switch.gd @@ -14,11 +14,11 @@ signal press signal release func _enter_tree(): - if Engine.editor_hint: return + if Engine.editor_hint or Shared.is_level_select: return add_to_group("switch_" + color) func _physics_process(delta): - if Engine.editor_hint: return + if Engine.editor_hint or Shared.is_level_select: return is_last = is_on is_on = is_area_solid_actor(position.x, position.y) diff --git a/src/autoload/Pause.tscn b/src/autoload/Pause.tscn index 9768c6f..ff545a2 100644 --- a/src/autoload/Pause.tscn +++ b/src/autoload/Pause.tscn @@ -20,6 +20,7 @@ font_data = ExtResource( 6 ) [node name="Pause" type="CanvasLayer"] pause_mode = 2 +layer = 20 script = ExtResource( 3 ) __meta__ = { "_edit_horizontal_guides_": [ -19.0 ] diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 2a7fc53..144475b 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -2,10 +2,11 @@ extends Node onready var node_ghost := $Ghost onready var node_ghosts := $Ghosts +onready var cam := $Cam + var ghosts := [] var ghost_count := 10 -var cam : Camera2D var map_solid : TileMap var map_obscure : TileMap @@ -34,19 +35,19 @@ var save_path := "user://save/" var save_filename := "box.save" var keys_path := "keys.tres" var options_path := "options.tres" -var scene_dict := {} var replays := [{}, {}, {}, {}, {}, {}, {}] var is_save := false var last_menu := "main" var last_cursor := 0 -var window_scale := 1 var view_size := Vector2(228, 128) var bus_volume = [10, 10, 10] var actors := [] var player +var map_dict : Dictionary = load("res://src/stage/sheet.tres").dict + var map_select := 0 var maps := [] var map_name := "" @@ -78,6 +79,9 @@ var last_palette = -1 var time_elapsed := 0 var auto_save_clock := 0 var auto_save_time := 1800 +var window_option := 0 setget set_window_option +var background_option := 10 setget set_background_option +signal background_signal func _ready(): print("Shared._ready(): ") @@ -89,11 +93,6 @@ func _ready(): ghosts.append(g) node_ghost.visible = false - # scale window - window_scale = floor(OS.get_screen_size().x / get_viewport().size.x) - window_scale = max(1, floor(window_scale * 0.9)) - set_window_scale() - # lower volume for i in [1, 2]: set_bus_volume(i, 7) @@ -102,26 +101,15 @@ func _ready(): var dir = Directory.new() if !dir.open(save_path) == OK: dir.make_dir(save_path) - for i in range(save_limit) + ["map"]: + + for i in save_limit: var s = save_path + str(i) if !dir.open(s) == OK: dir.make_dir(s) - # get all maps for i in dir_list(map_dir): - var lm = load(map_dir + i) - var map_short = str(i.split(".")[0]) - - scene_dict[map_dir + i] = lm - maps.append(map_short) - - var inst = lm.instance() - make_preview(inst, map_short) - - #print("maps: ", maps, " ", maps.size(), " ", scene_dict) - - + maps.append(i.split(".")[0]) load_options() @@ -131,78 +119,6 @@ func _ready(): Wipe.connect("finish", self, "wipe_finish") -func make_preview(inst : Node, map_short): - # make preview - var sp = StagePreview.new() - sp.palette = inst.palette - - for c in inst.get_children(): - var cname = c.name.to_lower() - - var cells = [] - if "map" in cname: - cells = c.get_used_cells() - - if "spike" in cname: - for p in cells: - sp.spike += vec_string(p) + " " - - elif "solid" in cname: - for p in cells: - make_key(p, c, sp.solid, 1) - - elif "detail" in cname: - for p in cells: - make_key(p, c, sp.detail) - - elif "obscure" in cname: - for p in cells: - make_key(p, c, sp.obscure, 0) - - elif "camera" in cname: - var p = c.position - sp.camera = vec_string(p) - - elif "actors" in cname: - for a in c.get_children(): - var aname = a.name.to_lower() - - var p = Vector2.ZERO - if a is Node2D: - p = a.position - - if "player" in aname: - sp.player = vec_string(p) - - elif "exit" in aname: - sp.exit = vec_string(p) - - elif "box" in aname: - sp.box += vec_string(p) + " " - - - - ResourceSaver.save(save_path + "map/" + map_short + ".tres", sp) - -func vec_string(p : Vector2): - return str(int(p.x)) + "," + str(int(p.y)) - -func make_key(p : Vector2, c : TileMap, dict : Dictionary, skip_id := -1): - var id = c.get_cellv(p) - if id == skip_id: - return - var coord = c.get_cell_autotile_coord(p.x, p.y) - - var t = c.is_cell_transposed(p.x, p.y) - var x = c.is_cell_x_flipped(p.x, p.y) - var y = c.is_cell_y_flipped(p.x, p.y) - var key = str(id) + " " + str(int(coord.x)) + " " + str(int(t)) + str(int(x)) + str(int(y)) - - if !dict.has(key): - dict[key] = "" - - dict[key] += vec_string(p) + " " - func _input(event): var joy = event is InputEventJoypadButton or event is InputEventJoypadMotion if is_gamepad != joy: @@ -275,9 +191,7 @@ func change_map(): if is_win: save_replays() - if !scene_dict.has(scene_path): - scene_dict[scene_path] = load(scene_path) - get_tree().change_scene_to(scene_dict[scene_path]) + get_tree().change_scene_to(load(scene_path)) is_win = false is_save = false @@ -399,11 +313,30 @@ func load_keys(path := keys_path): for e in r.dict[a]: InputMap.action_add_event(a, e) +func set_window_option(arg := window_option): + window_option = clamp(arg, 0, 4) + OS.window_borderless = window_option == 1 or window_option == 2 + OS.window_fullscreen = window_option == 3 + if window_option == 2: + OS.window_size = OS.get_screen_size() + + OS.set_window_position(Vector2.ZERO if window_option == 2 else (OS.get_screen_size() * 0.5 - OS.get_window_size() * 0.5)) + Input.mouse_mode = Input.MOUSE_MODE_VISIBLE if window_option < 3 else Input.MOUSE_MODE_HIDDEN + +func set_background_option(arg := background_option): + background_option = clamp(arg, 0, 10) + emit_signal("background_signal") + func save_options(path := options_path): var data = {} data["sfx"] = bus_volume[1] - data["music"] = bus_volume[2] - data["fullscreen"] = int(OS.window_fullscreen) + data["ost"] = bus_volume[2] + data["touch"] = int(TouchScreen.is_stay) + data["full"] = int(OS.window_fullscreen) + data["view"] = int(window_option) + var ws = OS.window_size + data["size"] = str(ws.x) + "," + str(ws.y) + data["back"] = int(background_option) data["time"] = time_elapsed print("save_options, path: ", path, " time: ", time_elapsed) @@ -419,12 +352,23 @@ func load_options(path := options_path): var v = int(dict["sfx"]) bus_volume[1] = v set_bus_volume(1, v) - if dict.has("music"): - var v = int(dict["music"]) + if dict.has("ost"): + var v = int(dict["ost"]) bus_volume[2] = v set_bus_volume(2, v) - if dict.has("fullscreen"): - set_fullscreen(bool(dict["fullscreen"])) + if dict.has("full"): + set_fullscreen(bool(dict["full"])) + if dict.has("touch"): + TouchScreen.is_stay = bool(dict["touch"]) + if dict.has("view"): + self.window_option = int(dict["view"]) + if dict.has("size"): + var ws = str(dict["size"]).split_floats(",", false) + if ws.size() == 2: + OS.window_size = Vector2(float(ws[0]), float(ws[1])) + set_window_option() + if dict.has("back"): + self.background_option = int(dict["back"]) if dict.has("time"): time_elapsed = abs(int(dict["time"])) @@ -437,13 +381,13 @@ func delete_slot(_slot := save_slot): dir.remove(fname) fname = dir.get_next() - replays[_slot] = {} + replays[_slot] = {} load_save(_slot) func save_replays(arg := replay_map, _slot := save_slot): save_file(save_path + str(_slot) + "/" + arg + ".save", JSON.print(replays[save_slot][arg], "\t")) -func load_save(_slot = save_slot, is_reload := false): +func load_save(_slot = save_slot): save_slot = clamp(_slot, 0, save_limit - 1) var save_string = save_path + str(save_slot) + "/" + save_filename @@ -456,14 +400,13 @@ func load_save(_slot = save_slot, is_reload := false): save_clock = 0.0 var dict := {} - if is_reload: dict = save_data[_slot] if dict.empty(): var l = load_file(save_string) if l: dict = JSON.parse(l).result else: print(save_string + " not found") - print(_slot, " / ", dict) + print(save_slot, " / ", dict) if !dict.empty(): if dict.has("clock"): save_clock = dict["clock"] @@ -512,9 +455,6 @@ func generate_username(): var _name = pf[0] + middle[0] + sf[0] + end[0] + str(randi() % 100) return _name -func delete_save(): - print("delete save") - func unlock(): print("unlock") @@ -621,14 +561,6 @@ func set_bus_volume(_bus := 1, _vol := 5): bus_volume[_bus] = clamp(_vol, 0, 10) AudioServer.set_bus_volume_db(_bus, linear2db(bus_volume[_bus] / 10.0)) -func set_window_scale(arg := window_scale): - window_scale = max(1, arg if arg else window_scale) - if OS.get_name() != "HTML5": - OS.window_size = Vector2(view_size.x * window_scale, view_size.y * window_scale) - # center window - OS.set_window_position(OS.get_screen_size() * 0.5 - OS.get_window_size() * 0.5) - return "window_scale: " + str(window_scale) + " - resolution: " + str(OS.get_window_size()) - func get_all_children(n, a := []): if is_instance_valid(n): a.append(n) diff --git a/src/autoload/Shared.tscn b/src/autoload/Shared.tscn index e059746..34e0d0f 100644 --- a/src/autoload/Shared.tscn +++ b/src/autoload/Shared.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/autoload/Shared.gd" type="Script" id=1] [ext_resource path="res://media/image/player_swap.png" type="Texture" id=2] [ext_resource path="res://src/shader/player_palette_swap.gdshader" type="Shader" id=3] +[ext_resource path="res://src/stage/Cam.gd" type="Script" id=4] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 3 ) @@ -32,3 +33,7 @@ vframes = 2 region_rect = Rect2( 0, 0, 8, 24 ) [node name="Ghosts" type="Node2D" parent="."] + +[node name="Cam" type="Camera2D" parent="." groups=["game_camera"]] +current = true +script = ExtResource( 4 ) diff --git a/src/autoload/UI.tscn b/src/autoload/UI.tscn index 4b0b3eb..47a1358 100644 --- a/src/autoload/UI.tscn +++ b/src/autoload/UI.tscn @@ -69,7 +69,7 @@ font_data = ExtResource( 1 ) [node name="UI" type="CanvasLayer"] pause_mode = 2 -layer = 5 +layer = 50 script = ExtResource( 3 ) pos_left = 60 pos_right = 184 diff --git a/src/autoload/Wipe.gd b/src/autoload/Wipe.gd index 99ef43c..c4e6910 100644 --- a/src/autoload/Wipe.gd +++ b/src/autoload/Wipe.gd @@ -53,7 +53,7 @@ func item_rect(): mat.set_shader_param("size", (image.rect_size / Vector2(228, 128)) * Vector2(14.25, 8)) mat.set_shader_param("offset", Vector2(fposmod(image.rect_size.x / 32, 1.0), 0)) - print(mat.get_shader_param("size"), " / ", mat.get_shader_param("offset")) + #print(mat.get_shader_param("size"), " / ", mat.get_shader_param("offset")) func set_duration(arg): duration = arg diff --git a/src/autoload/Wipe.tscn b/src/autoload/Wipe.tscn index e5924b5..79bdd2a 100644 --- a/src/autoload/Wipe.tscn +++ b/src/autoload/Wipe.tscn @@ -15,7 +15,7 @@ shader_param/tex = ExtResource( 2 ) [node name="Wipe" type="CanvasLayer"] pause_mode = 2 -layer = 10 +layer = 100 script = ExtResource( 1 ) duration = 0.35 diff --git a/src/autoload/touch_screen.gd b/src/autoload/touch_screen.gd index 64e7aa2..ff7ad4c 100644 --- a/src/autoload/touch_screen.gd +++ b/src/autoload/touch_screen.gd @@ -9,13 +9,20 @@ onready var buttons := [$Control/HBoxRight/C/Control/Button, $Control/HBoxRight/ onready var btns := $Control/DPad/Buttons.get_children() onready var actions := InputMap.get_actions() +export var is_stay := false + func _ready(): connect("visibility_changed", self, "vis") yield(get_tree(), "idle_frame") - visible = (OS.has_touchscreen_ui_hint() and OS.get_name() == "HTML5") or OS.get_name() == "Android" vis() +func _input(event): + if event is InputEventScreenTouch or event is InputEventScreenDrag: + visible = true + elif event is InputEventKey or event is InputEventJoypadButton or event is InputEventJoypadMotion: + visible = is_stay + func vis(): if is_instance_valid(UI.keys_node): UI.keys_node.visible = !visible diff --git a/src/autoload/touch_screen.tscn b/src/autoload/touch_screen.tscn index 13c7d94..f7a2363 100644 --- a/src/autoload/touch_screen.tscn +++ b/src/autoload/touch_screen.tscn @@ -35,7 +35,7 @@ points = PoolVector2Array( 2.12132, -2.12132, 3.57746e-08, -3, -2.12132, -2.1213 [node name="TouchScreen" type="CanvasLayer"] pause_mode = 2 -layer = 6 +layer = 60 script = ExtResource( 1 ) [node name="Control" type="Control" parent="."] diff --git a/src/map/1-1.tscn b/src/map/1-1.tscn index 2f4ec2d..52fcad0 100644 --- a/src/map/1-1.tscn +++ b/src/map/1-1.tscn @@ -2,7 +2,6 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -16,6 +15,7 @@ [ext_resource path="res://media/image/8pixel.png" type="Texture" id=14] [ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=15] [ext_resource path="res://media/image/bricks.png" type="Texture" id=16] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=17] [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" @@ -176,7 +176,8 @@ tile_data = PoolIntArray( -393212, 5, 2, -393211, 536870917, 0, -393210, -161061 tile_set = SubResource( 6 ) tile_data = PoolIntArray( -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -327685, 536870912, 0, -327684, 536870912, 0, -327683, 536870912, 0, -327682, 536870912, 0, -327681, 536870912, 0, -393216, 536870912, 0, -393215, 536870912, 0, -393214, 536870912, 0, -393213, 536870912, 0, -393212, 536870912, 0, -393211, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0, -262150, 536870912, 0, -262149, 536870912, 0, -262148, 536870912, 0, -262147, 536870912, 0, -262146, 536870912, 0, -262145, 0, 0, -327680, 0, 0, -327679, 536870912, 0, -327678, 536870912, 0, -327677, 536870912, 0, -327676, 536870912, 0, -327675, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -196615, 536870912, 0, -196614, 536870912, 0, -196613, 536870912, 0, -196612, 536870912, 0, -196611, 536870912, 0, -196610, 536870912, 0, -196609, 0, 0, -262144, 0, 0, -262143, 536870912, 0, -262142, 536870912, 0, -262141, 536870912, 0, -262140, 536870912, 0, -262139, 536870912, 0, -262138, 536870912, 0, -262137, 536870912, 0, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870912, 0, -131079, 536870912, 0, -131078, 536870912, 0, -131077, 536870912, 0, -131076, 536870912, 0, -131075, 536870912, 0, -131074, 536870912, 0, -131073, 536870912, 0, -196608, 536870912, 0, -196607, 536870912, 0, -196606, 536870912, 0, -196605, 536870912, 0, -196604, 536870912, 0, -196603, 536870912, 0, -196602, 536870912, 0, -196601, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -65550, 536870912, 0, -65549, 536870912, 0, -65548, 536870912, 0, -65547, 536870912, 0, -65546, 536870912, 0, -65545, 536870912, 0, -65544, 536870914, 2, -65543, 2, 3, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0, -65527, 536870912, 0, -65526, 536870912, 0, -65525, 536870912, 0, -65524, 536870912, 0, -65523, 536870912, 0, 8, 2, 3, 9, 536870912, 0, 10, 536870912, 0, 11, 536870912, 0, 12, 536870912, 0, 13, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] +script = ExtResource( 17 ) [node name="Actors" type="Node2D" parent="."] @@ -239,5 +240,3 @@ margin_right = 50.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 4 ) text = "move" - -[editable path="GameCamera"] diff --git a/src/map/1-2.tscn b/src/map/1-2.tscn index dd01921..3f583df 100644 --- a/src/map/1-2.tscn +++ b/src/map/1-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -176,7 +176,8 @@ tile_data = PoolIntArray( -458747, 2, 0, -458746, 0, 0, -458745, -1610612734, 0, tile_set = SubResource( 10 ) tile_data = PoolIntArray( -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 0, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -327685, 536870912, 0, -327684, 536870912, 0, -327683, 536870912, 0, -327682, 536870912, 0, -327681, 536870912, 0, -393216, 536870912, 0, -393215, 536870912, 0, -393214, 536870912, 0, -393213, 536870912, 0, -393212, 536870912, 0, -393211, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 0, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0, -262150, 536870912, 0, -262149, 536870912, 0, -262148, 536870912, 0, -262147, 536870912, 0, -262146, 536870912, 0, -262145, 536870912, 0, -327680, 536870912, 0, -327679, 536870912, 0, -327678, 536870912, 0, -327677, 536870912, 0, -327676, 536870912, 0, -327675, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -196615, 536870912, 0, -196614, 536870912, 0, -262144, 536870914, 3, -262143, 2, 2, -262142, 2, 1, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870912, 0, -131079, 536870912, 0, -131078, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -131064, 536870912, 0, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -215,5 +216,3 @@ margin_right = 34.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 8 ) text = "jump" - -[editable path="GameCamera"] diff --git a/src/map/1-3.tscn b/src/map/1-3.tscn index 525e652..99699c9 100644 --- a/src/map/1-3.tscn +++ b/src/map/1-3.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -177,8 +177,9 @@ tile_data = PoolIntArray( -524295, 536870916, 3, -524294, 536870916, 0, -524293, tile_set = SubResource( 10 ) tile_data = PoolIntArray( -524305, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -458769, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -393233, 536870912, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -327697, 536870912, 0, -327696, 536870912, 0, -327695, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -262161, 536870912, 0, -262160, 0, 0, -262159, 0, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -196625, 536870912, 0, -196624, 0, 0, -196623, 0, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870914, 2, -131089, 536870912, 0, -131088, 536870912, 0, -131087, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870914, 3 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -24, -16 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -229,5 +230,3 @@ margin_right = 64.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 8 ) text = "pause" - -[editable path="GameCamera"] diff --git a/src/map/1-4.tscn b/src/map/1-4.tscn index 63c49c1..456c7cd 100644 --- a/src/map/1-4.tscn +++ b/src/map/1-4.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -177,8 +177,9 @@ tile_data = PoolIntArray( -393211, 536870916, 3, -393210, 4, 0, -393209, 4, 3, - tile_set = SubResource( 10 ) tile_data = PoolIntArray( -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -393216, 536870914, 3, -393215, 2, 2, -393213, 536870912, 0, -393212, 536870912, 0, -393211, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 0, 0, -393204, 0, 0, -393203, 536870912, 0, -393202, 536870912, 0, -393201, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -327677, 536870912, 0, -327676, 536870912, 0, -327675, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 0, 0, -327668, 0, 0, -327667, 536870912, 0, -327666, 536870912, 0, -327665, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -262138, 536870912, 0, -262137, 536870912, 0, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -262130, 536870912, 0, -262129, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -196602, 536870912, 0, -196601, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -196594, 536870912, 0, -196593, 536870912, 0, -131066, 536870912, 0, -131065, 536870912, 0, -131064, 536870912, 0, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0, -131058, 536870912, 0, -131057, 536870912, 0, -65524, 0, 0, -65523, 0, 0, -65522, 0, 0, -65521, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, 0 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -224,5 +225,3 @@ margin_right = 34.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 8 ) text = "lift" - -[editable path="GameCamera"] diff --git a/src/map/1-5.tscn b/src/map/1-5.tscn index fa0a863..0cf43dd 100644 --- a/src/map/1-5.tscn +++ b/src/map/1-5.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -524289, 5, 2, -589824, 5, 0, -589823, -1610612731, 2, tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -983023, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -393214, 536870912, 0, -393213, 536870912, 0, -393212, 2, 3 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 32, -24 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] diff --git a/src/map/1-6.tscn b/src/map/1-6.tscn index 6f65b83..4d65da3 100644 --- a/src/map/1-6.tscn +++ b/src/map/1-6.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -524297, 5, 2, -524296, -1610612731, 2, -524292, 10737 tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 0, 0, -524276, 0, 0, -524275, 536870912, 0, -524274, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 0, 0, -458740, 0, 0, -458739, 536870912, 0, -458738, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -262152, 2, 3, -262151, 536870914, 2, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -327666, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 8, -24 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -191,5 +192,3 @@ position = Vector2( -35, 16 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 91, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/1-7.tscn b/src/map/1-7.tscn index a9c677d..2ce8e7c 100644 --- a/src/map/1-7.tscn +++ b/src/map/1-7.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -589834, 536870916, 3, -589833, 4, 0, -589832, 4, 1, - tile_set = SubResource( 3 ) tile_data = PoolIntArray( -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -1048562, 536870912, 0, -1048561, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -524277, 2, 3, -524276, 536870914, 2, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -40 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -194,5 +195,3 @@ position = Vector2( 82, -48 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -69, -93 ) - -[editable path="GameCamera"] diff --git a/src/map/1-8.tscn b/src/map/1-8.tscn index 3078ef4..906391f 100644 --- a/src/map/1-8.tscn +++ b/src/map/1-8.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -786436, 5, 2, -786435, 536870917, 0, -786434, 5368709 tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1048590, 536870912, 0, -1048589, 536870912, 0, -1048588, 536870912, 0, -1048587, 536870912, 0, -1048586, 536870912, 0, -1048585, 536870912, 0, -1048584, 536870912, 0, -1048583, 536870912, 0, -1048582, 536870912, 0, -1048581, 536870912, 0, -1048580, 536870912, 0, -1048579, 536870912, 0, -1048578, 536870912, 0, -1048577, 536870912, 0, -1114112, 536870912, 0, -1114111, 536870912, 0, -1114110, 536870912, 0, -1114109, 536870912, 0, -1114108, 536870912, 0, -1114107, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -1114100, 536870912, 0, -1114099, 536870912, 0, -983054, 536870912, 0, -983053, 536870912, 0, -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524297, 2, 3, -524296, 536870914, 2 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -48 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -197,5 +198,3 @@ position = Vector2( 56, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 67, -93 ) - -[editable path="GameCamera"] diff --git a/src/map/2-1.tscn b/src/map/2-1.tscn index e0723d6..f654b75 100644 --- a/src/map/2-1.tscn +++ b/src/map/2-1.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -173,8 +173,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -393212, 536870912, 0, -393201, 536870912, 0, -393200, 536870912, 0, -393199, 536870912, 0, -393198, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0, -262150, 536870912, 0, -262149, 536870914, 3, -327677, 536870914, 2, -327676, 536870912, 0, -327675, 2, 2, -327665, 536870912, 0, -327664, 536870912, 0, -327663, 536870912, 0, -327662, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -196615, 536870912, 0, -196614, 536870912, 0, -196613, 2, 3, -262129, 536870912, 0, -262128, 536870912, 0, -262127, 536870912, 0, -262126, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -16 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -186,5 +187,3 @@ position = Vector2( 125, -11 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( 67, -69 ) - -[editable path="GameCamera"] diff --git a/src/map/2-2.tscn b/src/map/2-2.tscn index 41f7df1..ba06484 100644 --- a/src/map/2-2.tscn +++ b/src/map/2-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -917486, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524274, 536870914, 2, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -458738, 2, 3, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -393202, 536870914, 2, -393201, 536870912, 0, -393200, 536870912, 0, -393199, 536870912, 0, -393198, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -20 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -193,5 +194,3 @@ position = Vector2( -51, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -61, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/2-3.tscn b/src/map/2-3.tscn index 9c5c64e..2049686 100644 --- a/src/map/2-3.tscn +++ b/src/map/2-3.tscn @@ -2,7 +2,6 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -14,6 +13,7 @@ [ext_resource path="res://media/image/8pixel.png" type="Texture" id=12] [ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=13] [ext_resource path="res://media/image/bricks.png" type="Texture" id=14] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=15] [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" @@ -171,15 +171,15 @@ tile_set = SubResource( 2 ) tile_data = PoolIntArray( -458766, 536870916, 3, -458765, 536870916, 0, -458764, 4, 1, -458763, 4, 3, -458758, 5, 2, -458757, 5, 0, -458756, 536870917, 2, -524282, 5, 2, -524281, 5, 0, -524280, 5, 0, -524279, 5, 0, -524278, 5, 0, -524277, 536870917, 2, -393230, 4, 0, -393217, 5, 2, -458752, 536870917, 2, -458737, 536870916, 1, -458736, 536870916, 0, -458735, 4, 3, -327694, 4, 2, -327692, 4, 1, -327691, 4, 3, -327688, 6, 0, -327685, 1073741829, 2, -327684, 5, 0, -327683, 1610612741, 2, -393211, 1073741829, 2, -393210, 5, 0, -393209, 1610612741, 2, -393206, 1073741829, 2, -393205, 6, 0, -393204, 5, 0, -393203, 1610612741, 2, -393201, 4, 0, -393200, 536870916, 1, -393199, 536870916, 2, -393197, -2147483643, 2, -262156, 4, 0, -262155, 536870916, 2, -262153, 5, 2, -262152, 5, 0, -262151, -1610612731, 2, -262145, 4, 2, -327680, 536870916, 0, -327679, 4, 3, -327669, 6, 0, -327661, -1073741819, 0, -196617, -1073741819, 0, -196616, -1073741819, 0, -196615, -1073741819, 0, -196613, 4, 2, -196612, 4, 3, -196610, 536870916, 3, -196609, 4, 0, -262144, 536870916, 1, -262143, 4, 3, -262141, 5, 2, -262140, 5, 0, -262139, -1610612731, 2, -262134, 5, 2, -262133, 5, 0, -262132, -1610612731, 2, -262130, 536870916, 3, -262129, 4, 0, -262128, 4, 0, -262127, 4, 3, -262125, -1073741819, 2, -131081, -1073741819, 2, -131080, -1073741819, 0, -131079, 1610612741, 2, -131077, 4, 2, -131076, 4, 3, -131074, 4, 2, -131073, 536870916, 2, -196608, 536870916, 3, -196607, 4, 3, -196605, 5, 0, -196604, 5, 0, -196603, 5, 0, -196601, 536870916, 3, -196600, 536870916, 2, -196598, -1073741819, 2, -196597, 5, 0, -196596, 1610612741, 2, -196594, 4, 2, -196593, 536870916, 2, -196592, 4, 2, -196591, 4, 3, -65550, 536870916, 3, -65549, 536870916, 1, -65548, 4, 0, -65547, 4, 3, -65538, 4, 2, -65537, 536870916, 0, -131072, 536870916, 1, -131071, 4, 3, -131069, -1073741819, 2, -131068, 5, 0, -131067, 1610612741, 2, -131065, 536870916, 3, -131064, 536870916, 2, -131058, 4, 2, -131057, 4, 3, -131056, 536870916, 3, -131055, 536870916, 2, -14, 536870916, 1, -13, 4, 0, -12, 536870916, 1, -11, 4, 0, -10, 4, 3, -5, 5, 0, -2, 4, 2, -1, 536870916, 1, -65536, 4, 0, -65535, 4, 3, -65532, 6, 0, -65522, 536870916, 3, -65521, 4, 0, -65520, 4, 0, -65519, 4, 3, 65531, 6, 0, 4, 6, 0, 5, -1610612731, 2, 9, 5, 2, 131058, 4, 2, 131059, 536870916, 1, 131060, 4, 0, 131061, 536870916, 1, 131062, 536870916, 2, 131067, 6, 0, 131071, 1073741829, 2, 65536, 1610612741, 2, 65540, 6, 0, 65545, 6, 0, 196594, 4, 2, 196595, 4, 0, 196596, 4, 1, 196597, 536870916, 2, 262136, 1073741829, 2, 262137, 5, 0, 262138, 5, 0, 262139, 5, 0, 262140, 1610612741, 2, 196612, 1073741829, 2, 196613, 5, 0, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 196617, 1610612741, 2 ) brick_color = Color( 0.239216, 0.109804, 0.184314, 1 ) grass_color = Color( 0.741176, 0.580392, 0, 1 ) -wood_color = Color( 0.678431, 0, 0.156863, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -851948, 536870912, 0, -851947, 536870912, 0, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -786412, 536870912, 0, -786411, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -720876, 536870912, 0, -720875, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -655340, 536870912, 0, -655339, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -589804, 536870912, 0, -589803, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524267, 536870912, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458732, 2, 2, -458731, 536870912, 0, -327696, 536870912, 0, -327695, 536870912, 0, -327694, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -14, -24 ) +script = ExtResource( 15 ) bounds = Rect2( 0, 0, 76, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -201,5 +201,3 @@ position = Vector2( -100, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -5, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/2-4.tscn b/src/map/2-4.tscn index bc402b0..8799e3b 100644 --- a/src/map/2-4.tscn +++ b/src/map/2-4.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1245181, 536870912, 0, -1245180, 536870912, 0, -1245179, 536870912, 0, -1245178, 536870912, 0, -1245177, 536870912, 0, -1245176, 536870912, 0, -1245175, 536870912, 0, -1245174, 536870912, 0, -1245173, 536870912, 0, -1245172, 536870912, 0, -1245171, 536870912, 0, -1245170, 536870912, 0, -1245169, 536870912, 0, -1245168, 536870912, 0, -1179645, 536870912, 0, -1179644, 536870912, 0, -1179643, 536870912, 0, -1179642, 536870912, 0, -1179641, 536870912, 0, -1179640, 536870912, 0, -1179639, 536870912, 0, -1179638, 536870912, 0, -1179637, 536870912, 0, -1179636, 536870912, 0, -1179635, 536870912, 0, -1179634, 536870912, 0, -1179633, 536870912, 0, -1179632, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -1114100, 536870912, 0, -1114099, 536870912, 0, -1114098, 536870912, 0, -1114097, 536870912, 0, -1114096, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -1048562, 536870912, 0, -1048561, 536870912, 0, -1048560, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -524285, 536870914, 2, -524284, 2, 3, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -524272, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -458736, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -393201, 536870912, 0, -393200, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -327666, 536870912, 0, -327665, 536870912, 0, -327664, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -262130, 536870912, 0, -262129, 536870912, 0, -262128, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -196594, 536870912, 0, -196593, 536870912, 0, -196592, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 20, -24 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 64, 0, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -206,5 +207,3 @@ position = Vector2( 67, 8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 71, -94 ) - -[editable path="GameCamera"] diff --git a/src/map/2-5.tscn b/src/map/2-5.tscn index b573edb..21ebe28 100644 --- a/src/map/2-5.tscn +++ b/src/map/2-5.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -851948, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -786412, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -720876, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -655340, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -589804, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -524269, 536870912, 0, -524268, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -458733, 536870912, 0, -458732, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -327685, 536870912, 0, -327684, 536870912, 0, -393214, 2, 3, -393213, 536870914, 2, -393212, 536870914, 3, -393211, 2, 2 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 52, -20 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -202,5 +203,3 @@ position = Vector2( -36, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 139, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/2-6.tscn b/src/map/2-6.tscn index 39f9504..d795c3f 100644 --- a/src/map/2-6.tscn +++ b/src/map/2-6.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -327666, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -262130, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -196594, 536870912, 0, -65549, 536870912, 0, -65548, 536870912, 0, -65547, 536870912, 0, -65546, 536870912, 0, -65545, 536870912, 0, -65544, 536870912, 0, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0, -131058, 536870912, 0, -13, 536870912, 0, -12, 536870912, 0, -11, 536870912, 0, -10, 536870912, 0, -9, 536870912, 0, -8, 536870912, 0, -7, 536870912, 0, -6, 536870912, 0, -5, 536870912, 0, -4, 536870912, 0, -65528, 536870912, 0, -65527, 536870912, 0, -65526, 536870912, 0, -65525, 536870912, 0, -65524, 536870912, 0, -65523, 536870912, 0, -65522, 536870912, 0, 65523, 536870912, 0, 65524, 536870912, 0, 65525, 536870912, 0, 65526, 536870912, 0, 65527, 536870912, 0, 65528, 536870912, 0, 65529, 536870912, 0, 8, 536870912, 0, 9, 536870912, 0, 10, 536870912, 0, 11, 536870912, 0, 12, 536870912, 0, 13, 536870912, 0, 14, 536870912, 0, 131059, 536870912, 0, 131060, 536870912, 0, 131061, 536870912, 0, 131062, 536870912, 0, 131063, 536870912, 0, 131064, 536870912, 0, 131065, 536870912, 0, 65545, 536870912, 0, 65546, 536870912, 0, 65547, 536870912, 0, 65548, 536870912, 0, 65549, 536870912, 0, 65550, 536870912, 0, 196601, 2, 2, 131080, 536870912, 0, 131081, 536870912, 0, 131082, 536870912, 0, 131083, 536870912, 0, 131084, 536870912, 0, 131085, 536870912, 0, 131086, 536870912, 0, 196616, 536870912, 0, 196617, 536870912, 0, 196618, 536870912, 0, 196619, 536870912, 0, 196620, 536870912, 0, 196621, 536870912, 0, 196622, 536870912, 0, 262154, 536870912, 0, 262155, 536870912, 0, 262156, 536870912, 0, 262157, 536870912, 0, 262158, 536870912, 0, 327689, 536870914, 2, 327690, 536870912, 0, 327691, 536870912, 0, 327692, 536870912, 0, 327693, 536870912, 0, 327694, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 8, 8 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 0, 0, 40 ) [node name="Actors" type="Node2D" parent="."] @@ -203,5 +204,3 @@ position = Vector2( -47, -32 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -69, -5 ) - -[editable path="GameCamera"] diff --git a/src/map/2-7.tscn b/src/map/2-7.tscn index 70a0423..38d5108 100644 --- a/src/map/2-7.tscn +++ b/src/map/2-7.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524292, 2, 2, -524291, 536870914, 3, -524290, 2, 2, -524289, 536870914, 3, -589824, 536870914, 2, -589823, 2, 3, -589822, 2, 2, -589821, 536870914, 3, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -24 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -208,5 +209,3 @@ position = Vector2( 78, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -101, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/2-8.tscn b/src/map/2-8.tscn index 6c82fdb..77351f0 100644 --- a/src/map/2-8.tscn +++ b/src/map/2-8.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1114128, 536870912, 0, -1114127, 536870912, 0, -1114126, 536870912, 0, -1114125, 536870912, 0, -1114124, 536870912, 0, -1114123, 536870912, 0, -1114122, 536870912, 0, -1114121, 536870912, 0, -1114120, 536870912, 0, -1114119, 536870912, 0, -1114118, 536870912, 0, -1114117, 536870912, 0, -1114116, 536870912, 0, -1114115, 536870912, 0, -1114114, 536870912, 0, -1114113, 536870912, 0, -1179648, 536870912, 0, -1179647, 536870912, 0, -1179646, 536870912, 0, -1179645, 536870912, 0, -1179644, 536870912, 0, -1179643, 536870912, 0, -1179642, 536870912, 0, -1179641, 536870912, 0, -1179640, 536870912, 0, -1179639, 536870912, 0, -1179638, 536870912, 0, -1179637, 536870912, 0, -1048592, 536870912, 0, -1048591, 536870912, 0, -1048590, 536870912, 0, -1048589, 536870912, 0, -1048588, 536870912, 0, -1048587, 536870912, 0, -1048586, 536870912, 0, -1048585, 536870912, 0, -1048584, 536870912, 0, -1048583, 536870912, 0, -1048582, 536870912, 0, -1048581, 536870912, 0, -1048580, 536870912, 0, -1048579, 536870912, 0, -1048578, 536870912, 0, -1048577, 536870912, 0, -1114112, 536870912, 0, -1114111, 536870912, 0, -1114110, 536870912, 0, -1114109, 536870912, 0, -1114108, 536870912, 0, -1114107, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -983056, 536870912, 0, -983055, 536870912, 0, -983054, 536870912, 0, -983053, 536870912, 0, -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -917520, 536870912, 0, -917519, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -851984, 536870912, 0, -851983, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -851962, 536870914, 2, -851961, 2, 3, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -16, -32 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 16, 0, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -212,5 +213,3 @@ position = Vector2( -83, 0 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -93, -101 ) - -[editable path="GameCamera"] diff --git a/src/map/3-1.tscn b/src/map/3-1.tscn index 288e7cd..8fa2e09 100644 --- a/src/map/3-1.tscn +++ b/src/map/3-1.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -180,8 +180,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -458765, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 0, 0, -458760, 0, 0, -458759, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524284, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 0, 0, -524274, 0, 0, -393229, 0, 0, -393228, 0, 0, -393227, 0, 0, -393226, 0, 0, -393225, 0, 0, -393224, 0, 0, -393223, 0, 0, -393222, 0, 0, -393221, 0, 0, -393220, 0, 0, -393219, 0, 0, -393218, 0, 0, -393217, 0, 0, -458752, 0, 0, -458751, 0, 0, -458750, 0, 0, -458749, 0, 0, -458748, 0, 0, -458747, 0, 0, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -327693, 0, 0, -327692, 0, 0, -327691, 0, 0, -327690, 0, 0, -327689, 0, 0, -327688, 0, 0, -327687, 0, 0, -327686, 0, 0, -327685, 0, 0, -327684, 0, 0, -327683, 0, 0, -327682, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -393202, 0, 0, -262157, 0, 0, -262156, 0, 0, -262155, 0, 0, -262154, 0, 0, -262153, 0, 0, -262152, 2, 2, -262151, 536870914, 3, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0, -327667, 0, 0, -327666, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, 0, -262130, 0, 0 ) tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 8, -8 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -208,5 +209,3 @@ position = Vector2( 29, 16 ) [node name="Note" parent="Actors" instance=ExtResource( 12 )] position = Vector2( 99, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/3-2.tscn b/src/map/3-2.tscn index f0e5029..bd4ab44 100644 --- a/src/map/3-2.tscn +++ b/src/map/3-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -23,7 +23,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 17 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -60,7 +60,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 18 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.219608, 0.172549, 0.411765, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -81,7 +81,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 15 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 1, 0.509804, 0.713726, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -102,7 +102,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 15 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0, 0.77, 0.462, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -132,7 +132,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 17 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -157,15 +157,15 @@ __meta__ = { "_editor_description_": "" } palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) -color_wood = Color( 0, 0.77, 0.462, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -524299, 0, 0, -524298, 0, 1, -524297, 536870912, 0, -524296, 0, 1, -524295, 0, 1, -524294, 0, 0, -524293, 0, 1, -524292, 536870912, 0, -524291, 0, 1, -524290, 0, 1, -524289, 0, 0, -589824, 0, 1, -589823, 0, 1, -589822, 536870912, 0, -458763, 0, 1, -524286, 0, 1, -393229, 0, 0, -393228, 0, 1, -393227, 536870912, 0, -458750, 0, 0, -327693, 0, 1, -327681, 0, 0, -393216, 0, 1, -393215, 536870912, 0, -393214, 0, 1, -393213, 0, 0, -393212, 0, 1, -393211, 536870912, 0, -393210, 0, 1, -393209, 0, 1, -393208, 0, 0, -393207, 0, 1, -393206, 0, 1, -393205, 536870912, 0, -393204, 536870913, 0, -393203, 536870913, 0, -393202, 536870913, 0, -262157, 536870912, 0, -327669, 0, 1, -327666, 536870913, 0, -196621, 0, 1, -262133, 0, 0, -262130, 536870913, 0, -131085, 0, 0, -196597, 0, 1, -196594, 536870913, 0, -65549, 0, 1, -65548, 0, 0, -65547, 0, 1, -65546, 536870912, 0, -131064, 0, 0, -131063, 0, 1, -131062, 0, 1, -131061, 536870912, 0, -131058, 536870913, 0, -12, 0, 1, -65528, 0, 1, -65522, 536870913, 0, 65524, 536870912, 0, 65530, 0, 1, 65531, 536870912, 0, 65532, 0, 1, 14, 536870913, 0, 131060, 0, 1, 131066, 0, 0, 131068, 536870912, 0, 65544, 0, 1, 65550, 536870913, 0, 196596, 0, 0, 196597, 0, 1, 196598, 0, 1, 196599, 0, 0, 196600, 0, 1, 196601, 536870912, 0, 196602, 0, 1, 196604, 0, 1, 131080, 0, 0, 131086, 536870913, 0, 262140, 0, 0, 262141, 0, 1, 262142, 0, 0, 262143, 0, 1, 196608, 536870912, 0, 196609, 0, 1, 196612, 0, 1, 196613, 0, 0, 196614, 0, 1, 196615, 536870912, 0, 196616, 0, 1, 196622, 536870913, 0, 262145, 0, 0, 262146, 0, 1, 262147, 0, 1, 262148, 536870912, 0, 262152, 536870913, 0, 262153, 536870913, 0, 262154, 536870913, 0, 262155, 536870913, 0, 262156, 536870913, 0, 262157, 536870913, 0, 262158, 536870913, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0, 131073, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0, 131079, 0, 0 ) @@ -174,17 +174,18 @@ tile_data = PoolIntArray( 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -589834, 5, 2, -589833, 5, 0, -589832, 5, 0, -589831, 5, 0, -589830, 536870917, 2, -589825, 5, 2, -655360, 5, 0, -655359, 5, 0, -655358, 5, 0, -655357, -1610612731, 2, -589821, 5, 0, -458766, 5, 2, -458765, 5, 0, -458764, 5, 0, -458762, 1610612741, 2, -458758, 1073741829, 2, -458757, 5, 0, -458756, 5, 0, -458755, 5, 0, -458754, 5, 0, -458753, 1610612741, 2, -524285, 5, 0, -524284, 536870917, 2, -524281, 5, 2, -524280, 536870917, 2, -393230, -1073741819, 0, -458749, 5, 0, -458748, 1073741829, 0, -458747, 1073741829, 0, -458746, 1073741829, 0, -458745, 5, 0, -458744, 5, 0, -458743, 5, 0, -327694, -1073741819, 0, -327691, 536870917, 2, -327689, 5, 2, -327688, -1610612731, 2, -262158, -1073741819, 2, -262156, -1073741818, 0, -262155, -1073741818, 0, -262154, -1073741818, 0, -262153, -1610612731, 0, -262152, -1610612731, 0, -327679, 4, 2, -327678, 536870916, 0, -327677, 536870916, 2, -327675, 1610612742, 0, -327674, 1610612741, 2, -327673, 4, 2, -327672, 4, 3, -327671, 1073741829, 2, -327670, 5, 0, -327668, -1610612731, 2, -196617, -1073741819, 2, -196616, 1610612741, 2, -196613, 4, 2, -196612, 4, 1, -196611, 4, 3, -196609, 5, 2, -262144, 5, 0, -262143, -1610612731, 2, -262139, 1610612742, 0, -262137, 536870916, 3, -262136, 536870916, 2, -262132, -1610612731, 0, -131077, 4, 2, -131076, 4, 0, -131075, 536870916, 2, -131073, 5, 0, -196608, 5, 0, -196607, 5, 0, -196604, 5, 2, -196603, 5, 0, -196602, -1610612731, 2, -196601, 4, 2, -196600, 4, 3, -196596, -1610612731, 0, -65544, 536870916, 3, -65543, 536870916, 2, -65537, -1073741819, 2, -131072, 5, 0, -131071, 1610612741, 2, -131068, -1073741819, 2, -131067, 5, 0, -131066, 1610612741, 2, -131060, -1610612731, 0, -13, 4, 2, -10, 6, 0, -6, 5, 2, -5, 5, 0, -4, 536870917, 2, -65536, 6, 0, -65527, 5, 0, -65526, 5, 0, -65525, 5, 0, -65524, 1610612741, 2, 65526, 1610612741, 0, 0, 1610612742, 0, 9, -1610612731, 0, 131067, 536870916, 1, 65536, 1610612742, 0, 65545, -536870907, 2, 196603, 536870916, 2, 131072, 1610612742, 0, 262132, 4, 2, 262133, 536870916, 1, 262134, 4, 0, 262135, 536870916, 1, 262136, 536870916, 0, 262137, 536870916, 1, 262138, 536870916, 2, 327669, 4, 2, 327670, 536870916, 1, 327671, 4, 0, 327672, 536870916, 1, 327673, 536870916, 2, 262144, 4, 2, 262149, 536870916, 2 ) -brick_color = Color( 0.219608, 0.172549, 0.411765, 1 ) -grass_color = Color( 1, 0.509804, 0.713726, 1 ) -wood_color = Color( 0, 0.77, 0.462, 1 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 13 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -327668, 0, 0, -327667, 0, 0, -262132, 0, 0, -262131, 0, 0, -196596, 0, 0, -196595, 0, 0, -131060, 0, 0, -131059, 0, 0, -65527, 0, 0, -65526, 0, 0, -65525, 0, 0, -65524, 0, 0, -65523, 0, 0, 8, 536870914, 2, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 536870912, 0, 65548, 536870912, 0, 65549, 0, 0, 131081, 0, 0, 131082, 0, 0, 131083, 536870912, 0, 131084, 536870912, 0, 131085, 0, 0, 196617, 0, 0, 196618, 0, 0, 196619, 0, 0, 196620, 0, 0, 196621, 0, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -4, -16 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -255,5 +256,3 @@ position = Vector2( 76, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 14 )] position = Vector2( 91, 11 ) - -[editable path="GameCamera"] diff --git a/src/map/3-3.tscn b/src/map/3-3.tscn index 1798cfb..417f159 100644 --- a/src/map/3-3.tscn +++ b/src/map/3-3.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -23,7 +23,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 17 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -60,7 +60,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 18 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.219608, 0.172549, 0.411765, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -81,7 +81,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 15 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 1, 0.509804, 0.713726, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -102,7 +102,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 15 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0, 0.77, 0.462, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -132,7 +132,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 17 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -157,15 +157,15 @@ __meta__ = { "_editor_description_": "" } palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) -color_wood = Color( 0, 0.77, 0.462, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -983056, 1, 0, -983055, 1, 0, -983054, 1, 0, -983053, 1, 0, -983052, 1, 0, -983051, 1, 0, -983050, 1, 0, -983049, 1, 0, -983048, 1, 0, -983047, 1, 0, -983046, 1, 0, -983045, 1, 0, -983044, 1, 0, -983043, 1, 0, -983042, 1, 0, -983041, 1, 0, -1048576, 1, 0, -1048575, 1, 0, -1048574, 1, 0, -1048573, 1, 0, -1048572, 1, 0, -1048571, 1, 0, -1048570, 1, 0, -1048569, 1, 0, -1048568, 1, 0, -1048567, 1, 0, -1048566, 1, 0, -1048565, 1, 0, -1048564, 1, 0, -1048563, 1, 0, -917520, 1, 0, -983027, 1, 0, -851984, 1, 0, -917491, 1, 0, -786448, 1, 0, -851955, 1, 0, -720912, 1, 0, -786419, 1, 0, -655376, 1, 0, -720883, 1, 0, -589840, 1, 0, -589830, 0, 1, -589829, 0, 0, -589828, 0, 1, -589827, 536870912, 0, -589826, 0, 1, -589825, 0, 0, -655360, 0, 1, -655359, 536870912, 0, -655358, 0, 1, -655357, 0, 1, -655356, 536870912, 0, -655347, 1, 0, -524304, 1, 0, -524294, 536870912, 0, -589820, 0, 1, -589811, 1, 0, -458768, 1, 0, -458767, 1, 0, -458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 0, 1, -458761, 0, 0, -458760, 0, 1, -458759, 536870912, 0, -458758, 0, 1, -524284, 0, 0, -524275, 1, 0, -393226, 536870912, 0, -393222, 0, 0, -393221, 0, 1, -393220, 536870912, 0, -393219, 536870912, 1, -458748, 0, 1, -458747, 0, 0, -458746, 0, 1, -458745, 536870912, 0, -458739, 1, 0, -327690, 0, 1, -393203, 1, 0, -262154, 0, 0, -262153, 0, 1, -327667, 1, 0, -196617, 536870912, 0, -262137, 0, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -131081, 0, 1, -196601, 0, 1, -65545, 0, 0, -131065, 536870912, 0, -9, 0, 0, -8, 0, 1, -7, 536870912, 0, -6, 0, 1, -5, 0, 0, -4, 0, 1, -3, 536870912, 0, -65529, 0, 1, 65533, 0, 1, 7, 536870912, 0, 131069, 0, 0, 131070, 0, 1, 131071, 536870912, 0, 65536, 0, 1, 65537, 0, 0, 65538, 0, 1, 65539, 536870912, 0, 65540, 0, 1, 65543, 536870912, 0, 131076, 0, 0, 131079, 0, 1, 196612, 0, 1, 196613, 0, 0, 196614, 0, 1, 196615, 536870912, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0 ) @@ -174,17 +174,18 @@ tile_data = PoolIntArray( 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -720895, 5, 2, -720894, 5, 0, -720893, 5, 0, -720892, 5, 0, -720891, 536870917, 2, -655355, -1610612731, 0, -524299, 5, 2, -524298, 5, 0, -524297, 5, 0, -524296, 5, 0, -524295, 536870917, 2, -524292, 536870916, 3, -524291, 536870916, 1, -524290, 536870916, 2, -589823, 1610612742, 0, -589819, -1610612731, 0, -458763, -1073741819, 0, -458756, 536870916, 3, -458755, 536870916, 0, -458754, 536870916, 2, -524288, 5, 2, -524287, 5, 0, -524286, -1610612731, 2, -524283, -1610612731, 0, -524282, 5, 0, -524281, 5, 0, -524280, 536870917, 2, -393228, -2147483643, 2, -393227, -1073741819, 0, -393224, 4, 2, -393223, 4, 3, -458752, -1073741819, 2, -458751, 5, 0, -458750, 1610612741, 2, -458744, -536870907, 0, -327692, -1073741819, 2, -327691, -1073741819, 0, -327688, 4, 2, -327687, 4, 0, -327686, 4, 3, -393208, -536870907, 0, -262155, -1073741819, 0, -262152, 4, 2, -262151, 4, 3, -262150, 5, 2, -262149, 5, 0, -262148, -1610612731, 2, -327674, -2147483643, 2, -327673, 536870917, 0, -327672, -536870907, 2, -196619, -1073741819, 2, -196618, 5, 0, -196614, -1073741819, 2, -196613, 5, 0, -196612, 1610612741, 2, -262138, -1073741819, 0, -131082, 5, 0, -131080, 4, 0, -131079, 536870916, 2, -131077, 1610612742, 0, -131074, 536870916, 3, -131073, 536870916, 2, -196602, -1073741819, 0, -65547, -2147483643, 2, -65546, 5, 0, -65544, 536870916, 1, -65543, 536870916, 2, -65541, 1610612742, 0, -131068, 5, 0, -131066, -1073741819, 0, -11, -1073741819, 2, -10, 5, 0, -65532, 1610612742, 0, -65530, -1073741819, 2, -65528, -1610612731, 2, 65526, 1073741829, 2, 65527, 5, 0, 65528, 5, 0, 65529, 1610612741, 2, 4, 1610612742, 0, 8, -1610612731, 0, 65544, -1610612731, 0, 196606, 1073741829, 2, 196607, 5, 0, 131072, 5, 0, 131073, 5, 0, 131074, 1610612741, 2, 131080, -536870907, 2 ) -brick_color = Color( 0.219608, 0.172549, 0.411765, 1 ) -grass_color = Color( 1, 0.509804, 0.713726, 1 ) -wood_color = Color( 0, 0.77, 0.462, 1 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 13 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917519, 0, 0, -917518, 0, 0, -917517, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -851983, 0, 0, -851982, 0, 0, -851981, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -786447, 0, 0, -786446, 0, 0, -786445, 0, 0, -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -720911, 0, 0, -720910, 0, 0, -720909, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -655375, 0, 0, -655374, 0, 0, -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -589839, 0, 0, -589838, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -524303, 0, 0, -524302, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -393209, 536870914, 3, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -327673, 2, 2, -327672, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -8, -24 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -232,5 +233,3 @@ position = Vector2( -30, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 14 )] position = Vector2( -109, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/3-4.tscn b/src/map/3-4.tscn index 0e0ae99..b7164df 100644 --- a/src/map/3-4.tscn +++ b/src/map/3-4.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -23,7 +23,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 17 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -60,7 +60,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 18 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.219608, 0.172549, 0.411765, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -81,7 +81,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 15 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 1, 0.509804, 0.713726, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -102,7 +102,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 15 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0, 0.77, 0.462, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -132,7 +132,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 17 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -154,15 +154,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) -color_wood = Color( 0, 0.77, 0.462, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -851981, 536870913, 0, -851980, 536870913, 0, -851979, 536870913, 0, -851978, 536870913, 0, -851977, 536870913, 0, -851976, 536870913, 0, -851975, 536870913, 0, -851974, 536870913, 0, -851973, 536870913, 0, -851972, 536870913, 0, -851971, 536870913, 0, -851970, 536870913, 0, -851969, 536870913, 0, -917504, 536870913, 0, -917503, 536870913, 0, -917502, 536870913, 0, -917501, 536870913, 0, -917500, 536870913, 0, -917499, 536870913, 0, -917498, 536870913, 0, -917497, 536870913, 0, -917496, 536870913, 0, -917495, 536870913, 0, -917494, 536870913, 0, -917493, 536870913, 0, -917492, 536870913, 0, -917491, 536870913, 0, -917490, 536870913, 0, -917489, 536870913, 0, -917488, 536870913, 0, -917487, 536870913, 0, -917486, 536870913, 0, -917485, 536870913, 0, -917484, 536870913, 0, -917483, 536870913, 0, -917482, 536870913, 0, -786445, 536870913, 0, -851946, 536870913, 0, -720909, 536870913, 0, -786410, 536870913, 0, -655373, 536870913, 0, -720874, 536870913, 0, -589837, 536870913, 0, -655338, 536870913, 0, -524301, 536870913, 0, -589802, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 0, 0, -458762, 0, 1, -458761, 536870912, 0, -458760, 0, 1, -458759, 536870912, 0, -458758, 0, 1, -524284, 0, 1, -524283, 0, 0, -524282, 536870912, 1, -524281, 536870912, 1, -524280, 536870912, 1, -524279, 536870912, 0, -524278, 0, 1, -524277, 0, 1, -524276, 0, 0, -524275, 0, 1, -524274, 536870912, 0, -524266, 536870913, 0, -393227, 0, 0, -393222, 0, 0, -393221, 0, 1, -393220, 536870912, 0, -393219, 0, 1, -393218, 0, 0, -393217, 0, 1, -458752, 536870912, 0, -458751, 0, 1, -458738, 0, 1, -458730, 536870913, 0, -327691, 0, 1, -327686, 0, 1, -393202, 0, 0, -393201, 0, 1, -393200, 536870912, 0, -393199, 0, 1, -393198, 0, 0, -393197, 0, 1, -393196, 536870912, 0, -393195, 536870913, 0, -393194, 536870913, 0, -262155, 0, 0, -262151, 0, 1, -262150, 536870912, 0, -327660, 0, 1, -196619, 0, 1, -196614, 0, 1, -262124, 536870912, 0, -131083, 536870912, 0, -131078, 0, 0, -131077, 0, 1, -131076, 536870912, 0, -131075, 0, 1, -196591, 0, 0, -196590, 0, 1, -196589, 536870912, 0, -196588, 0, 1, -65547, 536870912, 0, -131069, 0, 0, -131068, 0, 1, -131055, 0, 1, -11, 0, 1, -65519, 536870912, 0, 65525, 536870912, 0, 17, 0, 1, 131061, 0, 1, 65547, 0, 0, 65548, 0, 1, 65549, 536870912, 0, 65550, 0, 1, 65551, 0, 0, 65552, 0, 1, 65553, 536870912, 0, 196597, 0, 0, 131083, 0, 1, 262133, 0, 0, 262134, 0, 1, 262135, 0, 1, 262136, 536870912, 0, 262137, 0, 1, 262138, 0, 0, 262139, 0, 1, 262140, 536870912, 0, 262141, 0, 1, 196619, 536870912, 0, 327677, 536870912, 0, 262155, 0, 1, 393213, 0, 1, 393214, 0, 0, 393215, 0, 1, 327680, 536870912, 0, 327681, 0, 1, 327682, 0, 0, 327683, 0, 1, 327684, 0, 1, 327685, 0, 1, 327686, 0, 1, 327687, 536870912, 0, 327688, 0, 1, 327689, 0, 0, 327690, 0, 1, 327691, 536870912, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 327678, 0, 0, 327679, 0, 0, 262144, 0, 0, 262145, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262152, 0, 0, 262153, 0, 0, 262154, 0, 0 ) @@ -171,17 +171,18 @@ tile_data = PoolIntArray( 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -524296, 5, 2, -524295, 5, 0, -524294, 5, 0, -524293, 536870917, 2, -589819, 5, 2, -589818, 5, 0, -589817, 5, 2, -589816, 5, 0, -589815, 5, 0, -589814, 536870917, 2, -589813, 5, 0, -589812, 536870917, 2, -458757, -536870907, 0, -458755, 5, 2, -458754, 5, 0, -458753, 5, 0, -524288, 536870917, 2, -393226, 5, 0, -393225, 5, 0, -393224, 1610612741, 2, -458746, 1610612742, 0, -458741, 1610612742, 0, -327690, -1073741819, 0, -327685, 1073741829, 2, -327684, 5, 0, -327683, 1610612741, 2, -393216, 1610612742, 0, -393210, 1610612742, 0, -393206, 5, 2, -393205, 5, 0, -393204, -1610612731, 2, -262156, -2147483643, 2, -262154, -536870907, 2, -327680, 1610612742, 0, -327677, 4, 2, -327676, 4, 3, -327674, 5, 0, -327670, 5, 0, -327669, 5, 0, -327668, 5, 0, -327665, 536870916, 3, -327664, 536870916, 1, -327663, 536870916, 2, -196620, -1073741819, 0, -196609, 5, 2, -262144, 5, 0, -262143, -1610612731, 2, -262141, 4, 2, -262140, 4, 3, -262134, -1073741819, 2, -262133, 5, 0, -262132, 1610612741, 2, -262129, 536870916, 3, -262128, 536870916, 0, -262127, 536870916, 2, -131084, -1073741819, 0, -131081, 5, 2, -131080, -1610612731, 2, -131073, 5, 0, -196608, 5, 0, -196607, 5, 0, -65548, -1073741819, 2, -65546, -1610612730, 0, -65545, 5, 0, -65544, 5, 0, -65537, -1073741819, 2, -131072, 5, 0, -131071, 1610612741, 2, -131059, 5, 0, -9, -1073741819, 2, -8, 1610612741, 2, -5, 4, 2, -4, 4, 1, -3, 536870916, 0, -2, 4, 3, -65532, 1610612742, 0, -65524, -1073741819, 2, -65523, 1610612742, 0, -65522, -536870907, 2, -65518, -1610612731, 2, 65531, 4, 2, 65532, 4, 0, 65533, 4, 1, 65534, 4, 3, 4, 1610612741, 0, 7, 5, 2, 8, 5, 0, 9, -1610612731, 2, 13, 1610612742, 0, 18, 5, 0, 131067, 4, 2, 131068, 4, 1, 131069, 536870916, 0, 131070, 536870916, 2, 65543, 5, 0, 65544, 5, 0, 65545, 5, 0, 65554, 5, 0, 131076, 536870916, 3, 131077, 536870916, 0, 131078, 4, 3, 131079, -1073741819, 2, 131080, 5, 0, 131081, 1610612741, 2, 131084, 5, 2, 131085, 1610612741, 0, 131086, 1610612741, 0, 131087, 1610612741, 0, 131088, 1610612741, 0, 131089, 1610612741, 0, 131090, -536870907, 2, 196609, 5, 0, 196612, 4, 2, 196613, 4, 1, 196614, 4, 3, 196616, 1610612742, 0, 196620, -1610612731, 0, 196623, 1073741829, 2, 196624, 1610612741, 2, 327671, 1073741829, 2, 327672, 5, 0, 327673, 5, 0, 327674, 5, 0, 327675, 5, 0, 327676, -1610612731, 2, 262145, 1610612742, 0, 262152, 1610612742, 0, 262156, -1610612731, 0, 393212, -1073741819, 0, 327692, -1610612731, 0, 458748, 1073741829, 2, 458749, 5, 0, 458750, 5, 0, 458751, 5, 0, 393216, 5, 0, 393217, 1610612741, 2, 393224, 1073741829, 2, 393225, 5, 0, 393226, 5, 0, 393227, 5, 0, 393228, 1610612741, 2 ) -brick_color = Color( 0.219608, 0.172549, 0.411765, 1 ) -grass_color = Color( 1, 0.509804, 0.713726, 1 ) -wood_color = Color( 0, 0.77, 0.462, 1 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 13 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -851953, 0, 0, -851952, 0, 0, -851951, 0, 0, -851950, 0, 0, -851949, 0, 0, -851948, 0, 0, -851947, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -786416, 0, 0, -786415, 0, 0, -786414, 0, 0, -786413, 0, 0, -786412, 0, 0, -786411, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -720881, 0, 0, -720880, 0, 0, -720879, 0, 0, -720878, 0, 0, -720877, 0, 0, -720876, 0, 0, -720875, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -655345, 0, 0, -655344, 0, 0, -655343, 0, 0, -655342, 0, 0, -655341, 0, 0, -655340, 0, 0, -655339, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -589809, 0, 0, -589808, 0, 0, -589807, 0, 0, -589806, 0, 0, -589805, 0, 0, -589804, 0, 0, -589803, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 2, 2, -524286, 536870914, 3, -524285, 2, 2, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 0, 0, -524270, 0, 0, -524269, 0, 0, -524268, 0, 0, -524267, 0, 0, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 0, 0, -458734, 0, 0, -458733, 0, 0, -458732, 0, 0, -458731, 0, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -8 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 0, 48, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -227,5 +228,3 @@ position = Vector2( -80, 16 ) [node name="Note" parent="Actors" instance=ExtResource( 14 )] position = Vector2( 123, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/3-5.tscn b/src/map/3-5.tscn index cd4f6af..bfb913e 100644 --- a/src/map/3-5.tscn +++ b/src/map/3-5.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -20,7 +20,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 14 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -57,7 +57,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 15 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -78,7 +78,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 12 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -99,7 +99,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -129,7 +129,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 14 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,13 +151,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -786449, 1, 0, -786448, 1, 0, -786447, 1, 0, -786446, 1, 0, -786445, 1, 0, -786444, 1, 0, -786443, 1, 0, -786442, 1, 0, -786441, 1, 0, -786440, 1, 0, -786439, 1, 0, -786438, 1, 0, -786437, 1, 0, -786436, 1, 0, -786435, 1, 0, -786434, 1, 0, -786433, 1, 0, -851968, 1, 0, -851967, 1, 0, -851966, 1, 0, -851965, 1, 0, -851964, 1, 0, -851963, 1, 0, -851962, 1, 0, -851961, 1, 0, -851960, 1, 0, -851959, 1, 0, -851958, 1, 0, -851957, 1, 0, -851956, 1, 0, -720913, 1, 0, -786420, 1, 0, -655377, 1, 0, -720884, 1, 0, -589841, 1, 0, -655348, 1, 0, -524305, 1, 0, -589812, 1, 0, -458769, 1, 0, -524276, 1, 0, -393233, 1, 0, -393226, 0, 0, -393225, 536870912, 1, -393224, 536870912, 0, -393223, 536870912, 1, -393222, 536870912, 1, -393221, 536870912, 1, -393220, 536870912, 1, -393219, 0, 0, -393218, 536870912, 1, -393217, 536870912, 1, -458752, 536870912, 0, -458749, 0, 0, -458748, 536870912, 1, -458747, 536870912, 0, -458740, 1, 0, -327697, 1, 0, -327690, 0, 0, -393211, 536870912, 1, -393204, 1, 0, -262161, 1, 0, -262154, 536870912, 1, -327675, 0, 0, -327668, 1, 0, -196625, 1, 0, -196624, 1, 0, -196623, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 536870912, 1, -196618, 536870912, 0, -196615, 0, 0, -196614, 536870912, 1, -196613, 0, 0, -196612, 536870912, 1, -196611, 536870912, 0, -196610, 536870912, 1, -196609, 0, 0, -262144, 536870912, 1, -262143, 536870912, 1, -262142, 536870912, 0, -262141, 536870912, 1, -262140, 0, 0, -262139, 536870912, 1, -262138, 536870912, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -131083, 0, 0, -196602, 536870912, 1, -65547, 536870912, 1, -65540, 0, 0, -131072, 0, 1, -131066, 0, 0, -11, 536870912, 0, -65530, 536870912, 1, 65525, 536870912, 1, 65526, 0, 0, 65527, 536870912, 1, 65528, 536870912, 0, 65529, 536870912, 1, 65530, 536870912, 1, 65531, 0, 0, 65532, 536870912, 1, 65533, 536870912, 1, 65534, 536870912, 0, 65535, 536870912, 1, 0, 536870912, 1, 1, 0, 0, 2, 536870912, 1, 3, 536870912, 1, 4, 536870912, 0, 5, 536870912, 1, 6, 536870912, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] @@ -165,13 +167,18 @@ tile_data = PoolIntArray( -786449, 1, 0, -786448, 1, 0, -786447, 1, 0, -786446, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -524297, 5, 2, -524296, 536870917, 0, -524295, 536870917, 0, -524294, 536870917, 2, -458763, 5, 2, -458762, 5, 0, -458761, 5, 0, -458760, 5, 0, -458759, 5, 0, -458758, 5, 0, -458757, 5, 0, -458756, 536870917, 2, -524288, 5, 2, -524287, 5, 0, -524286, 5, 0, -524285, 536870917, 2, -393227, -1073741819, 0, -458746, 4, 3, -327691, -1073741819, 0, -327688, 1610612742, 0, -327686, 536870916, 3, -327685, 536870916, 2, -327684, 1073741829, 2, -327683, 5, 0, -327682, 5, 0, -327681, 5, 0, -393216, 1610612741, 2, -393215, 4, 2, -393214, 4, 3, -393210, 4, 0, -393209, 4, 3, -262156, -2147483643, 2, -262155, 536870917, 0, -262152, 1610612741, 0, -262150, 536870916, 3, -262149, 536870916, 2, -327679, 4, 2, -327678, 4, 3, -327674, 4, 1, -327673, 536870916, 2, -196620, -1073741819, 0, -131084, -1073741819, 0, -131080, 4, 2, -131079, 4, 1, -131078, 4, 3, -196606, 1073741829, 2, -196605, 5, 0, -196604, 5, 0, -196603, 5, 0, -196601, -1610612731, 2, -65548, -1073741819, 2, -65546, -1610612731, 2, -65544, 4, 2, -65543, 536870916, 0, -65542, 4, 3, -65538, 5, 0, -131065, -1610612731, 0, -10, -1073741819, 0, -7, 536870916, 3, -6, 536870916, 2, -2, 1610612742, 0, -65534, 5, 2, -65533, 5, 0, -65532, 536870917, 2, -65529, -1610612731, 0, 7, -1610612731, 0, 131062, 1073741829, 2, 131063, 536870917, 0, 131064, 536870917, 0, 131065, 1610612741, 2, 131070, 1073741829, 2, 131071, 5, 0, 65536, 5, 0, 65537, 5, 0, 65538, 1610612741, 2, 65540, 5, 0, 65541, 5, 0, 65542, 5, 0, 65543, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 10 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -720912, 0, 0, -720911, 0, 0, -720910, 0, 0, -720909, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -655376, 0, 0, -655375, 0, 0, -655374, 0, 0, -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -589840, 0, 0, -589839, 0, 0, -589838, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -524304, 0, 0, -524303, 0, 0, -524302, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -458768, 0, 0, -458767, 0, 0, -458766, 0, 0, -458765, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 0, 0, -458760, 0, 0, -458759, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524284, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -393232, 0, 0, -393231, 0, 0, -393230, 0, 0, -393229, 0, 0, -393228, 0, 0, -393227, 0, 0, -458751, 536870914, 3, -458750, 2, 3, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -327696, 0, 0, -327695, 0, 0, -327694, 0, 0, -327693, 0, 0, -327692, 0, 0, -327691, 0, 0, -393210, 0, 0, -393209, 0, 0, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -262160, 0, 0, -262159, 0, 0, -262158, 0, 0, -262157, 0, 0, -262156, 0, 0, -262155, 0, 0, -327674, 0, 0, -327673, 0, 0, -327672, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -16, -24 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -198,5 +205,3 @@ position = Vector2( 28, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 11 )] position = Vector2( -117, -53 ) - -[editable path="GameCamera"] diff --git a/src/map/3-6.tscn b/src/map/3-6.tscn index e761741..26af97a 100644 --- a/src/map/3-6.tscn +++ b/src/map/3-6.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -20,7 +20,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 14 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -57,7 +57,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 15 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -78,7 +78,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 12 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -99,7 +99,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -129,7 +129,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 14 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,13 +151,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -589841, 536870913, 0, -589840, 536870913, 0, -589839, 536870913, 0, -589838, 536870913, 0, -589837, 536870913, 0, -589835, 536870912, 1, -589834, 0, 0, -589833, 536870912, 1, -589832, 536870912, 1, -589831, 536870912, 0, -589830, 536870912, 1, -589829, 536870912, 1, -589828, 0, 0, -589827, 536870912, 1, -589826, 536870912, 1, -589825, 536870912, 0, -655360, 536870912, 1, -655359, 0, 0, -655358, 536870912, 1, -655357, 536870912, 0, -655356, 536870912, 1, -655355, 536870912, 0, -655354, 536870912, 1, -524305, 536870913, 0, -524301, 0, 0, -524300, 536870912, 1, -524299, 536870912, 0, -589818, 0, 0, -589817, 536870912, 1, -589816, 536870912, 0, -458769, 536870913, 0, -458765, 536870912, 1, -524280, 536870912, 1, -393233, 536870913, 0, -393229, 0, 0, -458744, 0, 0, -327697, 536870913, 0, -327693, 0, 0, -393211, 0, 0, -393210, 536870912, 1, -393209, 536870912, 0, -393208, 536870912, 1, -262161, 536870913, 0, -262157, 536870912, 1, -262156, 0, 0, -262155, 536870912, 1, -262154, 536870912, 0, -327675, 0, 0, -196625, 536870913, 0, -196618, 536870912, 1, -262139, 536870912, 1, -131089, 536870913, 0, -131082, 0, 0, -131081, 536870912, 1, -131080, 536870912, 1, -131079, 536870912, 0, -131078, 536870912, 1, -196603, 536870912, 0, -65553, 536870913, 0, -131067, 536870912, 0, -17, 536870913, 0, -6, 536870912, 1, -65531, 536870912, 1, 65519, 536870913, 0, 65520, 536870913, 0, 65521, 536870913, 0, 65522, 536870913, 0, 65523, 536870913, 0, 65524, 536870913, 0, 65525, 536870913, 0, 65526, 536870913, 0, 65527, 536870913, 0, 65528, 536870913, 0, 65529, 536870913, 0, 65530, 0, 0, 65531, 536870912, 1, 65532, 536870912, 1, 65533, 0, 0, 65534, 536870912, 1, 65535, 536870912, 1, 0, 536870912, 0, 1, 536870912, 1, 2, 536870912, 1, 3, 0, 0, 4, 536870912, 1, 5, 536870912, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0 ) @@ -166,13 +168,18 @@ tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -655 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -655372, 5, 2, -655371, 5, 0, -655370, 5, 0, -655369, 5, 0, -655368, 5, 0, -655367, 5, 0, -655366, 5, 0, -655365, 536870917, 2, -655362, 5, 2, -655361, 5, 0, -720896, 5, 0, -720895, 5, 0, -720894, 536870917, 2, -589836, -1073741819, 0, -655353, 536870916, 3, -655352, 536870916, 1, -655351, 4, 3, -524296, 1610612742, 0, -524293, 1073741829, 2, -524292, 1610612742, 0, -524291, 5, 0, -524290, 1610612741, 2, -589822, 1610612742, 0, -589815, 536870916, 1, -589814, 4, 3, -458766, -2147483643, 2, -458764, 1610612741, 2, -458760, 1610612741, 0, -458756, 1610612742, 0, -524287, 5, 2, -524286, 5, 0, -524285, -1610612731, 2, -524284, 4, 2, -524283, 4, 3, -524279, 4, 0, -524278, 4, 3, -393230, -1073741819, 0, -393221, 5, 2, -393220, 5, 0, -393219, -1610612731, 2, -458751, -1073741819, 2, -458750, 5, 0, -458749, 1610612741, 2, -458743, 536870916, 1, -458742, 4, 3, -327694, -1073741819, 0, -327685, 5, 0, -327684, 5, 0, -327683, 5, 0, -327681, 536870916, 3, -393216, 536870916, 2, -393207, 536870916, 0, -393206, 536870916, 2, -262158, -1073741819, 0, -262149, -1073741819, 2, -262148, 5, 0, -262147, 1610612741, 2, -262145, 536870916, 3, -327680, 536870916, 2, -327673, 4, 2, -327672, 4, 0, -327671, 536870916, 2, -196622, -1073741819, 2, -196621, 1610612741, 0, -196620, 1610612741, 0, -196619, 1610612741, 0, -196617, -1610612731, 2, -262140, -2147483643, 2, -196604, -1073741819, 0, -65545, 1073741829, 2, -65544, 5, 0, -65543, 1610612741, 2, -131072, 5, 0, -131068, -1073741819, 2, -131066, -1610612731, 2, -14, 4, 2, -13, 4, 0, -12, 4, 3, -65536, 1610612742, 0, -65530, -1610612731, 0, 65521, 536870916, 3, 65522, 536870916, 0, 65523, 536870916, 1, 65524, 536870916, 0, 65525, 536870916, 2, 6, -1610612731, 0, 131058, 4, 2, 131059, 4, 0, 131060, 4, 3, 131068, 1073741829, 2, 131069, 1610612741, 0, 131070, 1610612741, 2, 65537, 1073741829, 2, 65538, 1610612741, 0, 65539, 1610612741, 0, 65540, 1610612741, 0, 65541, 1610612741, 0, 65542, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 10 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -524304, 0, 0, -524303, 0, 0, -524302, 0, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 0, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 0, 0, -327696, 0, 0, -327695, 0, 0, -327694, 0, 0, -262160, 0, 0, -262159, 0, 0, -262158, 0, 0, -196624, 0, 0, -196623, 0, 0, -196622, 0, 0, -196621, 0, 0, -196620, 0, 0, -196619, 0, 0, -131088, 0, 0, -131087, 0, 0, -131086, 0, 0, -131085, 0, 0, -131084, 0, 0, -131083, 0, 0, -65552, 0, 0, -65551, 0, 0, -65550, 0, 0, -65549, 0, 0, -65548, 0, 0, -65547, 0, 0, -65546, 0, 0, -65545, 0, 0, -65544, 0, 0, -65543, 0, 0, -65542, 536870914, 2, -16, 0, 0, -15, 0, 0, -14, 0, 0, -13, 0, 0, -12, 0, 0, -11, 0, 0, -10, 0, 0, -9, 0, 0, -8, 0, 0, -7, 0, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -16, -36 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -202,5 +209,3 @@ position = Vector2( -89, -48 ) [node name="Note" parent="Actors" instance=ExtResource( 11 )] position = Vector2( -125, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/3-7.tscn b/src/map/3-7.tscn index a15fbf4..a739ca5 100644 --- a/src/map/3-7.tscn +++ b/src/map/3-7.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -20,7 +20,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 14 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -57,7 +57,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 15 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -78,7 +78,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 12 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -99,7 +99,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -129,7 +129,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 14 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,13 +151,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -1114125, 1, 0, -1114124, 1, 0, -1114123, 1, 0, -1114122, 1, 0, -1114121, 1, 0, -1114120, 1, 0, -1114119, 1, 0, -1114118, 1, 0, -1114117, 1, 0, -1114116, 1, 0, -1114115, 1, 0, -1114114, 1, 0, -1114113, 1, 0, -1179648, 1, 0, -1179647, 1, 0, -1179646, 1, 0, -1179645, 1, 0, -1179644, 1, 0, -1179643, 1, 0, -1179642, 1, 0, -1179641, 1, 0, -1179640, 1, 0, -1179639, 1, 0, -1179638, 1, 0, -1179637, 1, 0, -1179636, 1, 0, -1179635, 1, 0, -1179634, 1, 0, -1179633, 1, 0, -1179632, 1, 0, -1048589, 1, 0, -1114096, 1, 0, -983053, 1, 0, -1048560, 1, 0, -917517, 1, 0, -983024, 1, 0, -851981, 1, 0, -917488, 1, 0, -786445, 1, 0, -851952, 1, 0, -720909, 1, 0, -720898, 0, 0, -720897, 536870912, 1, -786432, 536870912, 0, -786431, 536870912, 1, -786430, 0, 0, -786429, 536870912, 1, -786428, 536870912, 0, -786427, 536870912, 1, -786426, 0, 0, -786425, 536870912, 1, -786424, 536870912, 0, -786423, 536870912, 1, -786416, 1, 0, -655373, 1, 0, -655362, 536870912, 1, -720887, 536870912, 0, -720880, 1, 0, -589837, 1, 0, -589826, 536870912, 0, -655351, 536870912, 1, -655350, 0, 0, -655349, 536870912, 1, -655348, 536870912, 0, -655347, 536870912, 1, -655344, 1, 0, -524301, 1, 0, -524295, 0, 0, -524291, 0, 0, -524290, 536870912, 1, -524289, 536870912, 1, -589824, 536870912, 0, -589811, 536870912, 0, -589808, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 0, 0, -458761, 536870912, 1, -458760, 536870912, 0, -458759, 536870912, 1, -524275, 536870912, 1, -524272, 1, 0, -393226, 536870912, 1, -458743, 0, 0, -458742, 536870912, 1, -458741, 0, 0, -458740, 536870912, 1, -458739, 536870912, 0, -458738, 1, 0, -458737, 1, 0, -458736, 1, 0, -327690, 536870912, 0, -393207, 536870912, 1, -262154, 536870912, 1, -327671, 0, 0, -196618, 0, 0, -262135, 536870912, 1, -131082, 0, 0, -131081, 536870912, 1, -131080, 0, 0, -131079, 0, 1, -131078, 536870912, 0, -196599, 536870912, 0, -65542, 536870912, 0, -131063, 536870912, 1, -6, 536870912, 1, -65527, 536870912, 0, 65530, 0, 0, 65531, 536870912, 1, 65532, 536870912, 1, 65533, 0, 0, 65534, 536870912, 1, 65535, 536870912, 0, 0, 536870912, 1, 1, 536870912, 1, 2, 0, 0, 3, 536870912, 1, 4, 536870912, 0, 5, 536870912, 1, 6, 536870912, 1, 7, 0, 0, 8, 536870912, 1, 9, 536870912, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0, -65531, 0, 0, -65530, 0, 0, -65529, 0, 0, -65528, 0, 0 ) @@ -166,13 +168,18 @@ tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -655 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -786443, 536870916, 3, -786442, 4, 1, -786441, 4, 0, -786440, 4, 3, -786435, -2147483643, 2, -786434, 5, 0, -786433, 5, 0, -851968, 5, 0, -851967, 5, 0, -851966, 5, 0, -851965, 536870917, 2, -851961, 5, 2, -851960, 5, 0, -851959, 5, 0, -851958, -1610612731, 2, -720907, 536870916, 1, -720906, 536870916, 0, -720905, 4, 1, -720904, 536870916, 0, -720899, 5, 0, -786422, -1610612731, 0, -655371, 4, 2, -655370, 4, 1, -655369, 536870916, 0, -655368, 536870916, 2, -655363, 5, 0, -720896, 4, 2, -720895, 4, 0, -720894, 4, 3, -720893, 1073741829, 2, -720892, 1610612742, 0, -720891, 5, 0, -720890, 1610612742, 0, -720889, 1610612741, 2, -720886, -1073741819, 2, -720885, 5, 0, -720884, -1610612731, 2, -589834, 4, 2, -589833, 4, 1, -589832, 4, 3, -589830, 5, 2, -589829, 5, 0, -589828, 5, 0, -589827, 1610612741, 2, -655360, 4, 2, -655359, 4, 1, -655358, 4, 3, -655356, 1610612742, 0, -655354, 1610612742, 0, -524298, 4, 2, -524297, 4, 0, -524296, 536870916, 2, -589820, 1610612742, 0, -589818, 1610612741, 2, -589816, 536870916, 3, -589815, 536870916, 0, -589814, 536870916, 2, -589812, -1073741819, 0, -458758, 5, 0, -458755, 1610612742, 0, -524287, 536870916, 3, -524286, 536870916, 2, -524284, 1610612741, 0, -524280, 536870916, 3, -524279, 536870916, 1, -524278, 536870916, 2, -524276, -1073741819, 0, -393227, -2147483643, 2, -393225, 5, 0, -393224, 5, 0, -393223, 5, 0, -393222, 1610612741, 2, -393220, 5, 2, -393219, 5, 0, -393218, -1610612731, 2, -458747, 536870916, 3, -458746, 536870916, 2, -327691, -1073741819, 0, -327687, 4, 2, -327686, 4, 3, -327684, 5, 0, -327683, 5, 0, -327682, 5, 0, -393211, 536870916, 3, -393210, 536870916, 2, -393208, -2147483643, 2, -393206, 5, 0, -393205, 5, 0, -393204, 1610612741, 2, -262155, -1073741819, 0, -262148, -1073741819, 2, -262147, 5, 0, -262146, 1610612741, 2, -327672, -2147483643, 0, -196619, -1073741819, 2, -196617, 5, 0, -196616, -1610612731, 2, -262143, 5, 2, -262142, 5, 0, -262141, -1610612731, 2, -262136, -2147483643, 0, -196607, -1073741819, 2, -196606, 5, 0, -196605, 1610612741, 2, -196600, -1073741819, 2, -196598, -1610612731, 2, -65544, -1073741819, 2, -65543, 5, 0, -131070, 1610612742, 0, -131062, -1610612731, 0, -7, -1073741819, 0, -65534, 1610612742, 0, -65526, -1610612731, 0, 65529, -1073741819, 0, 10, -1610612731, 0, 131065, 1073741829, 2, 131066, 5, 0, 131067, 5, 0, 131068, 5, 0, 131069, 1610612741, 2, 65536, 4, 2, 65537, 536870916, 0, 65538, 536870916, 1, 65539, 536870916, 0, 65540, 536870916, 2, 65542, 1073741829, 2, 65543, 1610612741, 0, 65544, 1610612741, 0, 65545, 1610612741, 0, 65546, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 10 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1048588, 0, 0, -1048587, 0, 0, -1048586, 0, 0, -1048585, 0, 0, -1048584, 0, 0, -1048583, 0, 0, -1048582, 0, 0, -1048581, 0, 0, -1048580, 0, 0, -1048579, 0, 0, -1048578, 0, 0, -1048577, 0, 0, -1114112, 0, 0, -1114111, 0, 0, -1114110, 0, 0, -1114109, 0, 0, -1114108, 0, 0, -1114107, 0, 0, -1114106, 0, 0, -1114105, 0, 0, -1114104, 0, 0, -1114103, 0, 0, -1114102, 0, 0, -1114101, 0, 0, -1114100, 0, 0, -1114099, 0, 0, -1114098, 0, 0, -1114097, 0, 0, -983052, 0, 0, -983051, 0, 0, -983050, 0, 0, -983049, 0, 0, -983048, 0, 0, -983047, 0, 0, -983046, 0, 0, -983045, 0, 0, -983044, 0, 0, -983043, 0, 0, -983042, 0, 0, -983041, 0, 0, -1048576, 0, 0, -1048575, 0, 0, -1048574, 0, 0, -1048573, 0, 0, -1048572, 0, 0, -1048571, 0, 0, -1048570, 0, 0, -1048569, 0, 0, -1048568, 0, 0, -1048567, 0, 0, -1048566, 0, 0, -1048565, 0, 0, -1048564, 0, 0, -1048563, 0, 0, -1048562, 0, 0, -1048561, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -851953, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -720881, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -655346, 0, 0, -655345, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524294, 2, 3, -524293, 536870914, 2, -524292, 2, 3, -589810, 0, 0, -589809, 0, 0, -524274, 0, 0, -524273, 0, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -44 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -211,5 +218,3 @@ position = Vector2( -4, -80 ) [node name="Note" parent="Actors" instance=ExtResource( 11 )] position = Vector2( 107, -101 ) - -[editable path="GameCamera"] diff --git a/src/map/3-8.tscn b/src/map/3-8.tscn index b0a3643..6f85848 100644 --- a/src/map/3-8.tscn +++ b/src/map/3-8.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -24,7 +24,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 18 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.690196, 0.623529, 0.8, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -61,7 +61,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 19 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -133,7 +133,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 18 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.690196, 0.623529, 0.8, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -155,14 +155,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.690196, 0.623529, 0.8, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) color_grass = Color( 0.513726, 0.529412, 0, 1 ) color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -786421, 1, 0, -786420, 1, 0, -786419, 1, 0, -786418, 1, 0, -786417, 1, 0, -655369, 536870912, 1, -655368, 0, 0, -655367, 536870912, 1, -655366, 536870912, 0, -655365, 536870912, 1, -655364, 536870912, 1, -655363, 536870912, 1, -655362, 0, 0, -655361, 536870912, 1, -720896, 536870912, 1, -720895, 536870912, 1, -720894, 536870912, 0, -720893, 536870912, 1, -720892, 536870912, 1, -720891, 536870912, 1, -720890, 0, 0, -720889, 536870912, 1, -720888, 536870912, 0, -720887, 536870912, 1, -720886, 0, 0, -720885, 536870912, 1, -720881, 1, 0, -589834, 536870912, 1, -589833, 0, 0, -655349, 536870912, 0, -655345, 1, 0, -524298, 536870912, 0, -589813, 536870912, 1, -589809, 1, 0, -458762, 536870912, 1, -524281, 0, 0, -524280, 536870912, 1, -524279, 0, 0, -524278, 536870912, 1, -524277, 536870912, 0, -524273, 1, 0, -393226, 0, 0, -458737, 1, 0, -327690, 536870912, 1, -393201, 1, 0, -262154, 536870912, 0, -327672, 1, 0, -327671, 1, 0, -327670, 536870912, 1, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -327666, 1, 0, -327665, 1, 0, -196619, 0, 0, -196618, 536870912, 1, -196617, 536870912, 1, -196616, 536870912, 0, -196611, 0, 0, -196610, 536870912, 1, -196609, 536870912, 1, -262144, 536870912, 1, -262143, 536870912, 0, -262142, 536870912, 1, -262141, 536870912, 1, -262140, 0, 0, -262139, 536870912, 1, -262138, 536870912, 0, -262137, 536870912, 1, -262136, 0, 0, -262135, 536870912, 1, -262134, 536870912, 0, -131083, 536870912, 1, -196599, 536870912, 0, -65547, 536870912, 0, -131063, 536870912, 1, -11, 536870912, 1, -10, 0, 0, -9, 536870912, 1, -8, 536870912, 1, -7, 536870912, 0, -6, 536870912, 1, -65530, 0, 0, -65529, 536870912, 1, -65528, 536870912, 1, -65527, 536870912, 0, 65530, 536870912, 0, 6, 536870912, 1, 131066, 536870912, 1, 65542, 536870912, 0, 196602, 0, 0, 196603, 536870912, 1, 196604, 536870912, 1, 196605, 0, 0, 196606, 536870912, 1, 196607, 536870912, 0, 131072, 536870912, 1, 131073, 536870912, 1, 131074, 0, 0, 131075, 536870912, 1, 131076, 536870912, 1, 131077, 536870912, 0, 131078, 536870912, 1 ) -tile_color = Color( 0.690196, 0.623529, 0.8, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, 0, 0, -327679, 0, 0, -327678, 0, 0, -327677, 0, 0, -327676, 0, 0, -327675, 0, 0, -327674, 0, 0, -327673, 0, 0, -327672, 0, 0, -327671, 0, 0, 131067, 536870912, 0, 131068, 0, 0, 131069, 0, 0, 131070, 0, 0, 131071, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0 ) @@ -171,16 +172,18 @@ tile_data = PoolIntArray( -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -720906, 5, 2, -720905, 5, 0, -720904, 5, 0, -720903, 5, 0, -720902, 5, 0, -720898, 5, 2, -720897, 5, 0, -786432, 5, 0, -786430, 5, 2, -786429, 5, 0, -786428, 5, 0, -786427, 5, 0, -786426, 5, 0, -786425, 5, 0, -786424, 536870917, 2, -655371, 5, 2, -655370, -1610612731, 0, -589835, -1073741819, 0, -589830, 1073741829, 2, -589829, 5, 0, -589828, 5, 0, -589827, 1610612742, 0, -589826, 1610612741, 2, -655360, 1073741829, 2, -655359, 5, 0, -655358, 1610612741, 2, -655352, 5, 0, -524299, -1073741819, 0, -524296, 536870916, 3, -524295, 536870916, 2, -524291, 1610612741, 0, -589821, 5, 2, -589820, 5, 0, -589819, -1610612731, 2, -589816, 5, 0, -458763, -1073741819, 2, -458761, -1610612731, 2, -524285, 5, 0, -524284, 5, 0, -524283, 5, 0, -393225, -1610612730, 0, -393224, -1610612730, 0, -393223, -1610612731, 0, -458749, -1073741819, 2, -458748, 5, 0, -458747, 1610612741, 2, -458744, 1073741829, 2, -458743, 5, 0, -458741, -1610612731, 2, -327691, -2147483643, 2, -327689, -536870907, 2, -393212, 6, 0, -393210, 536870916, 3, -393209, 536870916, 2, -393205, 5, 0, -262156, 5, 2, -262155, 1610612741, 0, -327676, 6, 0, -327669, 5, 0, -196620, -1073741819, 0, -196614, 4, 2, -196613, 4, 3, -262133, 5, 0, -131084, -1073741819, 0, -131078, 4, 2, -131077, 4, 3, -131074, 6, 0, -196606, 4, 2, -196605, 536870916, 0, -196604, 536870916, 2, -196603, 6, 0, -196600, -2147483643, 2, -196598, 5, 0, -196597, 1610612741, 2, -65548, -1073741819, 0, -65544, 5, 2, -65543, 5, 0, -65542, 536870917, 2, -65538, 1073741829, 2, -131071, 5, 0, -131067, 1610612741, 2, -131064, -1073741819, 0, -12, -1073741819, 0, -65535, 1610612742, 0, 65524, 1073741829, 2, 65525, 1073741829, 0, 65526, 1073741829, 0, 65527, 1073741829, 0, 65528, -536870907, 2, 1, 1610612742, 0, 7, 5, 0, 8, 1610612741, 2, 65537, 1610612742, 0, 65543, 5, 0, 131079, 5, 0, 196609, 1073741829, 2, 196610, 5, 0, 196611, 5, 0, 196612, 5, 0, 196613, 5, 0, 196614, 5, 0, 196615, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) grass_color = Color( 0.513726, 0.529412, 0, 1 ) wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 14 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -524276, 0, 0, -524275, 0, 0, -524274, 0, 0, -458742, 2, 2, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -393206, 536870914, 2, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -393202, 0, 0 ) -tile_color = Color( 0.690196, 0.623529, 0.8, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 4, -33 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -272,5 +275,3 @@ position = Vector2( -76, -12 ) [node name="Note" parent="Actors" instance=ExtResource( 15 )] position = Vector2( 99, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/4-1.tscn b/src/map/4-1.tscn index 578d42d..9a76125 100644 --- a/src/map/4-1.tscn +++ b/src/map/4-1.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=9] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 0, 0, -458753, 0, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 0, 0, -393217, 0, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 2, 2 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -4 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -192,5 +193,3 @@ position = Vector2( -61, 8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -13, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-2.tscn b/src/map/4-2.tscn index b38c4ff..8e5b132 100644 --- a/src/map/4-2.tscn +++ b/src/map/4-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=6] @@ -19,7 +19,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 13 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.219608, 0.180392, 0.121569, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -77,7 +77,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 11 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.670588, 0.172549, 0.34902, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.294118, 0.431373, 0.180392, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -128,7 +128,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 13 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,12 +151,14 @@ script = ExtResource( 8 ) palette = 3 color_solid = Color( 0.760784, 0.654902, 0.509804, 1 ) -color_grass = Color( 0, 0.560784, 0.909804, 1 ) -color_wood = Color( 0, 0.509804, 0.0784314, 1 ) +color_back = Color( 0.219608, 0.180392, 0.121569, 1 ) +color_grass = Color( 0.670588, 0.172549, 0.34902, 1 ) +color_wood = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 6 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -1245199, 1, 0, -1245198, 1, 0, -1245197, 1, 0, -1245196, 1, 0, -1245195, 1, 0, -1245194, 1, 0, -1245193, 1, 0, -1245192, 1, 0, -1245191, 1, 0, -1245190, 1, 0, -1245189, 1, 0, -1245188, 1, 0, -1245187, 1, 0, -1245186, 1, 0, -1245185, 1, 0, -1310720, 1, 0, -1310719, 1, 0, -1310718, 1, 0, -1310717, 1, 0, -1310716, 1, 0, -1310715, 1, 0, -1310714, 1, 0, -1310713, 1, 0, -1310712, 1, 0, -1310711, 1, 0, -1310710, 1, 0, -1310709, 1, 0, -1310708, 1, 0, -1310707, 1, 0, -1310706, 1, 0, -1179663, 1, 0, -1245170, 1, 0, -1114127, 1, 0, -1179634, 1, 0, -1048591, 1, 0, -1114098, 1, 0, -983055, 1, 0, -1048562, 1, 0, -917519, 1, 0, -983026, 1, 0, -851983, 1, 0, -851974, 0, 1, -851973, 536870912, 0, -851972, 0, 1, -851971, 0, 1, -851970, 0, 0, -851969, 0, 1, -917504, 536870912, 0, -917503, 0, 1, -917502, 0, 0, -917501, 0, 1, -917500, 0, 1, -917499, 536870912, 0, -917498, 0, 1, -917490, 1, 0, -786447, 1, 0, -786439, 0, 1, -851962, 0, 0, -851954, 1, 0, -720911, 1, 0, -720903, 0, 0, -786426, 0, 0, -786418, 1, 0, -655375, 1, 0, -655367, 0, 1, -655362, 0, 0, -655361, 0, 1, -720896, 0, 1, -720895, 536870912, 0, -720890, 0, 1, -720882, 1, 0, -589839, 1, 0, -589833, 0, 0, -589832, 0, 1, -589831, 536870912, 0, -655354, 0, 0, -655352, 536870912, 0, -655346, 1, 0, -524303, 1, 0, -524297, 0, 1, -589816, 536870912, 0, -589810, 1, 0, -458767, 1, 0, -458761, 536870912, 0, -524280, 0, 1, -524274, 1, 0, -393231, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 0, 0, -393225, 0, 1, -458744, 0, 0, -458743, 0, 1, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -458738, 1, 0, -327690, 0, 1, -393207, 536870912, 0, -262154, 0, 0, -327671, 0, 1, -196618, 0, 1, -262135, 0, 0, -131082, 536870912, 0, -196599, 0, 0, -65546, 536870912, 0, -131063, 0, 1, -10, 0, 1, -65527, 536870912, 0, 65526, 0, 0, 65527, 0, 1, 65528, 0, 1, 65529, 536870912, 0, 65530, 0, 1, 65531, 0, 1, 65532, 0, 0, 65533, 0, 1, 65534, 0, 1, 65535, 536870912, 0, 0, 0, 1, 1, 0, 1, 2, 0, 0, 3, 0, 1, 4, 0, 1, 5, 536870912, 0, 6, 0, 1, 7, 0, 1, 8, 0, 0, 9, 0, 1 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 4 )] @@ -164,13 +166,18 @@ tile_data = PoolIntArray( -1245199, 1, 0, -1245198, 1, 0, -1245197, 1, 0, -12451 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -917508, 5, 2, -917507, 5, 0, -917506, 536870917, 2, -983038, 5, 2, -983037, 536870917, 0, -983036, 5, 2, -983035, 536870917, 0, -983034, 536870917, 0, -983033, 536870917, 2, -917497, 536870917, 0, -786440, -2147483643, 2, -786438, 5, 0, -786437, 1610612742, 0, -786436, 1610612741, 2, -786434, 1073741829, 2, -786433, 5, 0, -851968, 5, 0, -851967, 5, 0, -851966, 1610612741, 2, -851963, 5, 2, -851961, -536870907, 2, -720904, -1073741819, 0, -720901, 1610612742, 0, -786429, 4, 2, -786428, 4, 3, -786427, -1073741819, 0, -655368, -1073741819, 0, -655365, 1073741829, 0, -720891, -1073741819, 2, -720889, -1610612731, 2, -655357, 5, 0, -524298, -2147483643, 2, -524296, 1610612741, 2, -524294, 536870916, 3, -524293, 536870916, 2, -524291, 5, 2, -524290, 536870917, 0, -524289, 536870917, 0, -589824, 536870917, 0, -589823, -1610612731, 2, -589821, 1610612742, 0, -589817, -1073741819, 0, -458763, -2147483643, 2, -458762, 1610612741, 0, -458756, 5, 2, -458755, 536870917, 0, -458754, 536870917, 0, -458753, 536870917, 0, -524288, 536870917, 0, -524287, 536870917, 0, -524286, -1610612731, 2, -524285, 1610612742, 0, -524284, 5, 2, -524283, -1610612731, 2, -524281, -1073741819, 2, -524279, 536870917, 0, -524278, 536870917, 2, -393227, -1073741819, 0, -393222, 5, 2, -393221, 536870917, 0, -393220, -2147483643, 0, -393219, 536870917, 0, -393218, 536870917, 0, -393217, 536870917, 0, -458752, -1610612730, 0, -458751, 536870917, 0, -458750, -1610612730, 0, -458749, -1610612730, 0, -458748, -1073741819, 0, -458747, -1073741819, 0, -458742, -536870907, 0, -327691, -1073741819, 0, -327687, -536870907, 0, -327686, -1073741818, 0, -327685, -1073741818, 0, -327684, -1073741818, 0, -327683, 536870917, 0, -327682, -1610612730, 0, -327681, 536870917, 0, -393216, 536870917, 0, -393215, 536870917, 0, -393214, 536870917, 0, -393212, -1073741819, 2, -393211, 1610612741, 2, -393206, -536870907, 0, -262155, -1073741819, 2, -262153, -1610612731, 2, -262150, 1073741829, 2, -262149, 6, 0, -262147, -1073741819, 2, -262146, 536870917, 0, -262145, 1610612742, 0, -327680, 536870917, 0, -327679, 536870917, 0, -327678, 1610612741, 2, -327673, -2147483643, 0, -327672, -1073741818, 0, -327670, -536870907, 2, -196617, -1610612731, 0, -196613, 1073741829, 2, -196609, 1610612742, 0, -262143, 1610612741, 2, -262139, 4, 2, -262138, 4, 3, -262136, -1073741819, 0, -131081, -1610612731, 0, -131079, 536870916, 3, -131078, 536870916, 2, -131075, 5, 2, -131074, -1073741818, 0, -131073, -1073741818, 0, -196608, -1073741818, 0, -196607, -1073741818, 0, -196606, -1073741818, 0, -196605, -2147483643, 0, -196603, 4, 2, -196602, 4, 3, -196600, -1073741819, 0, -65547, -2147483643, 2, -65545, -536870907, 2, -65540, 536870917, 0, -65539, -2147483643, 1, -65538, 1610612742, 0, -131072, 1610612742, 0, -131071, 1610612741, 2, -131064, -1073741819, 2, -131062, 5, 0, -11, -1073741819, 0, -7, 5, 2, -6, 5, 0, -5, 536870917, 2, -3, 1610612742, 0, -65536, 1610612742, 0, -65533, 5, 2, -65532, 5, 0, -65531, 5, 0, -65530, 5, 0, -65529, 536870917, 2, -65526, 5, 0, 65525, -1073741819, 0, 10, 5, 0, 131061, 1073741829, 2, 131062, 1610612741, 0, 131063, 1610612741, 0, 131064, 1610612741, 0, 131065, 1610612741, 0, 131067, 1073741829, 2, 131068, 5, 0, 131069, 5, 0, 131070, 1610612741, 2, 131071, 5, 0, 65536, 1073741829, 2, 65537, 5, 0, 65538, 5, 0, 65539, 1610612741, 2, 65543, 1073741829, 2, 65544, 5, 0, 65545, 5, 0, 65546, -536870907, 2 ) +brick_color = Color( 0.219608, 0.180392, 0.121569, 1 ) +grass_color = Color( 0.670588, 0.172549, 0.34902, 1 ) +wood_color = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1179662, 536870912, 0, -1179661, 536870912, 0, -1179660, 536870912, 0, -1179659, 536870912, 0, -1179658, 536870912, 0, -1179657, 536870912, 0, -1179656, 536870912, 0, -1179655, 536870912, 0, -1179654, 536870912, 0, -1179653, 536870912, 0, -1179652, 536870912, 0, -1179651, 536870912, 0, -1179650, 536870912, 0, -1179649, 536870912, 0, -1245184, 536870912, 0, -1245183, 536870912, 0, -1245182, 536870912, 0, -1245181, 536870912, 0, -1245180, 536870912, 0, -1245179, 536870912, 0, -1245178, 536870912, 0, -1245177, 536870912, 0, -1245176, 536870912, 0, -1245175, 536870912, 0, -1245174, 536870912, 0, -1245173, 536870912, 0, -1245172, 536870912, 0, -1245171, 536870912, 0, -1114126, 536870912, 0, -1114125, 536870912, 0, -1114124, 536870912, 0, -1114123, 536870912, 0, -1114122, 536870912, 0, -1114121, 536870912, 0, -1114120, 536870912, 0, -1114119, 536870912, 0, -1114118, 536870912, 0, -1114117, 536870912, 0, -1114116, 536870912, 0, -1114115, 536870912, 0, -1114114, 536870912, 0, -1114113, 536870912, 0, -1179648, 536870912, 0, -1179647, 536870912, 0, -1179646, 536870912, 0, -1179645, 536870912, 0, -1179644, 536870912, 0, -1179643, 536870912, 0, -1179642, 536870912, 0, -1179641, 536870912, 0, -1179640, 536870912, 0, -1179639, 536870912, 0, -1179638, 536870912, 0, -1179637, 536870912, 0, -1179636, 536870912, 0, -1179635, 536870912, 0, -1048590, 536870912, 0, -1048589, 536870912, 0, -1048588, 536870912, 0, -1048587, 536870912, 0, -1048586, 536870912, 0, -1048585, 536870912, 0, -1048584, 536870912, 0, -1048583, 536870912, 0, -1048582, 536870912, 0, -1048581, 536870912, 0, -1048580, 536870912, 0, -1048579, 536870912, 0, -1048578, 536870912, 0, -1048577, 536870912, 0, -1114112, 536870912, 0, -1114111, 536870912, 0, -1114110, 536870912, 0, -1114109, 536870912, 0, -1114108, 536870912, 0, -1114107, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -1114100, 536870912, 0, -1114099, 536870912, 0, -983054, 536870912, 0, -983053, 536870912, 0, -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 2, 2, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 0, 0, -589836, 0, 0, -589835, 536870912, 0, -589834, 536870912, 0, -655353, 536870914, 3, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524302, 536870912, 0, -524301, 0, 0, -524300, 0, 0, -524299, 536870912, 0, -524298, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -52 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -206,5 +213,3 @@ position = Vector2( -69, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -101, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/4-3.tscn b/src/map/4-3.tscn index 639d448..ab9f8f9 100644 --- a/src/map/4-3.tscn +++ b/src/map/4-3.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -19,7 +19,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 13 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.4, 0.741176, 0.415686, 1 ) +0/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.0823529, 0.239216, 0.0901961, 1 ) +4/modulate = Color( 0.219608, 0.180392, 0.121569, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -77,7 +77,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 11 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0.0392157, 0.411765, 0.941176, 1 ) +5/modulate = Color( 0.670588, 0.172549, 0.34902, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.658824, 0.176471, 0.176471, 1 ) +6/modulate = Color( 0.294118, 0.431373, 0.180392, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -128,7 +128,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 13 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.4, 0.741176, 0.415686, 1 ) +2/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -150,15 +150,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 3 -color_solid = Color( 0.4, 0.741176, 0.415686, 1 ) -color_back = Color( 0.0823529, 0.239216, 0.0901961, 1 ) -color_grass = Color( 0.0392157, 0.411765, 0.941176, 1 ) -color_wood = Color( 0.658824, 0.176471, 0.176471, 1 ) +color_solid = Color( 0.760784, 0.654902, 0.509804, 1 ) +color_back = Color( 0.219608, 0.180392, 0.121569, 1 ) +color_grass = Color( 0.670588, 0.172549, 0.34902, 1 ) +color_wood = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -851981, 536870913, 0, -851980, 536870913, 0, -851979, 536870913, 0, -851978, 536870913, 0, -851977, 536870913, 0, -851976, 536870913, 0, -851975, 536870913, 0, -851974, 536870913, 0, -851973, 536870913, 0, -851972, 536870913, 0, -851971, 536870913, 0, -851970, 536870913, 0, -851969, 536870913, 0, -917504, 536870913, 0, -917503, 536870913, 0, -917502, 536870913, 0, -917501, 536870913, 0, -917500, 536870913, 0, -917499, 536870913, 0, -917498, 536870913, 0, -917497, 536870913, 0, -917496, 536870913, 0, -917495, 536870913, 0, -917494, 536870913, 0, -917493, 536870913, 0, -917492, 536870913, 0, -917491, 536870913, 0, -917490, 536870913, 0, -917489, 536870913, 0, -917488, 536870913, 0, -786445, 536870913, 0, -851952, 536870913, 0, -720909, 536870913, 0, -786416, 536870913, 0, -655373, 536870913, 0, -720880, 536870913, 0, -589837, 536870913, 0, -655344, 536870913, 0, -524301, 536870913, 0, -589808, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 536870913, 0, -458762, 536870913, 0, -458761, 0, 0, -458760, 0, 1, -458759, 536870912, 0, -458758, 0, 1, -458757, 0, 0, -458756, 0, 1, -458755, 0, 1, -458754, 536870912, 0, -458753, 0, 1, -524284, 0, 0, -524283, 0, 1, -524282, 536870912, 0, -524281, 0, 1, -524280, 0, 1, -524279, 536870912, 0, -524272, 536870913, 0, -393225, 0, 1, -458748, 0, 1, -458743, 536870912, 0, -458736, 536870913, 0, -327689, 536870912, 0, -327681, 0, 1, -393216, 0, 0, -393215, 0, 1, -393214, 536870912, 0, -393213, 0, 1, -393212, 536870912, 0, -393207, 0, 1, -393200, 536870913, 0, -262153, 536870912, 0, -327671, 0, 0, -327670, 0, 1, -327669, 536870912, 0, -327668, 0, 1, -327667, 536870913, 0, -327666, 536870913, 0, -327665, 536870913, 0, -327664, 536870913, 0, -196617, 0, 1, -262132, 0, 0, -131081, 0, 0, -196596, 0, 0, -65545, 0, 1, -131060, 0, 1, -9, 0, 0, -65524, 536870912, 0, 65527, 0, 0, 12, 0, 1, 131063, 0, 1, 65548, 536870912, 0, 196599, 536870912, 0, 131084, 536870912, 0, 262135, 0, 1, 196620, 0, 1, 327671, 536870912, 0, 262151, 0, 0, 262152, 0, 1, 262153, 0, 1, 262154, 0, 0, 262155, 0, 1, 262156, 536870912, 0, 393207, 536870912, 0, 327687, 0, 1, 458743, 0, 1, 458744, 0, 0, 458745, 0, 1, 458746, 0, 1, 458747, 536870912, 0, 458748, 0, 1, 458749, 0, 1, 458750, 0, 1, 458751, 0, 0, 393216, 0, 1, 393217, 0, 1, 393218, 536870912, 0, 393219, 0, 1, 393220, 0, 1, 393221, 0, 0, 393222, 0, 1, 393223, 536870912, 0 ) -tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 393208, 0, 0, 393209, 0, 0, 393210, 0, 0, 393211, 0, 0, 393212, 0, 0, 393213, 0, 0, 393214, 0, 0, 393215, 0, 0, 327680, 0, 0, 327681, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0 ) @@ -167,17 +167,18 @@ tile_data = PoolIntArray( 393208, 0, 0, 393209, 0, 0, 393210, 0, 0, 393211, 0, 0 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -524296, 5, 2, -524295, 5, 0, -524294, 5, 0, -524293, 536870917, 2, -589819, 5, 2, -589818, 5, 0, -589817, 5, 0, -589816, 5, 0, -589815, 5, 0, -589814, 536870917, 2, -524278, -1610612731, 0, -393224, 5, 0, -393221, 1073741829, 2, -393220, 5, 0, -393219, 5, 0, -393218, 5, 0, -458752, 536870917, 2, -458749, 5, 2, -458747, 1610612741, 2, -458742, -1610612731, 0, -327688, 5, 0, -327686, 536870916, 3, -327685, 536870916, 2, -393206, -1610612731, 0, -262154, -2147483643, 2, -262152, -536870907, 2, -262151, 536870916, 3, -262150, 536870916, 2, -262147, 4, 2, -262146, 4, 3, -327680, 1073741829, 2, -327679, 1610612742, 0, -327678, 1610612741, 0, -327677, 1610612742, 0, -327674, 5, 2, -327673, -1610612731, 2, -196618, -1073741819, 0, -196613, 5, 2, -196612, -1610612731, 2, -196611, 4, 2, -196610, 4, 0, -196609, 4, 3, -262143, 1610612742, 0, -262141, 1610612741, 0, -262138, -1073741819, 2, -262137, -1610612731, 0, -262134, 1073741829, 2, -262133, 5, 0, -262131, -1610612731, 2, -131082, -2147483643, 2, -131078, 5, 2, -131077, -1610612731, 0, -131076, -1610612731, 0, -131074, 4, 2, -131073, 4, 3, -196608, 5, 2, -196607, 1610612741, 0, -196606, 1610612741, 0, -196605, 1610612741, 0, -196604, -1610612731, 2, -196601, 6, 0, -196600, 536870916, 3, -196599, 4, 0, -196598, 536870916, 2, -196595, -1610612731, 0, -65547, -2147483643, 2, -65546, -1610612731, 0, -65542, -1073741819, 0, -65541, 5, 0, -65540, 5, 0, -65539, -1610612731, 2, -131072, 1610612741, 0, -131071, 1610612741, 0, -131070, 1610612741, 0, -131069, 1610612741, 0, -131068, -1610612730, 0, -131067, -1610612731, 2, -131066, -1610612730, 0, -131065, 6, 0, -131059, -1610612731, 0, -11, -1610612731, 0, -10, 5, 0, -7, -2147483643, 2, -6, 5, 0, -5, 5, 0, -4, 5, 0, -3, -2147483643, 0, -65536, 1610612741, 0, -65535, 1610612742, 0, -65534, 1610612741, 0, -65533, 1610612741, 0, -65532, 1610612741, 0, -65531, 1610612741, 0, -65529, 1610612741, 2, -65523, -1610612731, 0, 65525, -1073741819, 2, 65526, 5, 0, 65529, 5, 0, 65530, 5, 0, 65531, 5, 0, 65532, 5, 0, 65533, -536870907, 2, 0, -1073741819, 2, 1, -1610612731, 0, 2, 1610612741, 0, 3, 1610612741, 0, 4, 1610612742, 0, 5, 1610612741, 0, 7, 536870916, 3, 8, 4, 1, 9, 536870916, 2, 11, -2147483643, 2, 13, 1610612741, 2, 131062, -1073741819, 2, 131065, -1073741819, 2, 131066, 5, 0, 131067, 5, 0, 131068, 1610612741, 2, 131070, -2147483643, 2, 131071, -1073741818, 0, 65536, -1073741818, 0, 65537, 1610612741, 2, 65539, -1610612731, 0, 65540, 1610612741, 0, 65541, -1073741819, 0, 65543, 536870916, 3, 65544, 536870916, 0, 65545, 536870916, 2, 65547, -1073741819, 0, 196598, 5, 0, 196603, 6, 0, 196606, -1610612731, 0, 196607, 1610612742, 0, 131075, 1073741829, 2, 131076, 1610612741, 0, 131077, 1610612741, 2, 131079, 536870916, 3, 131080, 536870916, 2, 131083, -1073741819, 0, 262134, -1073741819, 2, 262136, 5, 0, 262137, -1073741819, 1, 262138, -1073741819, 1, 262139, 6, 0, 262140, -536870907, 2, 262142, -1073741819, 2, 262143, 1610612742, 0, 196608, -1610612731, 2, 196609, 4, 2, 196610, 4, 3, 196612, 1610612742, 0, 196619, -1073741819, 2, 196621, -1610612731, 2, 327674, -1073741819, 2, 327675, 6, 0, 327679, 1610612742, 0, 262144, -1610612731, 0, 262148, 1610612742, 0, 262149, -536870907, 2, 262157, -1610612731, 0, 393211, 6, 0, 393215, 1610612742, 0, 327680, -1610612731, 0, 327684, 1610612742, 0, 327688, 5, 2, 327689, 5, 0, 327690, 5, 0, 327691, 5, 0, 327692, 5, 0, 327693, 1610612741, 2, 393224, -1610612731, 0, 524283, 1073741829, 2, 524284, 5, 0, 524285, 5, 0, 524286, 5, 0, 524287, 5, 0, 458752, 1610612741, 2, 458756, 1073741829, 2, 458757, 5, 0, 458758, 5, 0, 458759, 5, 0, 458760, 1610612741, 2 ) -brick_color = Color( 0.0823529, 0.239216, 0.0901961, 1 ) -grass_color = Color( 0.0392157, 0.411765, 0.941176, 1 ) -wood_color = Color( 0.658824, 0.176471, 0.176471, 1 ) +brick_color = Color( 0.219608, 0.180392, 0.121569, 1 ) +grass_color = Color( 0.670588, 0.172549, 0.34902, 1 ) +wood_color = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -393217, 536870914, 2, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -393201, 536870912, 0 ) -tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -4 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -219,5 +220,3 @@ position = Vector2( 84, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 107, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-4.tscn b/src/map/4-4.tscn index 86b25cc..988c461 100644 --- a/src/map/4-4.tscn +++ b/src/map/4-4.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=9] @@ -19,7 +19,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 13 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.219608, 0.180392, 0.121569, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -77,7 +77,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 11 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.670588, 0.172549, 0.34902, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.294118, 0.431373, 0.180392, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -128,7 +128,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 13 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,12 +151,14 @@ script = ExtResource( 8 ) palette = 3 color_solid = Color( 0.760784, 0.654902, 0.509804, 1 ) -color_grass = Color( 0, 0.560784, 0.909804, 1 ) -color_wood = Color( 0, 0.509804, 0.0784314, 1 ) +color_back = Color( 0.219608, 0.180392, 0.121569, 1 ) +color_grass = Color( 0.670588, 0.172549, 0.34902, 1 ) +color_wood = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 2 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -983052, 1, 0, -983051, 1, 0, -983050, 1, 0, -983049, 1, 0, -983048, 1, 0, -983047, 1, 0, -983046, 1, 0, -983045, 1, 0, -983044, 1, 0, -983043, 1, 0, -983042, 1, 0, -983041, 1, 0, -1048576, 1, 0, -1048575, 1, 0, -1048574, 1, 0, -1048573, 1, 0, -1048572, 1, 0, -1048571, 1, 0, -1048570, 1, 0, -1048569, 1, 0, -1048568, 1, 0, -1048567, 1, 0, -1048566, 1, 0, -1048565, 1, 0, -1048564, 1, 0, -1048563, 1, 0, -1048562, 1, 0, -1048561, 1, 0, -1048560, 1, 0, -1048559, 1, 0, -1048558, 1, 0, -917516, 1, 0, -983022, 1, 0, -851980, 1, 0, -917486, 1, 0, -786444, 1, 0, -851950, 1, 0, -720908, 1, 0, -786414, 1, 0, -655372, 1, 0, -720878, 1, 0, -589836, 1, 0, -655359, 536870912, 1, -655358, 536870912, 0, -655357, 0, 1, -655356, 536870912, 0, -655355, 0, 1, -655354, 0, 1, -655353, 536870912, 0, -655352, 0, 1, -655351, 0, 0, -655350, 0, 1, -655349, 536870912, 0, -655342, 1, 0, -524300, 1, 0, -589813, 536870912, 1, -589812, 0, 0, -589811, 1, 0, -589810, 1, 0, -589809, 1, 0, -589808, 1, 0, -589807, 1, 0, -589806, 1, 0, -458764, 1, 0, -458757, 0, 1, -458756, 0, 0, -458755, 0, 1, -458754, 0, 1, -458753, 536870912, 0, -524288, 0, 1, -524287, 536870912, 1, -524276, 536870912, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 536870912, 1, -393221, 536870912, 0, -458751, 536870912, 0, -458740, 0, 1, -327686, 0, 1, -393215, 0, 0, -393208, 0, 0, -393204, 536870912, 0, -262150, 536870912, 0, -327679, 0, 1, -327672, 0, 1, -327668, 0, 1, -196614, 0, 0, -262143, 0, 0, -262142, 0, 1, -262141, 536870912, 0, -262140, 0, 1, -262139, 0, 1, -262138, 0, 0, -262137, 0, 1, -262136, 536870912, 0, -262132, 0, 0, -131078, 0, 1, -196596, 0, 1, -65542, 0, 0, -65541, 0, 1, -65540, 536870912, 0, -65539, 0, 1, -65538, 0, 1, -65537, 0, 0, -131072, 0, 1, -131071, 0, 1, -131070, 536870912, 0, -131069, 0, 1, -131066, 536870912, 1, -131065, 0, 0, -131064, 0, 1, -131063, 0, 1, -131062, 536870912, 0, -131061, 0, 1, -131060, 536870912, 0, -65533, 0, 0, -65532, 0, 1, -65531, 0, 1, -65530, 536870912, 0 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 3 )] tile_data = PoolIntArray( -131068, 0, 0, -131067, 0, 0 ) @@ -165,13 +167,18 @@ tile_data = PoolIntArray( -131068, 0, 0, -131067, 0, 0 ) z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -917496, 536870917, 0, -917495, 536870917, 0, -917494, 536870917, 0, -917493, 536870917, 0, -917492, 536870917, 0, -917491, 536870917, 0, -917490, 536870917, 0, -917489, 536870917, 0, -917488, 536870917, 0, -917487, 536870917, 0, -786436, 5, 2, -786435, 1610612741, 0, -786434, -1610612731, 2, -851960, 1073741829, 2, -851959, -1610612731, 0, -851958, 536870917, 0, -851957, -1610612731, 0, -851956, -1610612731, 0, -851955, -1610612731, 0, -851954, 536870917, 0, -851953, -1610612731, 0, -851952, 536870917, 0, -851951, 536870917, 0, -720900, 5, 0, -720899, 1610612741, 0, -720898, 5, 0, -786422, 1610612742, 0, -786416, 1073741829, 2, -786415, -1610612731, 0, -655369, 536870916, 3, -655368, 4, 0, -655367, 4, 3, -655364, -1073741819, 2, -655363, -1610612731, 0, -655362, 1610612741, 2, -720893, 5, 2, -720892, -1610612731, 2, -720890, 536870916, 3, -720889, 4, 0, -720888, 4, 3, -720886, 1610612742, 0, -720879, 5, 0, -589834, 536870916, 3, -589833, 536870916, 2, -589832, 536870916, 3, -589831, 536870916, 2, -589827, 1610612742, 0, -655346, 536870917, 2, -655344, -2147483643, 2, -655343, 5, 0, -524298, 4, 2, -524297, 4, 0, -524296, 536870916, 2, -524291, 1610612742, 0, -524290, -1610612731, 2, -589821, -1073741819, 2, -589820, 1610612741, 2, -589819, 4, 2, -589818, 4, 0, -589817, 536870916, 1, -589816, 536870916, 2, -589811, -1073741818, 0, -589810, -1073741818, 0, -589809, -1073741818, 0, -589808, -1610612731, 0, -589807, -1610612731, 0, -524275, 5, 0, -524272, 1073741829, 2, -524271, 5, 0, -393219, 1610612741, 2, -458741, 5, 2, -458739, 1610612741, 2, -458735, -1073741819, 0, -393212, 536870916, 3, -393211, 4, 3, -393205, 5, 0, -393199, 5, 0, -327677, 536870916, 3, -327676, 4, 0, -327675, 4, 3, -327673, 5, 2, -327669, 5, 0, -327664, -2147483643, 2, -327663, 5, 0, -196616, 536870916, 3, -196615, 4, 1, -196613, 536870916, 3, -196612, 4, 3, -262140, 4, 1, -262139, 4, 1, -262133, -1073741819, 2, -262131, -1610612731, 2, -262129, -2147483643, 2, -262128, 5, 0, -262127, -1073741819, 0, -131080, 4, 0, -131079, 536870916, 2, -131077, 536870916, 3, -131076, 4, 0, -131075, 4, 3, -196605, 4, 2, -196604, 4, 1, -196603, 536870916, 0, -196602, 4, 3, -196595, -1073741818, 0, -196594, -1073741818, 0, -196593, -1610612731, 0, -196592, -1610612731, 0, -196591, -1610612731, 0, -65544, 536870916, 3, -65543, 4, 1, -131057, 1073741829, 2, -131056, 5, 0, -131055, 5, 0, -8, 4, 2, -7, 4, 3, -6, 4, 2, -5, 4, 1, -4, 4, 0, -3, 536870916, 2, -2, 5, 0, -1, -1610612731, 0, -65536, -1610612731, 0, -65535, 5, 0, -65526, 6, 0, -65520, 5, 0, -65519, -1073741819, 0, 65528, 4, 2, 65529, 4, 3, 65530, 536870916, 0, 65531, 536870916, 2, 65534, 1073741829, 2, 65535, 5, 0, 0, 5, 0, 1, 1610612741, 2, 3, 536870916, 3, 4, 536870916, 0, 5, 4, 1, 6, 536870916, 2, 9, 5, 2, 10, 1610612741, 0, 11, -1610612731, 2, 17, 5, 0, 65539, 4, 2, 65540, 536870916, 2, 65541, 536870916, 3, 65542, 536870916, 2, 65545, -1073741819, 2, 65546, 1610612741, 0, 65547, 1610612741, 2, 131076, 4, 2, 131077, 536870916, 2 ) +brick_color = Color( 0.219608, 0.180392, 0.121569, 1 ) +grass_color = Color( 0.670588, 0.172549, 0.34902, 1 ) +wood_color = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -983023, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 2, 2, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 28, -40 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -186,5 +193,3 @@ position = Vector2( -35, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 115, -93 ) - -[editable path="GameCamera"] diff --git a/src/map/4-5.tscn b/src/map/4-5.tscn index eb319fc..8bb8f39 100644 --- a/src/map/4-5.tscn +++ b/src/map/4-5.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=4] @@ -175,8 +175,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917519, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -851983, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -655354, 2, 3, -655353, 536870914, 3, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -8, -28 ) +script = ExtResource( 1 ) [node name="Actors" type="Node2D" parent="."] @@ -191,5 +192,3 @@ position = Vector2( -76, 8 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( -109, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-6.tscn b/src/map/4-6.tscn index 2e3d176..c529a3b 100644 --- a/src/map/4-6.tscn +++ b/src/map/4-6.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=4] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -1048562, 536870912, 0, -1048561, 536870912, 0, -1048560, 536870912, 0, -1048559, 536870912, 0, -1048558, 536870912, 0, -1048557, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -983023, 536870912, 0, -983022, 536870912, 0, -983021, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -917486, 536870912, 0, -917485, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458755, 536870914, 2, -458754, 2, 2, -524274, 536870912, 0, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -524269, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -458733, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -393199, 536870912, 0, -393198, 536870912, 0, -393197, 536870912, 0, -327663, 536870912, 0, -327662, 536870912, 0, -327661, 536870912, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 48, -44 ) +script = ExtResource( 1 ) [node name="Actors" type="Node2D" parent="."] @@ -192,5 +193,3 @@ position = Vector2( 117, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( 147, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-7.tscn b/src/map/4-7.tscn index 8eaefbc..f943fb3 100644 --- a/src/map/4-7.tscn +++ b/src/map/4-7.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=4] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917527, 0, 0, -917526, 0, 0, -917525, 0, 0, -917524, 0, 0, -917523, 0, 0, -917522, 0, 0, -917521, 0, 0, -917520, 0, 0, -917519, 0, 0, -917518, 0, 0, -917517, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -983024, 0, 0, -983023, 0, 0, -983022, 0, 0, -851991, 0, 0, -851990, 0, 0, -851989, 0, 0, -851988, 0, 0, -851987, 0, 0, -851986, 0, 0, -851985, 0, 0, -851984, 0, 0, -851983, 0, 0, -851982, 0, 0, -851981, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -917488, 0, 0, -917487, 0, 0, -917486, 0, 0, -786455, 536870912, 0, -786454, 536870912, 0, -786453, 536870912, 0, -786452, 536870912, 0, -786451, 536870912, 0, -786450, 536870912, 0, -786449, 536870912, 0, -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -720919, 536870912, 0, -720918, 536870912, 0, -720917, 536870912, 0, -720916, 536870912, 0, -720915, 536870912, 0, -720914, 536870912, 0, -720913, 536870912, 0, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 0, 0, -786414, 0, 0, -655383, 536870912, 0, -655382, 536870912, 0, -655381, 536870912, 0, -655380, 536870912, 0, -655379, 536870912, 0, -655378, 536870912, 0, -655377, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 0, 0, -720878, 0, 0, -589847, 536870912, 0, -589846, 536870912, 0, -589845, 536870912, 0, -589844, 536870912, 0, -589843, 536870912, 0, -589842, 536870912, 0, -589841, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -655344, 536870912, 0, -655343, 0, 0, -655342, 0, 0, -524311, 0, 0, -524310, 0, 0, -524308, 2, 3, -524307, 536870914, 2, -589807, 0, 0, -589806, 0, 0, -458775, 0, 0, -458774, 0, 0, -524271, 0, 0, -524270, 0, 0, -458735, 0, 0, -458734, 0, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -36 ) +script = ExtResource( 1 ) bounds = Rect2( 112, 0, 0, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -193,5 +194,3 @@ position = Vector2( 117, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 3 )] position = Vector2( 139, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/4-8.tscn b/src/map/4-8.tscn index 5047648..61cd227 100644 --- a/src/map/4-8.tscn +++ b/src/map/4-8.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=4] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -393198, 536870912, 0, -327662, 536870912, 0, -262130, 536870914, 3, -262129, 536870912, 0, -262128, 536870912, 0, -262127, 536870912, 0, -262126, 536870912, 0, -196593, 536870912, 0, -196592, 536870912, 0, -196591, 536870912, 0, -196590, 536870912, 0, -131057, 536870912, 0, -131056, 536870912, 0, -131055, 536870912, 0, -131054, 536870912, 0, -65521, 536870912, 0, -65520, 536870912, 0, -65519, 536870912, 0, -65518, 536870912, 0, 13, -536870912, 0, 14, -536870912, 0, 15, -536870912, 0, 16, -536870912, 0, 17, -536870912, 0, 18, -536870912, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -44 ) +script = ExtResource( 1 ) [node name="Actors" type="Node2D" parent="."] @@ -192,5 +193,3 @@ position = Vector2( -37, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 3 )] position = Vector2( 139, -29 ) - -[editable path="GameCamera"] diff --git a/src/map/5-1.tscn b/src/map/5-1.tscn index c2774ce..2fac916 100644 --- a/src/map/5-1.tscn +++ b/src/map/5-1.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=8] [ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=9] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=10] [ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=11] @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +4/modulate = Color( 0.12549, 0.188235, 0.129412, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,7 +151,7 @@ script = ExtResource( 10 ) palette = 4 color_solid = Color( 0.4, 0.741176, 0.415686, 1 ) -color_back = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +color_back = Color( 0.12549, 0.188235, 0.129412, 1 ) color_grass = Color( 0.0392157, 0.411765, 0.941176, 1 ) color_wood = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -167,7 +167,7 @@ tile_data = PoolIntArray( -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -851980, -1073741819, 0, -851979, -1073741819, 0, -851978, 5, 0, -851977, 5, 0, -851975, 4, 1, -851974, 4, 0, -851973, 4, 1, -851969, 1610612742, 0, -917503, 4, 1, -917502, 4, 1, -917501, 4, 3, -917500, 1610612742, 0, -917496, 1610612742, 0, -917492, 1610612742, 0, -917490, 536870917, 0, -917489, 536870917, 0, -917488, 536870917, 0, -917485, 536870916, 3, -917484, 4, 0, -917483, 4, 1, -917482, 4, 3, -786444, -1610612731, 0, -786443, -536870907, 2, -786442, 1073741829, 2, -786441, 5, 0, -786439, 4, 2, -786438, 4, 1, -786437, 4, 1, -786436, 4, 3, -786433, 1610612742, 0, -851967, 4, 2, -851966, 4, 0, -851965, 4, 3, -851964, 1610612742, 0, -851960, 6, 0, -851959, -1610612731, 2, -851956, 6, 0, -851954, 1073741829, 2, -851953, 536870917, 0, -851952, 1610612741, 2, -851950, 536870916, 3, -851949, 4, 0, -851948, 4, 1, -851947, 536870916, 0, -851946, 4, 3, -720908, -1610612731, 0, -720907, 1073741829, 2, -720906, 1610612741, 0, -720905, -536870907, 2, -720902, 4, 2, -720901, 536870916, 0, -720900, 4, 3, -720898, -2147483643, 2, -720897, 1610612742, 0, -786431, 536870916, 3, -786430, 4, 1, -786429, 536870916, 2, -786428, 1610612742, 0, -786424, 6, 0, -786420, 6, 0, -786416, 536870916, 3, -786415, 4, 0, -786414, 4, 0, -786413, 4, 1, -786412, 536870916, 0, -786411, 536870916, 2, -655366, 4, 2, -655365, 4, 1, -655364, 4, 0, -655363, 536870916, 2, -655361, 1610612742, 0, -720896, 536870916, 3, -720878, 4, 1, -720877, 536870916, 0, -720876, 536870916, 2, -720871, -2147483643, 2, -720870, 5, 0, -655358, 4, 1, -655357, 536870916, 2, -655356, 1610612742, 0, -655352, 6, 0, -655348, 6, 0, -655345, 536870916, 3, -655344, 4, 1, -655342, 4, 1, -655341, 536870916, 2, -655335, -1073741819, 0, -655334, -1073741819, 0, -524294, 536870916, 3, -524293, 536870916, 0, -524292, 4, 1, -524291, 536870916, 2, -524289, 1610612742, 0, -589824, 536870916, 3, -589823, 4, 1, -589822, 536870916, 0, -589821, 4, 3, -589820, 1073741829, 2, -589816, 6, 0, -589812, 5, 2, -589811, -1610612731, 2, -589809, 4, 2, -589808, 4, 0, -589799, -1073741819, 2, -589798, 5, 0, -458764, 536870916, 3, -458763, 536870916, 0, -458762, 4, 3, -458757, 4, 2, -458756, 4, 1, -458755, 4, 3, -458753, 1610612742, 0, -524288, 4, 2, -524287, 4, 0, -524286, 4, 1, -524285, 4, 0, -524284, 4, 3, -524281, -2147483643, 2, -524280, 5, 0, -524279, 536870917, 2, -524276, -1073741819, 2, -524275, 1610612741, 2, -524273, 536870916, 3, -524272, 4, 1, -524271, 536870916, 0, -524270, 4, 1, -524269, 536870916, 2, -393228, 4, 0, -393227, 536870916, 0, -393226, 4, 1, -393224, 4, 3, -393222, 536870916, 3, -393221, 4, 0, -393220, 4, 3, -393217, 1073741829, 0, -458751, 536870916, 3, -458750, 4, 1, -458749, 4, 1, -458748, 536870916, 0, -458747, 536870916, 2, -458745, -2147483643, 0, -458744, 536870917, 0, -458743, -1610612731, 0, -458739, 6, 0, -458736, 4, 2, -458735, 4, 1, -458734, 536870916, 0, -458733, 4, 3, -327692, 4, 2, -327691, 4, 1, -327690, 4, 0, -327688, 536870916, 0, -327687, 536870916, 2, -327686, 4, 2, -327685, 4, 1, -327684, 536870916, 0, -327683, 536870916, 2, -393215, 4, 2, -393214, 4, 0, -393213, 4, 1, -393212, 4, 1, -393211, 4, 3, -393209, 1073741829, 2, -393208, 5, 0, -393207, -536870907, 2, -393203, 5, 2, -393202, 5, 0, -393201, -1610612731, 2, -393200, 536870916, 3, -393199, 4, 0, -393198, 4, 1, -262154, 4, 2, -262152, 4, 0, -262151, 4, 1, -262150, 4, 0, -262149, 4, 1, -262148, 4, 1, -262147, 536870916, 0, -262146, 4, 3, -327678, 4, 2, -327677, 4, 1, -327676, 536870916, 0, -327675, 536870916, 2, -327672, 6, 0, -327667, -1073741819, 0, -327666, -536870907, 0, -327665, -1610612731, 0, -327663, 4, 2, -327662, 4, 1, -327660, 4, 1, -327659, 4, 3, -327655, -2147483643, 2, -327654, 5, 0, -196615, 4, 2, -196614, 4, 1, -196613, 4, 1, -196612, 4, 0, -196611, 4, 1, -196610, 536870916, 2, -262143, 5, 2, -262142, 4, 2, -262141, 4, 0, -262140, 536870916, 2, -262136, 6, 0, -262134, -1073741819, 2, -262133, -1610612730, 0, -262132, -1610612730, 0, -262131, -1073741819, 2, -262130, 1610612741, 0, -262129, 1610612741, 2, -262127, 4, 2, -262126, 536870916, 0, -262124, 536870916, 0, -262123, 4, 1, -262122, 4, 0, -262121, 4, 3, -262119, -1073741819, 2, -262118, 5, 0, -131078, 4, 2, -131077, 536870916, 0, -131076, 4, 1, -131075, 536870916, 2, -196607, 6, 0, -196603, 5, 0, -196601, -1073741819, 2, -196600, 6, 0, -196597, 1610612742, 0, -196590, 4, 2, -196588, 4, 1, -196587, 536870916, 0, -196586, 4, 1, -196585, 4, 1, -196584, 4, 3, -65542, 536870916, 3, -65541, 4, 1, -65540, 536870916, 0, -65539, 536870916, 2, -131071, 6, 0, -131069, 536870917, 2, -131067, 6, 0, -131064, 6, 0, -131061, 1610612742, 0, -131058, 5, 2, -131051, 4, 2, -131050, 4, 0, -131049, 4, 1, -131048, 536870916, 0, -131047, 536870916, 2, -65535, 6, 0, -65533, 6, 0, -65531, 6, 0, -65528, 6, 0, -65525, 1610612742, 0, -65522, 1610612742, 0, -65514, 4, 2, -65513, 4, 0, -65512, 4, 1, -65511, 4, 3, 65530, 4, 2, 65531, 4, 1, 65532, 4, 0, 65533, 536870916, 2, 23, 4, 2, 24, 536870916, 0, 25, 4, 1, 26, 4, 3, 131060, 5, 0, 131061, 5, 0, 131062, 536870917, 2, 131066, 536870916, 3, 131067, 536870916, 0, 131068, 4, 3, 65537, 6, 0, 65539, 6, 0, 65541, 6, 0, 65544, 6, 0, 65545, -536870907, 2, 65547, 1610612742, 0, 65550, 6, 0, 65557, 536870917, 2, 65560, 4, 2, 65561, 536870916, 0, 65562, 536870916, 2, 196597, 1073741829, 2, 196598, -1610612731, 0, 196602, 536870916, 3, 196603, 4, 1, 196604, 536870916, 2, 131073, 6, 0, 131074, -1610612730, 0, 131075, -1610612730, 0, 131076, -1610612730, 0, 131077, 6, 0, 131080, 6, 0, 131083, 1610612742, 0, 131084, -1610612730, 0, 131085, -1610612730, 0, 131086, -1610612730, 0, 131088, 5, 2, 131089, 5, 0, 131090, 536870917, 2, 131093, 6, 0, 262134, -1610612731, 0, 262138, 536870916, 3, 262139, 4, 1, 262140, 4, 0, 262141, 4, 3, 196611, 6, 0, 196616, 6, 0, 196621, 1610612742, 0, 196624, -1610612731, 0, 196625, -1610612731, 0, 196626, 5, 0, 196629, 6, 0 ) -brick_color = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +brick_color = Color( 0.12549, 0.188235, 0.129412, 1 ) grass_color = Color( 0.0392157, 0.411765, 0.941176, 1 ) wood_color = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -176,9 +176,10 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -983024, 0, 0, -983023, 0, 0, -983022, 0, 0, -983021, 0, 0, -983020, 0, 0, -983019, 0, 0, -983018, 0, 0, -983017, 0, 0, -983016, 0, 0, -983015, 536870912, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -917488, 0, 0, -917487, 0, 0, -917486, 0, 0, -917485, 0, 0, -917484, 0, 0, -917483, 0, 0, -917482, 0, 0, -917481, 0, 0, -917480, 0, 0, -917479, 536870912, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -851953, 0, 0, -851952, 0, 0, -851951, 0, 0, -851950, 0, 0, -851949, 0, 0, -851948, 0, 0, -851947, 0, 0, -851946, 0, 0, -851945, 0, 0, -851944, 0, 0, -851943, 536870912, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -786416, 0, 0, -786415, 0, 0, -786414, 0, 0, -786413, 0, 0, -786412, 0, 0, -786411, 0, 0, -786410, 0, 0, -786409, 0, 0, -786408, 0, 0, -786407, 536870912, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720878, 0, 0, -720877, 0, 0, -720876, 0, 0, -720875, 0, 0, -720874, 0, 0, -720873, 0, 0, -720872, 0, 0, -720871, 536870912, 0, -589835, 0, 0, -589834, 0, 0, -655342, 0, 0, -655341, 0, 0, -655340, 0, 0, -655339, 0, 0, -655338, 0, 0, -655337, 0, 0, -655336, 0, 0, -655335, 536870912, 0, -524299, 0, 0, -524298, 0, 0, -589800, 0, 0, -589799, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 536870914, 3, -524264, 0, 0, -524263, 0, 0, -393227, 0, 0, -393226, 0, 0, -393225, 2, 2, -458728, 0, 0, -458727, 0, 0, -393192, 0, 0, -393191, 0, 0 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 8 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 34, -40 ) -bounds = Rect2( 8, 0, 60, 0 ) +script = ExtResource( 8 ) +bounds = Rect2( 0, 0, 60, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -196,5 +197,3 @@ position = Vector2( -50, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( 195, -53 ) - -[editable path="GameCamera"] diff --git a/src/map/5-2.tscn b/src/map/5-2.tscn index 02958f8..d387e6f 100644 --- a/src/map/5-2.tscn +++ b/src/map/5-2.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=7] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9] @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +4/modulate = Color( 0.12549, 0.188235, 0.129412, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,7 +151,7 @@ script = ExtResource( 10 ) palette = 4 color_solid = Color( 0.4, 0.741176, 0.415686, 1 ) -color_back = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +color_back = Color( 0.12549, 0.188235, 0.129412, 1 ) color_grass = Color( 0.0392157, 0.411765, 0.941176, 1 ) color_wood = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -167,7 +167,7 @@ tile_data = PoolIntArray( -131075, 0, 0, -131074, 0, 0, -131073, 0, 0, -196608, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -786438, 536870916, 3, -786437, 4, 0, -786436, 4, 1, -786435, 4, 1, -786434, 4, 1, -786433, 536870916, 0, -851968, 4, 1, -851967, 4, 3, -851965, 536870918, 0, -851959, 536870916, 3, -851958, 4, 1, -851957, 4, 0, -851956, 4, 1, -851955, 4, 0, -851954, 4, 3, -851950, 4, 1, -851949, 4, 1, -851948, 536870916, 0, -851947, 4, 1, -720902, 4, 2, -720901, 4, 1, -720900, 4, 1, -720899, 536870916, 0, -720898, 4, 1, -720897, 4, 1, -786432, 4, 0, -786431, 536870916, 2, -786429, 536870918, 0, -786425, 536870916, 3, -786424, 536870916, 0, -786423, 536870916, 1, -786422, 536870916, 0, -786421, 4, 1, -786420, 536870916, 0, -786419, 4, 1, -786418, 4, 0, -786417, 4, 3, -786414, 4, 2, -786413, 536870916, 0, -786412, 4, 1, -786411, 4, 0, -655365, 4, 2, -655364, 4, 0, -655363, 4, 1, -655362, 536870916, 0, -655361, 4, 1, -720896, 536870916, 2, -720893, 536870918, 0, -720887, 4, 2, -720886, 4, 1, -720885, 536870916, 2, -720884, 536870916, 3, -720883, 536870916, 0, -720882, 536870916, 2, -720877, 4, 2, -720876, 4, 0, -720875, 4, 1, -655353, 536870917, 2, -655351, 536870916, 3, -655350, 536870916, 0, -655349, 536870916, 2, -655343, 536870917, 2, -655340, 4, 2, -655339, 4, 1, -524292, 4, 2, -524291, 4, 1, -524290, 536870916, 0, -524289, 536870916, 2, -589817, 1610612742, 0, -458755, 4, 2, -458754, 536870916, 2, -458753, 5, 2, -524288, -1073741819, 0, -524287, -1073741819, 0, -524286, -1610612731, 2, -524274, 6, 0, -524271, 1073741829, 2, -524270, 5, 0, -393217, 1610612741, 0, -458752, 5, 0, -458751, 5, 0, -458750, 5, 0, -458742, 1610612742, 0, -458738, 6, 0, -458734, -1073741819, 2, -458732, -1610612731, 2, -327683, -1610612730, 0, -327682, -1610612730, 0, -327681, 1610612741, 0, -393216, -1610612731, 2, -393215, 5, 0, -393214, 5, 0, -393211, 536870916, 3, -393210, 4, 0, -393209, 4, 3, -393206, 1610612741, 0, -393204, 5, 2, -393203, 5, 0, -393202, 5, 0, -393201, 5, 0, -393200, -1610612731, 2, -393196, -1610612731, 0, -262145, -1073741819, 2, -327680, -1610612731, 0, -327679, -1610612731, 0, -327678, 1610612741, 2, -327676, 536870916, 3, -327675, 4, 1, -327674, 4, 3, -327668, -1073741819, 2, -327667, 5, 0, -327666, 5, 0, -327665, 5, 0, -327664, 1610612741, 2, -327660, -2147483643, 0, -196614, -1073741819, 2, -196613, -1610612730, 0, -262143, 6, 0, -262140, 536870916, 3, -262139, 536870916, 0, -262138, 4, 3, -262137, 5, 0, -262136, -1610612731, 0, -262135, -1610612731, 0, -262131, -1073741819, 2, -262130, 5, 0, -262129, 1610612741, 2, -262124, -1610612731, 0, -196607, 6, 0, -196605, 4, 2, -196604, 4, 1, -196603, 536870916, 2, -196601, 5, 0, -196600, -1073741819, 2, -196599, 1610612741, 0, -196591, 5, 2, -196590, 5, 0, -196588, 1610612741, 2, -65545, 536870916, 0, -65544, 4, 3, -131068, 4, 0, -131067, 4, 3, -131065, -1073741819, 0, -131064, -1073741819, 0, -131063, 1610612741, 0, -131055, -1073741819, 2, -131054, 5, 2, -9, 4, 1, -8, 536870916, 0, -7, 4, 3, -2, 6, 0, -65535, 536870916, 3, -65534, 4, 1, -65532, 4, 1, -65531, 536870916, 2, -65528, 6, 0, 65527, 536870916, 0, 65528, 4, 1, 65529, 4, 0, 65530, 4, 3, 65534, 6, 0, 1, 536870916, 3, 2, 4, 0, 4, 536870916, 0, 5, 536870916, 2, 8, 6, 0, 131063, 4, 1, 131064, 536870916, 0, 131065, 4, 1, 131066, 4, 3, 131069, 5, 2, 131070, 1073741829, 0, 131071, -1610612731, 2, 65537, 4, 2, 65538, 4, 1, 65553, 536870916, 3, 65554, 4, 1, 65555, 4, 0, 65556, 4, 1, 65557, 4, 1, 196599, 4, 0, 196600, 4, 1, 196601, 536870916, 2, 196604, 5, 2, 196605, 1073741829, 0, 196606, 1610612741, 0, 196607, 1073741829, 0, 131072, -1610612731, 2, 131073, 4, 2, 131074, 536870916, 0, 131075, 4, 1, 131076, 536870916, 0, 131077, 4, 3, 131083, 1610612742, 0, 131089, 4, 2, 131090, 536870916, 2, 131091, 536870916, 3, 131092, 536870916, 0, 131093, 4, 1, 262135, 4, 1, 262136, 536870916, 2, 262139, 5, 2, 262140, 1073741829, 0, 262141, 1610612741, 0, 262142, 1073741829, 0, 262143, 1610612741, 0, 196608, 1073741829, 0, 196609, -1610612731, 2, 196610, 4, 2, 196611, 4, 0, 196612, 4, 1, 196613, 536870916, 0, 196614, 536870916, 2, 196619, 1073741829, 2, 196625, 4, 2, 196626, 4, 0, 196627, 4, 0, 196628, 4, 1, 196629, 4, 1, 327675, 5, 0, 327676, 1610612741, 0, 327677, 1073741829, 0, 327678, 1610612741, 0, 327679, 1073741829, 0, 262144, 1610612741, 0, 262145, 5, 0, 262147, 4, 2, 262148, 4, 1, 262149, 4, 1, 262150, 4, 1, 262151, 536870916, 2, 262162, 4, 1, 262163, 4, 1, 262164, 4, 1, 262165, 4, 1 ) -brick_color = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +brick_color = Color( 0.12549, 0.188235, 0.129412, 1 ) grass_color = Color( 0.0392157, 0.411765, 0.941176, 1 ) wood_color = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -327688, 1610612736, 0, -327687, 1610612736, 0, -327686, 1610612736, 0, -327685, 1610612736, 0, -262152, 1610612736, 0, -262151, 1610612736, 0, -262150, 1610612736, 0, -262149, 1610612736, 0, -196616, 1610612736, 0, -196615, 1610612736, 0, -196614, 1610612736, 0, -196613, 1610612736, 0, -131080, 1610612736, 0, -131079, 1610612736, 0, -131078, 1610612736, 0, -131077, 1610612736, 0, -196588, 1610612736, 0, -65544, 1610612736, 0, -65543, 1610612736, 0, -65542, 1610612736, 0, -65541, 1610612736, 0, -131052, 1610612736, 0, -8, 1610612736, 0, -7, 1610612736, 0, -6, 1610612736, 0, -5, 1610612736, 0, -4, 1610612736, 0, -3, 1610612736, 0, -2, 1610612736, 0, -1, 1610612736, 0, -65536, 1610612736, 0, -65535, 1610612736, 0, -65534, 1610612736, 0, -65533, 2, 2, -65516, 1610612736, 0, 65528, 1610612736, 0, 65529, 1610612736, 0, 65530, 1610612736, 0, 65531, 1610612736, 0, 65532, 1610612736, 0, 65533, 1610612736, 0, 65534, 1610612736, 0, 65535, 1610612736, 0, 0, 1610612736, 0, 1, 1610612736, 0, 2, 1610612736, 0, 15, 1610612736, 0, 16, 1610612736, 0, 17, 1610612736, 0, 18, 1610612736, 0, 19, 1610612736, 0, 20, 1610612736, 0, 131064, 1610612736, 0, 131065, 1610612736, 0, 131066, 1610612736, 0, 131067, 1610612736, 0, 131068, 1610612736, 0, 131069, 1610612736, 0, 131070, 1610612736, 0, 131071, 1610612736, 0, 65536, 1610612736, 0, 65537, 1610612736, 0, 65538, 1610612736, 0, 65551, 1610612736, 0, 65552, 1610612736, 0, 65553, 1610612736, 0, 65554, 1610612736, 0, 65555, 1610612736, 0, 65556, 1610612736, 0, 196600, 1610612736, 0, 196601, 1610612736, 0, 196602, 1610612736, 0, 196603, 1610612736, 0, 196604, 1610612736, 0, 196605, 1610612736, 0, 196606, 1610612736, 0, 196607, 1610612736, 0, 131072, 1610612736, 0, 131073, 1610612736, 0, 131074, 1610612736, 0, 131075, 1610612736, 0, 131076, 1610612736, 0, 131077, 1610612736, 0, 131078, 1610612736, 0, 131079, 1610612736, 0, 131080, 1610612736, 0, 131081, 1610612736, 0, 131082, 1610612736, 0, 131083, 1610612736, 0, 131084, 1610612736, 0, 131085, 1610612736, 0, 131086, 1610612736, 0, 131087, 1610612736, 0, 131088, 1610612736, 0, 131089, 1610612736, 0, 131090, 1610612736, 0, 131091, 1610612736, 0, 131092, 1610612736, 0, 262136, 1610612736, 0, 262137, 1610612736, 0, 262138, 1610612736, 0, 262139, 1610612736, 0, 262140, 1610612736, 0, 262141, 1610612736, 0, 262142, 1610612736, 0, 262143, 1610612736, 0, 196608, 1610612736, 0, 196609, 1610612736, 0, 196610, 1610612736, 0, 196611, 1610612736, 0, 196612, 1610612736, 0, 196613, 1610612736, 0, 196614, 1610612736, 0, 196615, 1610612736, 0, 196616, 1610612736, 0, 196617, 1610612736, 0, 196618, 1610612736, 0, 196619, 1610612736, 0, 196620, 1610612736, 0, 196621, 1610612736, 0, 196622, 1610612736, 0, 196623, 1610612736, 0, 196624, 1610612736, 0, 196625, 1610612736, 0, 196626, 1610612736, 0, 196627, 1610612736, 0, 196628, 1610612736, 0 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 52, -32 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -195,5 +196,3 @@ position = Vector2( 143, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -61, -29 ) - -[editable path="GameCamera"] diff --git a/src/map/5-3.tscn b/src/map/5-3.tscn index 5813c64..5af176f 100644 --- a/src/map/5-3.tscn +++ b/src/map/5-3.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=7] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9] @@ -179,8 +179,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1114121, 0, 0, -1114120, 0, 0, -1114119, 0, 0, -1114118, 0, 0, -1114117, 0, 0, -1114116, 0, 0, -1114115, 0, 0, -1114114, 0, 0, -1114113, 0, 0, -1179648, 0, 0, -1179647, 0, 0, -1179646, 0, 0, -1179645, 0, 0, -1179644, 0, 0, -1179643, 0, 0, -1179642, 0, 0, -1179641, 0, 0, -1179640, 0, 0, -1179639, 0, 0, -1179638, 0, 0, -1179637, 0, 0, -1179636, 0, 0, -1179635, 0, 0, -1179634, 0, 0, -1179633, 0, 0, -1179632, 0, 0, -1179631, 0, 0, -1179630, 0, 0, -1179629, 0, 0, -1179628, 0, 0, -1048585, 0, 0, -1048584, 0, 0, -1048583, 0, 0, -1048582, 0, 0, -1048581, 0, 0, -1048580, 0, 0, -1048579, 0, 0, -1048578, 0, 0, -1048577, 0, 0, -1114112, 0, 0, -1114111, 0, 0, -1114110, 0, 0, -1114109, 0, 0, -1114108, 0, 0, -1114107, 0, 0, -1114106, 0, 0, -1114105, 0, 0, -1114104, 0, 0, -1114103, 0, 0, -1114102, 0, 0, -1114101, 0, 0, -1114100, 0, 0, -1114099, 0, 0, -1114098, 0, 0, -1114097, 0, 0, -1114096, 0, 0, -1114095, 0, 0, -1114094, 0, 0, -1114093, 0, 0, -1114092, 0, 0, -983049, 0, 0, -983048, 0, 0, -983047, 0, 0, -983046, 0, 0, -983045, 0, 0, -983044, 0, 0, -983043, 0, 0, -983042, 0, 0, -983041, 0, 0, -1048576, 0, 0, -1048575, 0, 0, -1048574, 0, 0, -1048573, 0, 0, -1048572, 0, 0, -1048571, 0, 0, -1048570, 0, 0, -1048569, 0, 0, -1048568, 0, 0, -1048567, 0, 0, -1048566, 0, 0, -1048565, 0, 0, -1048564, 0, 0, -1048563, 0, 0, -1048562, 0, 0, -1048561, 0, 0, -1048560, 0, 0, -1048559, 0, 0, -1048558, 0, 0, -1048557, 0, 0, -1048556, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -983024, 0, 0, -983023, 0, 0, -983022, 0, 0, -983021, 0, 0, -983020, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -917488, 0, 0, -917487, 0, 0, -917486, 0, 0, -917485, 0, 0, -917484, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -458761, 0, 0, -458760, 0, 0, -458757, 536870914, 3, -458756, 2, 2 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 48, -48 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -198,5 +199,3 @@ position = Vector2( 4, -56 ) [node name="Note" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -53, -101 ) - -[editable path="GameCamera"] diff --git a/src/map/5-4.tscn b/src/map/5-4.tscn index 708a536..37f43b9 100644 --- a/src/map/5-4.tscn +++ b/src/map/5-4.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://media/image/bricks.png" type="Texture" id=5] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=8] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=9] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=10] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=11] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -589818, 536870914, 2, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -524282, 2, 3, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 8 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 34, -56 ) +script = ExtResource( 8 ) bounds = Rect2( 0, 0, 140, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -196,5 +197,3 @@ position = Vector2( -59, -48 ) [node name="Note" parent="Actors" instance=ExtResource( 12 )] position = Vector2( 75, -69 ) - -[editable path="GameCamera"] diff --git a/src/map/win.tscn b/src/map/win.tscn index 760fe4e..d60b1d6 100644 --- a/src/map/win.tscn +++ b/src/map/win.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=7] [ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=8] @@ -195,8 +195,9 @@ tile_data = PoolIntArray( -720911, 5, 0, -720910, 5, 0, -720909, -1610612731, 0, tile_set = SubResource( 13 ) tile_data = PoolIntArray( -851982, 0, 0, -851981, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -786446, 0, 0, -786445, 0, 0, -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -720910, 0, 0, -720909, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -655374, 0, 0, -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -589838, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -524302, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -458766, 0, 0, -458765, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -524280, 2, 2, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 0, 0, -393230, 0, 0, -393229, 0, 0, -393228, 0, 0, -393227, 0, 0, -393226, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -327694, 0, 0, -327693, 0, 0, -327692, 0, 0, -327691, 0, 0, -327690, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -262158, 0, 0, -262157, 0, 0, -262156, 0, 0, -262155, 0, 0, -262154, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0, -327667, 0, 0, -262135, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, 0, -196599, 0, 0, -196598, 0, 0, -196597, 0, 0, -196596, 0, 0, -196595, 0, 0, -131063, 0, 0, -131062, 0, 0, -131061, 0, 0, -131060, 0, 0, -131059, 0, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 5 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -24 ) +script = ExtResource( 5 ) [node name="Actors" type="Node2D" parent="."] @@ -437,5 +438,3 @@ margin_right = 24.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 11 ) text = "13" - -[editable path="GameCamera"] diff --git a/src/menu/Creator.tscn b/src/menu/Creator.tscn index 2841b3f..40398e6 100644 --- a/src/menu/Creator.tscn +++ b/src/menu/Creator.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://media/image/player_swap.png" type="Texture" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://media/image/tinyArrow.png" type="Texture" id=5] [ext_resource path="res://media/image/creator.png" type="Texture" id=6] @@ -252,9 +252,10 @@ z_index = -11 tile_set = SubResource( 22 ) tile_data = PoolIntArray( 65516, 5, 0, 65517, 5, 0, 65518, 5, 0, 65519, 5, 0, 65520, 5, 0, 131052, 5, 0, 131053, 5, 0, 131054, 5, 0, 131055, 5, 0, 131056, 5, 0, 196588, 1073741829, 2, 196589, 5, 0, 196590, 5, 0, 196591, 5, 0, 196592, 1610612741, 2, 262125, 1073741829, 2, 262126, 5, 0, 262127, 1610612741, 2, 327662, 6, 0, 393198, 6, 0, 524273, 1073741829, 2, 524275, -1610612731, 2, 589811, -1610612731, 0, 655347, -1610612731, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -92, 48 ) -zoom = Vector2( 0.5, 0.5 ) +scale = Vector2( 0.5, 0.5 ) +script = ExtResource( 3 ) [node name="Player" type="Node2D" parent="."] position = Vector2( -120, 40 ) @@ -1353,5 +1354,3 @@ margin_bottom = 7.0 custom_fonts/font = SubResource( 14 ) text = "random" align = 1 - -[editable path="GameCamera"] diff --git a/src/menu/Menu.gd b/src/menu/Menu.gd index 6d36d73..0be52b5 100644 --- a/src/menu/Menu.gd +++ b/src/menu/Menu.gd @@ -56,7 +56,7 @@ func make_list(arg): list_node = arg list = [] for i in arg.get_children(): - if !i.is_in_group("no_item"): + if !i.is_in_group("no_item") and i.visible: list.append(i) func menu_input(event): diff --git a/src/menu/StartMenu.gd b/src/menu/StartMenu.gd index c9f2035..385ae7d 100644 --- a/src/menu/StartMenu.gd +++ b/src/menu/StartMenu.gd @@ -9,6 +9,7 @@ onready var user_label := $Username/Label onready var menu_stuff := main_menu.get_children() onready var credits_node := $Credits onready var stage := $Stage +onready var cam := Shared.cam export var open_player_path : NodePath = "" onready var open_player_mat : ShaderMaterial = get_node(open_player_path).material @@ -125,22 +126,22 @@ func menu_select(tag : String = menu_items[clamp(cursor, 0, menu_items.size() - "options": open_sub(OptionsMenu) Audio.play("menu_options", 0.9, 1.1) - Shared.cam.pos_target += Vector2(24, -4) + cam.pos_target += Vector2(24, -4) "credits": is_credits = true credits_node.visible = true if parent_node: parent_node.visible = false - Shared.cam.pos_target += Vector2(104, 0) + cam.pos_target += Vector2(104, 0) Audio.play("menu_options", 0.9, 1.1) UI.keys(false, false, false, false) TouchScreen.show_keys() "yes": Audio.play("menu_yes", 0.9, 1.1) + menu_stuff[cursor].text = "quit!!" if OS.get_name() == "HTML5": Shared.wipe_scene(Shared.splash_path) else: - menu_stuff[cursor].text = "quit!!" Shared.wipe_quit() "no": switch_menu("main") @@ -167,7 +168,7 @@ func menu_select(tag : String = menu_items[clamp(cursor, 0, menu_items.size() - func on_close_sub(): - Shared.cam.pos_target = Vector2(90, 76) + cam.pos_target = Vector2(90, 76) UI.keys(false) func switch_menu(arg, silent := false, _cursor := 0): @@ -205,7 +206,7 @@ func switch_menu(arg, silent := false, _cursor := 0): Shared.map_select = 0 user_label.visible = true "open": - Shared.load_save(Shared.last_slot, true) + Shared.load_save(Shared.last_slot) Player.set_palette(open_player_mat, Shared.player_colors) Player.set_palette(demo_player_mat, Shared.player_colors) if menu_last == "erase": diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index 921541c..3fcf090 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=44 format=2] +[gd_scene load_steps=46 format=2] [ext_resource path="res://media/image/creator.png" type="Texture" id=1] [ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=2] [ext_resource path="res://src/menu/StartMenu.gd" type="Script" id=3] -[ext_resource path="res://media/image/HarmonyHoneyLogo.png" type="Texture" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=5] [ext_resource path="res://media/font/ExpressionPro.ttf" type="DynamicFontData" id=6] [ext_resource path="res://media/image/8pixel.png" type="Texture" id=7] @@ -12,7 +12,7 @@ [ext_resource path="res://src/menu/AttractMode.gd" type="Script" id=10] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=11] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=13] +[ext_resource path="res://media/image/harmony-monroe-white.png" type="Texture" id=13] [ext_resource path="res://src/actor/SwitchBlockBlue.tscn" type="PackedScene" id=14] [ext_resource path="res://src/actor/SwitchBlue.tscn" type="PackedScene" id=15] [ext_resource path="res://media/image/menu.png" type="Texture" id=16] @@ -26,6 +26,7 @@ [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=24] [ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=25] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=26] +[ext_resource path="res://media/font/NicoClean-Regular.ttf" type="DynamicFontData" id=27] [sub_resource type="DynamicFont" id=3] extra_spacing_top = -3 @@ -309,6 +310,11 @@ extra_spacing_top = -4 extra_spacing_bottom = -4 font_data = ExtResource( 5 ) +[sub_resource type="DynamicFont" id=30] +extra_spacing_top = -2 +extra_spacing_bottom = -4 +font_data = ExtResource( 27 ) + [sub_resource type="DynamicFont" id=23] extra_spacing_top = -5 extra_spacing_bottom = -2 @@ -1053,28 +1059,31 @@ text = "Tiny Crate" align = 1 [node name="Logo" type="TextureRect" parent="Control"] +visible = false modulate = Color( 0, 0.529412, 0.317647, 1 ) -margin_left = 115.0 -margin_top = 95.0 -margin_right = 192.0 -margin_bottom = 123.0 -texture = ExtResource( 4 ) +margin_left = 96.0 +margin_top = 92.0 +margin_right = 155.0 +margin_bottom = 134.0 +texture = ExtResource( 13 ) +expand = true +stretch_mode = 6 [node name="Website" type="Label" parent="Control"] modulate = Color( 0.160784, 0.678431, 1, 1 ) -margin_left = 158.0 +margin_left = 114.0 margin_top = 112.0 margin_right = 227.0 margin_bottom = 127.0 custom_fonts/font = SubResource( 5 ) -text = "hhoney.net" +text = "harmonymonroe.com" align = 2 valign = 2 [node name="Stage" type="Node2D" parent="."] script = ExtResource( 26 ) is_random = true -color_path = NodePath("../Control/Logo") +color_path = NodePath("../Control/Website") [node name="SolidTileMap" parent="Stage" instance=ExtResource( 11 )] tile_set = SubResource( 13 ) @@ -1085,8 +1094,9 @@ z_index = -11 tile_set = SubResource( 29 ) tile_data = PoolIntArray( 131093, 536870916, 3, 131094, 4, 1, 131095, 4, 0, 131096, 4, 3, 196624, 5, 2, 196625, 5, 0, 196626, -1610612731, 2, 196630, 536870916, 0, 196631, 4, 1, 196632, 4, 0, 262154, 536870916, 3, 262155, 536870916, 0, 262156, 4, 3, 262159, 5, 2, 262160, 5, 0, 262161, 5, 0, 262162, 5, 0, 262163, -1610612731, 2, 262166, 4, 1, 262167, 4, 0, 262168, 4, 1, 327685, 5, 2, 327686, 5, 0, 327687, 5, 0, 327688, 5, 0, 327689, 536870917, 2, 327690, 536870916, 0, 327691, 4, 1, 327692, 4, 0, 327695, -1610612731, 0, 327696, 5, 0, 327697, 5, 0, 327698, 5, 0, 327699, -1073741819, 0, 327701, 536870916, 3, 327702, 4, 0, 327703, 4, 1, 327704, 536870916, 2, 393221, -1073741819, 0, 393227, 4, 1, 393228, 4, 0, 393229, 4, 3, 393231, -1073741819, 2, 393232, 5, 0, 393233, 5, 0, 393234, 5, 0, 393235, -536870907, 2, 393237, 536870916, 0, 393238, 4, 1, 393239, 536870916, 0, 458757, -1073741819, 2, 458759, -1610612731, 2, 458762, 4, 1, 458763, 536870916, 0, 458764, 4, 1, 458765, 4, 0, 458768, -1073741819, 2, 458769, 5, 0, 458770, 1610612741, 2, 458773, 4, 2, 458774, 4, 0, 458775, 4, 1, 458776, 4, 3, 524295, -1610612731, 0, 524298, 4, 2, 524299, 4, 1, 524300, 536870916, 0, 524301, 4, 1, 524302, 4, 3, 524305, 6, 0, 524310, 4, 2, 524311, 536870916, 0, 524312, 536870916, 2, 589831, -1610612730, 0, 589832, -1610612731, 0, 589836, 4, 2, 589837, 4, 1, 589838, 4, 0, 589839, 4, 3, 589841, 6, 0, 589842, -536870907, 2, 655367, -1610612731, 0, 655373, 536870916, 3, 655374, 4, 1, 655375, 536870916, 0, 655377, 6, 0, 720901, -2147483643, 2, 720903, -536870907, 2, 720905, 5, 2, 720906, 5, 0, 720907, 5, 0, 720908, 536870917, 2, 720909, 536870916, 3, 720910, 536870916, 0, 720911, 536870916, 2, 720912, 5, 2, 720913, 6, 0, 720914, 5, 0, 720915, 536870917, 2, 720917, 5, 2, 720918, 5, 0, 720919, 536870917, 2, 786437, -2147483643, 0, 786441, -1073741819, 0, 786455, -1610612731, 0, 851973, -1073741819, 2, 851974, 1610612741, 2, 851977, 1073741829, 2, 851978, 5, 0, 851979, 1610612741, 2, 851982, 4, 1, 851983, 4, 0, 851987, 1073741829, 2, 851988, 5, 0, 851989, 6, 0, 851990, 5, 0, 851991, -536870907, 2, 917517, 536870916, 0, 917518, 4, 1, 917519, 536870916, 2, 917525, 1610612741, 2, 983053, 4, 2, 983054, 4, 0, 983055, 536870916, 2 ) -[node name="GameCamera" parent="Stage" instance=ExtResource( 13 )] +[node name="CamBounds" type="Node2D" parent="Stage"] position = Vector2( 90, 76 ) +script = ExtResource( 4 ) bounds = Rect2( 300, 200, 300, 200 ) [node name="Actors" type="Node2D" parent="Stage"] @@ -1133,27 +1143,42 @@ margin_right = 143.0 margin_bottom = 5.0 rect_pivot_offset = Vector2( -202, 36 ) +[node name="tinycrate" type="Label" parent="Credits/Top"] +margin_left = -14.0 +margin_top = 3.0 +margin_right = 55.0 +margin_bottom = 10.0 +custom_fonts/font = SubResource( 21 ) +text = "Tiny Crate" +align = 1 + [node name="By" type="Label" parent="Credits/Top"] -margin_left = -1.0 -margin_top = 16.0 -margin_right = 9.0 -margin_bottom = 26.0 +margin_left = -22.0 +margin_top = 15.0 +margin_right = -12.0 +margin_bottom = 25.0 custom_fonts/font = ExtResource( 25 ) text = "by" align = 1 valign = 1 -[node name="HarmonyHoneyLogo" type="Sprite" parent="Credits/Top"] -position = Vector2( 44, 29 ) -texture = ExtResource( 4 ) +[node name="harmony" type="Label" parent="Credits/Top"] +margin_left = -9.0 +margin_top = 17.0 +margin_right = 77.0 +margin_bottom = 40.0 +custom_fonts/font = SubResource( 30 ) +text = "HARMONY +MONROE" +align = 1 -[node name="Header2" type="Label" parent="Credits/Top"] -margin_left = -11.0 -margin_top = 7.0 -margin_right = 58.0 -margin_bottom = 14.0 -custom_fonts/font = SubResource( 21 ) -text = "Tiny Crate" +[node name="website" type="Label" parent="Credits/Top"] +margin_left = -23.0 +margin_top = 43.0 +margin_right = 79.0 +margin_bottom = 60.0 +custom_fonts/font = SubResource( 5 ) +text = "harmonymonroe.com" align = 1 [node name="List" type="Label" parent="Credits"] @@ -1162,10 +1187,10 @@ margin_top = 54.0 margin_right = 224.0 margin_bottom = 128.0 custom_fonts/font = SubResource( 23 ) -text = "hhoney.net -Made with Godot Engine +text = " -Fonts: NicoPaint -emhuo +Made with Godot Engine +Fonts: Nico Family -emhuo QuinqueFive -GGBotNet Expression Pro -somepx Thaleah Fat -Rick Hoppmann @@ -1182,5 +1207,3 @@ margin_right = 126.0 margin_bottom = 54.0 custom_fonts/font = SubResource( 28 ) text = "long_name1234567" - -[editable path="Stage/GameCamera"] diff --git a/src/menu/Vis.gd b/src/menu/Vis.gd index 0313598..4f4f1a9 100644 --- a/src/menu/Vis.gd +++ b/src/menu/Vis.gd @@ -1,9 +1,11 @@ extends VisibilityNotifier2D +var node_list = [self] + func _ready(): connect("screen_entered", self, "enter") connect("screen_exited", self, "enter") - pass # Replace with function body. func enter(): - visible = is_on_screen() + for i in node_list: + i.visible = is_on_screen() diff --git a/src/menu/options/Back.gd b/src/menu/options/Back.gd deleted file mode 100644 index 3e0d89d..0000000 --- a/src/menu/options/Back.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Node2D - -func act(): - Shared.wipe_scene(Shared.main_menu_path) - Audio.play("menu_back", 0.9, 1.1) diff --git a/src/menu/options/Borderless.gd b/src/menu/options/Borderless.gd deleted file mode 100644 index 2aef2e9..0000000 --- a/src/menu/options/Borderless.gd +++ /dev/null @@ -1,20 +0,0 @@ -extends CanvasItem - -onready var fill = $Box/Fill -var is_selected = false - -func _ready(): - fill.visible = OS.window_borderless - -func select(): - is_selected = true - -func deselect(): - is_selected = false - -func _input(event): - if is_selected and event.is_action_pressed("ui_yes"): - var is_full = OS.window_borderless - OS.window_borderless = !is_full - Audio.play("menu_delete", 0.5, 1.5) - fill.visible = !is_full diff --git a/src/menu/options/Delete.gd b/src/menu/options/Delete.gd deleted file mode 100644 index daf5dde..0000000 --- a/src/menu/options/Delete.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Node2D - -func act(): - Audio.play("menu_delete", 0.9, 1.1) - Shared.delete_save() - Shared.cam.shake(5) diff --git a/src/menu/options/Fullscreen.gd b/src/menu/options/Fullscreen.gd index 8deeb61..d572bc8 100644 --- a/src/menu/options/Fullscreen.gd +++ b/src/menu/options/Fullscreen.gd @@ -1,27 +1,19 @@ extends CanvasItem -onready var fill = $Box/Fill -var is_selected = false +onready var label := $Label2 +var cursor = 0 +var text = ["windowed", "win no border", "full no border", "fullscreen"] func _ready(): - fill.visible = OS.window_fullscreen + yield(get_tree(), "idle_frame") + cursor = Shared.window_option + label.text = text[cursor] -func select(): - is_selected = true +func act(): + scroll() -func deselect(): - is_selected = false - -# HTML5 fullscreen fix -func _input(event): - if is_selected and event.is_action_pressed("ui_yes"): - var is_full = OS.window_fullscreen - Shared.set_fullscreen(!is_full) - #OS.window_fullscreen = !is_full - Shared.set_window_scale() - Audio.play("menu_pause", 0.7, 1.3) - fill.visible = !is_full - if !is_full: - Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN) - else: - Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) +func scroll(arg := 1): + cursor = wrapi(cursor + arg, 0, 4) + label.text = text[cursor] + Shared.window_option = cursor + Audio.play("menu_pause", 0.7, 1.3) diff --git a/src/menu/options/KeyMenu.tscn b/src/menu/options/KeyMenu.tscn index 38d066b..58b7fc9 100644 --- a/src/menu/options/KeyMenu.tscn +++ b/src/menu/options/KeyMenu.tscn @@ -26,6 +26,7 @@ font_data = ExtResource( 5 ) [node name="KeyMenu" type="CanvasLayer"] pause_mode = 2 +layer = 40 script = ExtResource( 3 ) parent_path = NodePath(".") list_path = NodePath("Center/Control/VBox") diff --git a/src/menu/options/OptionsMenu.tscn b/src/menu/options/OptionsMenu.tscn index d1bac34..4ebd63f 100644 --- a/src/menu/options/OptionsMenu.tscn +++ b/src/menu/options/OptionsMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://src/menu/options/OptionsMenu.gd" type="Script" id=1] [ext_resource path="res://src/menu/options/Volume.tscn" type="PackedScene" id=2] @@ -7,7 +7,9 @@ [ext_resource path="res://media/audio/sfx/btn0.wav" type="AudioStream" id=5] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=6] [ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=7] -[ext_resource path="res://src/menu/options/Borderless.gd" type="Script" id=8] +[ext_resource path="res://media/image/tinyArrow5.png" type="Texture" id=8] +[ext_resource path="res://media/image/tinyArrow.png" type="Texture" id=9] +[ext_resource path="res://src/menu/options/detail.gd" type="Script" id=10] [ext_resource path="res://src/menu/options/Fullscreen.gd" type="Script" id=20] [ext_resource path="res://src/menu/options/WindowSize.gd" type="Script" id=21] [ext_resource path="res://src/menu/options/Touch.gd" type="Script" id=22] @@ -27,11 +29,12 @@ font_data = ExtResource( 6 ) [node name="OptionsMenu" type="CanvasLayer"] pause_mode = 2 +layer = 30 script = ExtResource( 1 ) parent_path = NodePath(".") list_path = NodePath("Center/Control/MenuItems") cursor_path = NodePath("Center/Control/Cursor") -cursor_expand = Vector2( 4, 4 ) +cursor_expand = Vector2( 4, 2 ) is_audio_scroll = true is_audio_back = true is_close_btn_no = true @@ -62,27 +65,31 @@ margin_bottom = 35.0 script = ExtResource( 4 ) color_blink = PoolColorArray( 0, 0, 1, 1, 0, 0.482353, 1, 1 ) -[node name="Header" type="Label" parent="Center/Control"] -margin_top = 7.0 -margin_right = 228.0 -margin_bottom = 20.0 +[node name="MenuItems" type="VBoxContainer" parent="Center/Control"] +margin_left = 53.0 +margin_top = 10.0 +margin_right = 175.0 +margin_bottom = 110.0 +rect_min_size = Vector2( 122, 0 ) +custom_constants/separation = 2 +alignment = 1 + +[node name="Header" type="Label" parent="Center/Control/MenuItems" groups=["no_item"]] +margin_top = 4.0 +margin_right = 122.0 +margin_bottom = 16.0 +rect_min_size = Vector2( 0, 12 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_as_outline = 1 custom_fonts/font = SubResource( 4 ) text = "OPTIONS" align = 1 -[node name="MenuItems" type="VBoxContainer" parent="Center/Control"] -margin_left = 58.0 -margin_top = 21.0 -margin_right = 174.0 -margin_bottom = 113.0 -alignment = 1 - [node name="Keyboard" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_right = 116.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 0, 8 ) +margin_top = 18.0 +margin_right = 122.0 +margin_bottom = 25.0 +rect_min_size = Vector2( 0, 7 ) script = ExtResource( 3 ) [node name="Label" type="Label" parent="Center/Control/MenuItems/Keyboard"] @@ -94,21 +101,21 @@ text = "Keyboard Setup" [node name="Spacer" type="Control" parent="Center/Control/MenuItems/Keyboard"] margin_left = 88.0 -margin_right = 104.0 -margin_bottom = 8.0 +margin_right = 110.0 +margin_bottom = 7.0 size_flags_horizontal = 3 [node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Keyboard"] -margin_left = 108.0 -margin_right = 116.0 -margin_bottom = 8.0 +margin_left = 114.0 +margin_right = 122.0 +margin_bottom = 7.0 rect_min_size = Vector2( 8, 0 ) [node name="Gamepad" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 12.0 -margin_right = 116.0 -margin_bottom = 20.0 -rect_min_size = Vector2( 0, 8 ) +margin_top = 27.0 +margin_right = 122.0 +margin_bottom = 34.0 +rect_min_size = Vector2( 0, 7 ) script = ExtResource( 3 ) is_gamepad = true @@ -121,25 +128,27 @@ text = "gamepad Setup" [node name="Spacer" type="Control" parent="Center/Control/MenuItems/Gamepad"] margin_left = 82.0 -margin_right = 104.0 -margin_bottom = 8.0 +margin_right = 110.0 +margin_bottom = 7.0 size_flags_horizontal = 3 [node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Gamepad"] -margin_left = 108.0 -margin_right = 116.0 -margin_bottom = 8.0 +margin_left = 114.0 +margin_right = 122.0 +margin_bottom = 7.0 rect_min_size = Vector2( 8, 0 ) [node name="Sounds" parent="Center/Control/MenuItems" instance=ExtResource( 2 )] -margin_top = 24.0 -margin_right = 116.0 -margin_bottom = 32.0 +margin_top = 36.0 +margin_right = 122.0 +margin_bottom = 43.0 +rect_min_size = Vector2( 0, 7 ) [node name="Music" parent="Center/Control/MenuItems" instance=ExtResource( 2 )] -margin_top = 36.0 -margin_right = 116.0 -margin_bottom = 44.0 +margin_top = 45.0 +margin_right = 122.0 +margin_bottom = 52.0 +rect_min_size = Vector2( 0, 7 ) bus = 2 [node name="Label" parent="Center/Control/MenuItems/Music" index="0"] @@ -148,92 +157,98 @@ text = "Music" [node name="Spacer" parent="Center/Control/MenuItems/Music" index="1"] margin_left = 32.0 -margin_right = 65.0 +margin_right = 71.0 [node name="Arrow" parent="Center/Control/MenuItems/Music" index="2"] -margin_left = 67.0 -margin_right = 70.0 +margin_left = 73.0 +margin_right = 76.0 [node name="Meter" parent="Center/Control/MenuItems/Music" index="3"] -margin_left = 72.0 -margin_right = 111.0 +margin_left = 78.0 +margin_right = 117.0 [node name="Arrow2" parent="Center/Control/MenuItems/Music" index="4"] -margin_left = 113.0 -margin_right = 116.0 +margin_left = 119.0 +margin_right = 122.0 [node name="AudioStreamPlayer" parent="Center/Control/MenuItems/Music" index="5"] stream = ExtResource( 5 ) bus = "Music" -[node name="Fullscreen" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 48.0 -margin_right = 116.0 -margin_bottom = 56.0 +[node name="View" type="HBoxContainer" parent="Center/Control/MenuItems"] +margin_top = 54.0 +margin_right = 122.0 +margin_bottom = 61.0 +rect_min_size = Vector2( 116, 7 ) +custom_constants/separation = 2 script = ExtResource( 20 ) -[node name="Label" type="Label" parent="Center/Control/MenuItems/Fullscreen"] +[node name="Label" type="Label" parent="Center/Control/MenuItems/View"] margin_top = 1.0 -margin_right = 60.0 +margin_right = 24.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Fullscreen" +text = "view" __meta__ = { "_edit_use_anchors_": false } -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Fullscreen"] -margin_left = 64.0 -margin_right = 92.0 -margin_bottom = 8.0 +[node name="Spacer" type="Control" parent="Center/Control/MenuItems/View"] +margin_left = 26.0 +margin_right = 26.0 +margin_bottom = 7.0 size_flags_horizontal = 3 -[node name="Box" type="ColorRect" parent="Center/Control/MenuItems/Fullscreen"] -margin_left = 96.0 -margin_right = 104.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 8 ) - -[node name="Back" type="ColorRect" parent="Center/Control/MenuItems/Fullscreen/Box"] -margin_left = 1.0 -margin_top = 1.0 -margin_right = 7.0 +[node name="Arrow" type="Control" parent="Center/Control/MenuItems/View"] +margin_left = 28.0 +margin_right = 31.0 margin_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) +rect_min_size = Vector2( 3, 0 ) -[node name="Fill" type="ColorRect" parent="Center/Control/MenuItems/Fullscreen/Box"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 6.0 +[node name="Sprite" type="Sprite" parent="Center/Control/MenuItems/View/Arrow"] +position = Vector2( 2, 4 ) +texture = ExtResource( 8 ) + +[node name="Label2" type="Label" parent="Center/Control/MenuItems/View"] +margin_left = 33.0 +margin_top = 1.0 +margin_right = 117.0 margin_bottom = 6.0 +custom_fonts/font = SubResource( 2 ) +text = "full no border" __meta__ = { "_edit_use_anchors_": false } -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Fullscreen"] -margin_left = 108.0 -margin_right = 116.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 0 ) +[node name="Arrow2" type="Control" parent="Center/Control/MenuItems/View"] +margin_left = 119.0 +margin_right = 122.0 +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 0 ) + +[node name="Sprite" type="Sprite" parent="Center/Control/MenuItems/View/Arrow2"] +position = Vector2( 1, 4 ) +texture = ExtResource( 8 ) +flip_h = true [node name="WindowSize" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 60.0 -margin_right = 116.0 -margin_bottom = 68.0 -rect_min_size = Vector2( 0, 8 ) +margin_top = 63.0 +margin_right = 122.0 +margin_bottom = 70.0 +rect_min_size = Vector2( 0, 7 ) script = ExtResource( 21 ) [node name="Label" type="Label" parent="Center/Control/MenuItems/WindowSize"] margin_top = 1.0 -margin_right = 36.0 +margin_right = 24.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Window" +text = "Size" [node name="Scale" type="Label" parent="Center/Control/MenuItems/WindowSize"] -margin_left = 40.0 +margin_left = 28.0 margin_top = 1.0 -margin_right = 58.0 +margin_right = 64.0 margin_bottom = 6.0 size_flags_horizontal = 3 custom_fonts/font = SubResource( 2 ) @@ -244,120 +259,126 @@ __meta__ = { } [node name="Resolution" type="Label" parent="Center/Control/MenuItems/WindowSize"] -margin_left = 62.0 +margin_left = 68.0 margin_top = 1.0 -margin_right = 116.0 +margin_right = 122.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) text = "228 x 128" align = 1 -[node name="Borderless" type="HBoxContainer" parent="Center/Control/MenuItems"] +[node name="Touch" type="HBoxContainer" parent="Center/Control/MenuItems"] margin_top = 72.0 -margin_right = 116.0 -margin_bottom = 80.0 -script = ExtResource( 8 ) +margin_right = 122.0 +margin_bottom = 79.0 +rect_min_size = Vector2( 0, 7 ) +custom_constants/separation = 2 +script = ExtResource( 22 ) -[node name="Label" type="Label" parent="Center/Control/MenuItems/Borderless"] +[node name="Label" type="Label" parent="Center/Control/MenuItems/Touch"] +margin_top = 1.0 +margin_right = 72.0 +margin_bottom = 6.0 +custom_fonts/font = SubResource( 2 ) +text = "Touch screen" + +[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Touch"] +margin_left = 74.0 +margin_right = 74.0 +margin_bottom = 7.0 +size_flags_horizontal = 3 + +[node name="Arrow" type="Control" parent="Center/Control/MenuItems/Touch"] +margin_left = 76.0 +margin_right = 79.0 +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 0 ) + +[node name="Sprite" type="Sprite" parent="Center/Control/MenuItems/Touch/Arrow"] +position = Vector2( 2, 4 ) +texture = ExtResource( 9 ) + +[node name="Label2" type="Label" parent="Center/Control/MenuItems/Touch"] +margin_left = 81.0 +margin_top = 1.0 +margin_right = 117.0 +margin_bottom = 6.0 +custom_fonts/font = SubResource( 2 ) +text = "always" + +[node name="Arrow2" type="Control" parent="Center/Control/MenuItems/Touch"] +margin_left = 119.0 +margin_right = 122.0 +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 0 ) + +[node name="Sprite" type="Sprite" parent="Center/Control/MenuItems/Touch/Arrow2"] +position = Vector2( 1, 4 ) +texture = ExtResource( 9 ) +flip_h = true + +[node name="Detail" type="HBoxContainer" parent="Center/Control/MenuItems"] +margin_top = 81.0 +margin_right = 122.0 +margin_bottom = 88.0 +rect_min_size = Vector2( 0, 7 ) +custom_constants/separation = 2 +script = ExtResource( 10 ) + +[node name="Label" type="Label" parent="Center/Control/MenuItems/Detail"] margin_top = 1.0 margin_right = 60.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Borderless" +text = "background" -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Borderless"] -margin_left = 64.0 -margin_right = 92.0 -margin_bottom = 8.0 +[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Detail"] +margin_left = 62.0 +margin_right = 86.0 +margin_bottom = 7.0 size_flags_horizontal = 3 -[node name="Box" type="ColorRect" parent="Center/Control/MenuItems/Borderless"] -margin_left = 96.0 -margin_right = 104.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 8 ) - -[node name="Back" type="ColorRect" parent="Center/Control/MenuItems/Borderless/Box"] -margin_left = 1.0 -margin_top = 1.0 -margin_right = 7.0 +[node name="Arrow" type="Control" parent="Center/Control/MenuItems/Detail"] +margin_left = 88.0 +margin_right = 91.0 margin_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) +rect_min_size = Vector2( 3, 0 ) -[node name="Fill" type="ColorRect" parent="Center/Control/MenuItems/Borderless/Box"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 6.0 -margin_bottom = 6.0 -__meta__ = { -"_edit_use_anchors_": false -} +[node name="Sprite" type="Sprite" parent="Center/Control/MenuItems/Detail/Arrow"] +position = Vector2( 2, 4 ) +texture = ExtResource( 9 ) -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Borderless"] -margin_left = 108.0 -margin_right = 116.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 0 ) - -[node name="TouchControls" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 84.0 -margin_right = 116.0 -margin_bottom = 92.0 -script = ExtResource( 22 ) - -[node name="Label" type="Label" parent="Center/Control/MenuItems/TouchControls"] +[node name="Label2" type="Label" parent="Center/Control/MenuItems/Detail"] +margin_left = 93.0 margin_top = 1.0 -margin_right = 84.0 +margin_right = 117.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Touch Controls" +text = "full" -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/TouchControls"] -margin_left = 88.0 -margin_right = 92.0 -margin_bottom = 8.0 -size_flags_horizontal = 3 - -[node name="Box" type="ColorRect" parent="Center/Control/MenuItems/TouchControls"] -margin_left = 96.0 -margin_right = 104.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 8 ) - -[node name="Back" type="ColorRect" parent="Center/Control/MenuItems/TouchControls/Box"] -margin_left = 1.0 -margin_top = 1.0 -margin_right = 7.0 +[node name="Arrow2" type="Control" parent="Center/Control/MenuItems/Detail"] +margin_left = 119.0 +margin_right = 122.0 margin_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) +rect_min_size = Vector2( 3, 0 ) -[node name="Fill" type="ColorRect" parent="Center/Control/MenuItems/TouchControls/Box"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 6.0 -margin_bottom = 6.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/TouchControls"] -margin_left = 108.0 -margin_right = 116.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 0 ) +[node name="Sprite" type="Sprite" parent="Center/Control/MenuItems/Detail/Arrow2"] +position = Vector2( 1, 4 ) +texture = ExtResource( 9 ) +flip_h = true [node name="Time" type="HBoxContainer" parent="Center/Control/MenuItems" groups=["no_item"]] -margin_top = 96.0 -margin_right = 116.0 -margin_bottom = 101.0 +margin_top = 90.0 +margin_right = 122.0 +margin_bottom = 95.0 [node name="TimeLabel" type="Label" parent="Center/Control/MenuItems/Time"] unique_name_in_owner = true -margin_right = 116.0 +margin_right = 122.0 margin_bottom = 5.0 size_flags_horizontal = 3 custom_fonts/font = SubResource( 2 ) -text = "Touch Controls" +text = "01:23" align = 1 [editable path="Center/Control/MenuItems/Music"] diff --git a/src/menu/options/Touch.gd b/src/menu/options/Touch.gd index d122fab..ca0b225 100644 --- a/src/menu/options/Touch.gd +++ b/src/menu/options/Touch.gd @@ -1,14 +1,16 @@ extends CanvasItem -onready var fill = $Box/Fill -var is_selected = false +onready var label := $Label2 +var text = ["toggle", "always"] func _ready(): yield(get_tree(), "idle_frame") - fill.visible = TouchScreen.visible + label.text = text[int(TouchScreen.is_stay)] + +func scroll(arg := 1): + act() func act(): - var is_touch = !TouchScreen.visible - TouchScreen.visible = is_touch - fill.visible = is_touch + TouchScreen.is_stay = !TouchScreen.is_stay + label.text = text[int(TouchScreen.is_stay)] Audio.play("menu_pause", 0.9, 1.1) diff --git a/src/menu/options/Unlock.gd b/src/menu/options/Unlock.gd deleted file mode 100644 index 60fb5c9..0000000 --- a/src/menu/options/Unlock.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Node2D - -func act(): - Audio.play("menu_pick", 0.9, 1.1) - Shared.unlock() - Shared.cam.shake(10) diff --git a/src/menu/options/Volume.tscn b/src/menu/options/Volume.tscn index d4b3199..bb00a1a 100644 --- a/src/menu/options/Volume.tscn +++ b/src/menu/options/Volume.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://media/image/tinyArrow.png" type="Texture" id=1] [ext_resource path="res://media/audio/sfx/sfx14.wav" type="AudioStream" id=2] [ext_resource path="res://src/menu/options/Volume.gd" type="Script" id=3] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=4] +[ext_resource path="res://media/image/tinyArrow5.png" type="Texture" id=5] [sub_resource type="DynamicFont" id=2] size = 5 @@ -14,7 +14,7 @@ font_data = ExtResource( 4 ) [node name="Volume" type="HBoxContainer"] margin_right = 112.0 -margin_bottom = 8.0 +margin_bottom = 7.0 custom_constants/separation = 2 script = ExtResource( 3 ) @@ -28,36 +28,36 @@ text = "Sounds" [node name="Spacer" type="Control" parent="."] margin_left = 38.0 margin_right = 61.0 -margin_bottom = 8.0 +margin_bottom = 7.0 size_flags_horizontal = 11 [node name="Arrow" type="Control" parent="."] margin_left = 63.0 margin_right = 66.0 -margin_bottom = 8.0 +margin_bottom = 7.0 rect_min_size = Vector2( 3, 0 ) [node name="Sprite" type="Sprite" parent="Arrow"] position = Vector2( 2, 4 ) -texture = ExtResource( 1 ) +texture = ExtResource( 5 ) [node name="Meter" type="HBoxContainer" parent="."] margin_left = 68.0 margin_right = 107.0 -margin_bottom = 8.0 +margin_bottom = 7.0 custom_constants/separation = 1 [node name="1" type="ColorRect" parent="Meter"] margin_right = 3.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 0, 0.894118, 0.211765, 1 ) [node name="2" type="ColorRect" parent="Meter"] margin_left = 4.0 margin_right = 7.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 0, 0.894118, 0.211765, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -66,8 +66,8 @@ __meta__ = { [node name="3" type="ColorRect" parent="Meter"] margin_left = 8.0 margin_right = 11.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 0, 0.894118, 0.211765, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -76,8 +76,8 @@ __meta__ = { [node name="4" type="ColorRect" parent="Meter"] margin_left = 12.0 margin_right = 15.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 0, 0.894118, 0.211765, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -86,8 +86,8 @@ __meta__ = { [node name="5" type="ColorRect" parent="Meter"] margin_left = 16.0 margin_right = 19.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 0, 0.894118, 0.211765, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -96,8 +96,8 @@ __meta__ = { [node name="6" type="ColorRect" parent="Meter"] margin_left = 20.0 margin_right = 23.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 0, 0.894118, 0.211765, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -106,8 +106,8 @@ __meta__ = { [node name="7" type="ColorRect" parent="Meter"] margin_left = 24.0 margin_right = 27.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 1, 0, 0.301961, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -116,8 +116,8 @@ __meta__ = { [node name="8" type="ColorRect" parent="Meter"] margin_left = 28.0 margin_right = 31.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 1, 0, 0.301961, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -126,8 +126,8 @@ __meta__ = { [node name="9" type="ColorRect" parent="Meter"] margin_left = 32.0 margin_right = 35.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 1, 0, 0.301961, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -136,8 +136,8 @@ __meta__ = { [node name="10" type="ColorRect" parent="Meter"] margin_left = 36.0 margin_right = 39.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 3, 8 ) +margin_bottom = 7.0 +rect_min_size = Vector2( 3, 5 ) color = Color( 1, 0, 0.301961, 1 ) __meta__ = { "_edit_use_anchors_": false @@ -146,12 +146,12 @@ __meta__ = { [node name="Arrow2" type="Control" parent="."] margin_left = 109.0 margin_right = 112.0 -margin_bottom = 8.0 +margin_bottom = 7.0 rect_min_size = Vector2( 3, 0 ) [node name="Sprite" type="Sprite" parent="Arrow2"] position = Vector2( 1, 4 ) -texture = ExtResource( 1 ) +texture = ExtResource( 5 ) flip_h = true [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] diff --git a/src/menu/options/WindowSize.gd b/src/menu/options/WindowSize.gd index 3593b3f..bddf5c1 100644 --- a/src/menu/options/WindowSize.gd +++ b/src/menu/options/WindowSize.gd @@ -3,14 +3,23 @@ extends CanvasItem onready var label_scale := $Scale onready var label_res := $Resolution +var cursor = 0 + func _ready(): - set_text() + get_tree().connect("screen_resized", self, "size_changed") + yield(get_tree(),"idle_frame") + + size_changed() func scroll(arg = 1): - Shared.set_window_scale(clamp(Shared.window_scale + arg, 1, 12)) - set_text() + cursor = clamp(cursor + arg, 1, 32) + OS.window_size = Shared.view_size * cursor + Shared.set_window_option() Audio.play("menu_scroll2", 0.7, 1.4) -func set_text(): - label_scale.text = str(Shared.window_scale) + "x" - label_res.text = str(Shared.view_size.x * Shared.window_scale) + " x " + str(Shared.view_size.y * Shared.window_scale) +func size_changed(): + var view_size = OS.window_size + label_res.text = str(view_size.x) + " x " + str(view_size.y) + + cursor = floor(view_size.y / Shared.view_size. y) + label_scale.text = str(cursor) + "x" if OS.window_size == Shared.view_size * cursor else "" diff --git a/src/menu/options/detail.gd b/src/menu/options/detail.gd new file mode 100644 index 0000000..1180731 --- /dev/null +++ b/src/menu/options/detail.gd @@ -0,0 +1,19 @@ +extends CanvasItem + +onready var label := $Label2 +var text = ["full", "dark", "none"] + +func _ready(): + yield(get_tree(), "idle_frame") + text() + +func scroll(arg := 1): + Shared.background_option += arg + text() + Audio.play("menu_pause", 0.9, 1.1) + +func text(): + label.text = str(int(Shared.background_option) * 10) + "%" + +func act(): + scroll(1) diff --git a/src/menu/select.gd b/src/menu/select.gd index bd5e9f2..7507ab5 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -1,18 +1,19 @@ extends Node2D -onready var cam : Camera2D = $Camera2D -onready var cursor_node := $Cursor +onready var cam : Camera2D = Shared.cam +onready var cursor_node := $"%Cursor" var cursor = 0 var current_map := "1-1" -onready var screens_node : Control = $Control/Screens -onready var screen : Control = $Control/Screen +onready var screens_node := $"%MapLayer" +onready var screen := $"%Screen" +onready var overlay_node := $"%Overlay" +onready var overlay_layer := $"%OverlayLayer" + export var screen_dist = Vector2(5, 5) -export var screen_size = Vector2(136, 104) -export var columns = 8 +export var screen_size = Vector2(136, 96) var screen_pos := [] -var screen_static := [] var screen_max := 1 var overlays := [] @@ -24,25 +25,19 @@ var show_score := 0 var last_refresh := {} var refresh_wait := 5.0 -onready var score_node := $Control/Scores -onready var score_title := $Control/Scores/HBoxContainer/Title -onready var score_list := $Control/Scores/List -onready var score_note := $Control/Scores/HBoxContainer/Note -onready var score_clock := $Control/Scores/HBoxContainer/Clock -onready var score_map := $Control/Scores/HBoxContainer/Map -onready var score_row := $Control/Scores/Row +onready var score_node := $"%Scores" +onready var score_list := score_node.get_node("List") +onready var score_row := score_node.get_node("Row") +onready var score_hbox := score_node.get_node("HBoxContainer") +onready var score_title := score_hbox.get_node("Title") +onready var score_note := score_hbox.get_node("Note") +onready var score_clock := score_hbox.get_node("Clock") +onready var score_map := score_hbox.get_node("Map") -var load_list := [] -var loader : ResourceInteractiveLoader -var port_count = 0 -var is_load := false var is_screening := false -var map_limit := 0 var screen_list := [] export var timeout_mod := 1.0 - var screen_time := 0.0 -var loading_time := 0.0 export var color_gem := Color("ffec27") export var color_new := Color("83769c") @@ -69,8 +64,21 @@ var lockdict= {0:["1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", "1-8"], 24: ['5-1', '5-2', '5-3', '5-4'], 30: ['win']} +onready var actors = [[Vector2.ZERO, Vector2.ZERO, $"%Player"], [Vector2.ZERO, Vector2.ZERO, $"%Exit"]] +var actor_lerp := 0.1 +var actor_jump := 0.5 func _ready(): + Shared.load_save() + $"%Center".connect("item_rect_changed", self, "item_rect") + item_rect() + + screen = screen.duplicate() + $"%Screen".queue_free() + + overlay_node = overlay_node.duplicate() + $"%Overlay".queue_free() + #Leaderboard.connect("new_score", self, "new_score") #SilentWolf.Scores.connect("sw_scores_received", self, "new_score") @@ -92,8 +100,6 @@ func _ready(): print("map_lock: ", map_lock) print("map_rows: ", map_rows) - screen.rect_position -= Vector2.ONE * 500 - # make screens screen_pos = [] var sum = -1 @@ -109,7 +115,7 @@ func _ready(): overlays.resize(screen_pos.size()) scroll(Shared.map_select) - cam.reset_smoothing() + cam.set_pos(cam.pos_target) screen_list.sort_custom(self, "sort_list") is_screening = true @@ -134,7 +140,6 @@ func _input(event): if open_map(): Audio.play("menu_pick", 0.9, 1.1) is_input = false - is_load = false else: Audio.play("menu_random", 0.8, 1.2) elif event.is_action_pressed("ui_pause"): @@ -158,10 +163,19 @@ func _input(event): Audio.play("menu_scroll3", 0.9, 1.5) func _physics_process(delta): + # move actors + for i in actors: + i[0] = i[0].linear_interpolate(i[1], clamp(actor_lerp, 0, 1)) + if i[0].distance_to(i[1]) < actor_jump: + i[0] = i[1] + i[2].position = i[0].round() + + # input count input_count = max(0, input_count - 1) for i in last_refresh.keys(): last_refresh[i] = max(0, last_refresh[i] - delta) + # blink if is_instance_valid(blink_label) and blink_count > 0: blink_clock -= delta if blink_clock < -blink_off: @@ -169,9 +183,9 @@ func _physics_process(delta): blink_count -= 1 blink_label.modulate = [Color.transparent, Color.white][int(blink_clock > 0.0)] - var ticks : float = OS.get_ticks_msec() - + # make screens if is_screening: + var ticks : float = OS.get_ticks_msec() screen_time += delta while OS.get_ticks_msec() < ticks + (delta * timeout_mod): @@ -179,45 +193,38 @@ func _physics_process(delta): make_screen(screen_list.pop_front()) else: is_screening = false - is_load = true print(screen_time, " screeening time") break - - # load stages - elif is_load: - loading_time += delta - - while OS.get_ticks_msec() < ticks + (delta * timeout_mod): - if load_list.size() > 0: - var pop = load_list.pop_front() - if Shared.scene_dict.has(pop[1]): - pop[2].add_child(Shared.scene_dict[pop[1]].instance()) - screen_static[pop[0]].visible = false - else: - is_load = false - print(loading_time, " loading time") - break + +func item_rect(): + print($"%Center".rect_size) + $"%Center".rect_position.x = posmod($"%Center".rect_size.x, 2) func make_screen(i := 0): var new = screen.duplicate() + var new_overlay = overlay_node.duplicate() + new.node_list.append(new_overlay) + var map_name = map_list[i] var is_locked = Shared.count_gems < map_lock[map_name] - new.rect_position = screen_pos[i] - new.get_node("Overlay/HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name - new.get_node("Overlay/HBox/Gem").visible = is_locked + new.position = screen_pos[i] + new_overlay.rect_position = screen_pos[i] + + new_overlay.get_node("HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name + new_overlay.get_node("HBox/Gem").visible = is_locked var s = {} if Shared.save_maps.has(map_name): s = Shared.save_maps[map_name] var has_note = s.has("note") - new.get_node("Overlay/Notes").visible = has_note - var note_label = new.get_node("Overlay/Notes/Label") + new_overlay.get_node("Notes").visible = has_note + var note_label = new_overlay.get_node("Notes/Label") if has_note: note_label.text = Shared.time_to_string(s["note"]) - var gem = new.get_node("Overlay/Gem") + var gem = new_overlay.get_node("Gem") gem.visible = !is_locked var has_time = s.has("time") @@ -228,27 +235,21 @@ func make_screen(i := 0): gem_label.text = Shared.time_to_string(s["time"]) var has_die = s.has("die") - new.get_node("Overlay/Death").visible = has_die + new_overlay.get_node("Death").visible = has_die if has_die: - new.get_node("Overlay/Death/Label").text = str(s["die"]) + new_overlay.get_node("Death/Label").text = str(s["die"]) if is_faster and i == Shared.map_select: blink_label = note_label if is_faster_note else gem_label print("faster ", i, ", blink_label ", blink_label) Audio.play("menu_bell", 0.5, 1.0) - screens_node.add_child(new) - overlays[i] = new.get_node("Overlay") - screen_static.append(new.get_node("Vis/Static")) - view_scene(new.get_node("Vis/ViewportContainer/Viewport"), Shared.map_dir + map_list[i] + ".tscn", i) - -# view a scene inside the viewport by path -func view_scene(port, path, arg): - for i in port.get_children(): - i.queue_free() + var dict = Shared.map_dict[map_name] + new.get_node("Sprite").region_rect = Rect2(screen_size * Vector2(dict[0], dict[1]), screen_size) - load_list.append([port_count, path, port]) - port_count += 1 + screens_node.add_child(new) + overlay_layer.add_child(new_overlay) + overlays[i] = new_overlay func scroll(arg := cursor): if overlays[cursor]: overlays[cursor].visible = true @@ -261,8 +262,15 @@ func scroll(arg := cursor): var sp = screen_pos[cursor] cursor_node.rect_position = sp score_node.rect_position = sp + Vector2(1, 1) - cam.position = sp + (screen_size * 0.5) + var half = sp + (screen_size * 0.5) + cam.pos_target = half refresh_score() + + var dict = Shared.map_dict[str(map_list[cursor])] + + actors[0][1] = Vector2(dict[2], dict[3]) + actors[0][2].node_sprite.flip_h = randf() > 0.5 + actors[1][1] = Vector2(dict[4], dict[5]) func show_scoreboard(arg := show_score): var n = arg == 2 @@ -284,32 +292,37 @@ func refresh_score(var map_name : String = current_map): write_score() if !last_refresh.has(map_name) or last_refresh[map_name] == 0: - #Leaderboard.refresh_score(map_name) print(" - ", map_name, " REFRESH SCORE ") last_refresh[map_name] = refresh_wait -func new_score(arg1 = null, arg2 = null, arg3 = null): - write_score() +func sort_scores(a, b): + if a[0] < b[0]: + return true + return false func write_score(): var key = "note" if show_score == 2 else "time" var dat = Shared.save_data - var dict = {} + var array = [] for i in dat.keys(): + #print("dat ", i, " ", dat[i]) if dat[i].has_all(["username", "maps"]) and dat[i]["maps"].has(current_map) and dat[i]["maps"][current_map].has(key): - dict[int(dat[i]["maps"][current_map][key])] = dat[i]["username"] + var k := int(dat[i]["maps"][current_map][key]) + var v := str(dat[i]["username"]) + #print(k, " / ", v) + array.append([k, v]) var t = "" - var keys = dict.keys() var row = 0 var my_row = -1 - keys.sort() - for i in keys: - t += Shared.time_to_string(i) + " " + dict[i] + "\n" + array.sort_custom(self, "sort_scores") + + for i in array: + t += Shared.time_to_string(i[0]) + " " + i[1] + "\n" - if dict[i] == Shared.username: + if i[1] == Shared.username: my_row = row row += 1 diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 34cfb5d..bd43b07 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,162 +1,20 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2] [ext_resource path="res://media/image/note.png" type="Texture" id=3] -[ext_resource path="res://src/shader/tv_static.gdshader" type="Shader" id=5] +[ext_resource path="res://src/menu/Vis.gd" type="Script" id=4] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] [ext_resource path="res://src/menu/select.gd" type="Script" id=7] [ext_resource path="res://media/image/diamond16.png" type="Texture" id=8] [ext_resource path="res://media/image/diamond12.png" type="Texture" id=9] [ext_resource path="res://media/image/menu.png" type="Texture" id=10] [ext_resource path="res://media/image/skull.png" type="Texture" id=11] -[ext_resource path="res://src/stage/Stage.gd" type="Script" id=12] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=12] [ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13] -[ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=14] -[ext_resource path="res://media/image/bricks.png" type="Texture" id=15] -[ext_resource path="res://media/image/8pixel.png" type="Texture" id=16] -[ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=17] -[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=18] -[ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=19] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=20] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=21] - -[sub_resource type="TileSet" id=1] -0/name = "solid_bricks.png 0" -0/texture = ExtResource( 14 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.768627, 0.407843, 0.454902, 1 ) -0/region = Rect2( 0, 0, 16, 8 ) -0/tile_mode = 2 -0/autotile/icon_coordinate = Vector2( 0, 0 ) -0/autotile/tile_size = Vector2( 8, 8 ) -0/autotile/spacing = 0 -0/autotile/occluder_map = [ ] -0/autotile/navpoly_map = [ ] -0/autotile/priority_map = [ ] -0/autotile/z_index_map = [ ] -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 -1/name = "8pixel.png 1" -1/texture = ExtResource( 16 ) -1/tex_offset = Vector2( 0, 0 ) -1/modulate = Color( 1, 0, 1, 0.33 ) -1/region = Rect2( 0, 0, 8, 8 ) -1/tile_mode = 0 -1/occluder_offset = Vector2( 0, 0 ) -1/navigation_offset = Vector2( 0, 0 ) -1/shape_offset = Vector2( 0, 0 ) -1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -1/shape_one_way = false -1/shape_one_way_margin = 0.0 -1/shapes = [ ] -1/z_index = 0 - -[sub_resource type="TileSet" id=12] -4/name = "bricks.png 4" -4/texture = ExtResource( 15 ) -4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.239216, 0.109804, 0.184314, 1 ) -4/region = Rect2( 0, 0, 40, 8 ) -4/tile_mode = 2 -4/autotile/icon_coordinate = Vector2( 0, 0 ) -4/autotile/tile_size = Vector2( 8, 8 ) -4/autotile/spacing = 0 -4/autotile/occluder_map = [ ] -4/autotile/navpoly_map = [ ] -4/autotile/priority_map = [ ] -4/autotile/z_index_map = [ ] -4/occluder_offset = Vector2( 0, 0 ) -4/navigation_offset = Vector2( 0, 0 ) -4/shape_offset = Vector2( 0, 0 ) -4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -4/shape_one_way = false -4/shape_one_way_margin = 0.0 -4/shapes = [ ] -4/z_index = 0 -5/name = "crate_tiles.png 5" -5/texture = ExtResource( 17 ) -5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0.741176, 0.580392, 0, 1 ) -5/region = Rect2( 0, 16, 24, 8 ) -5/tile_mode = 2 -5/autotile/icon_coordinate = Vector2( 0, 0 ) -5/autotile/tile_size = Vector2( 8, 8 ) -5/autotile/spacing = 0 -5/autotile/occluder_map = [ ] -5/autotile/navpoly_map = [ ] -5/autotile/priority_map = [ ] -5/autotile/z_index_map = [ ] -5/occluder_offset = Vector2( 0, 0 ) -5/navigation_offset = Vector2( 0, 0 ) -5/shape_offset = Vector2( 0, 0 ) -5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -5/shape_one_way = false -5/shape_one_way_margin = 0.0 -5/shapes = [ ] -5/z_index = 0 -6/name = "crate_tiles.png 6" -6/texture = ExtResource( 17 ) -6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.678431, 0, 0.156863, 1 ) -6/region = Rect2( 0, 24, 8, 8 ) -6/tile_mode = 0 -6/occluder_offset = Vector2( 0, 0 ) -6/navigation_offset = Vector2( 0, 0 ) -6/shape_offset = Vector2( 0, 0 ) -6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -6/shape_one_way = false -6/shape_one_way_margin = 0.0 -6/shapes = [ ] -6/z_index = 0 - -[sub_resource type="TileSet" id=13] -0/name = "8pixel.png 0" -0/texture = ExtResource( 16 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0, 1, 0, 0.14902 ) -0/region = Rect2( 0, 0, 8, 8 ) -0/tile_mode = 0 -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 -2/name = "solid_bricks.png 2" -2/texture = ExtResource( 14 ) -2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.768627, 0.407843, 0.454902, 1 ) -2/region = Rect2( 0, 0, 32, 8 ) -2/tile_mode = 2 -2/autotile/icon_coordinate = Vector2( 0, 0 ) -2/autotile/tile_size = Vector2( 8, 8 ) -2/autotile/spacing = 0 -2/autotile/occluder_map = [ ] -2/autotile/navpoly_map = [ ] -2/autotile/priority_map = [ ] -2/autotile/z_index_map = [ ] -2/occluder_offset = Vector2( 0, 0 ) -2/navigation_offset = Vector2( 0, 0 ) -2/shape_offset = Vector2( 0, 0 ) -2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -2/shape_one_way = false -2/shape_one_way_margin = 0.0 -2/shapes = [ ] -2/z_index = 0 - -[sub_resource type="ShaderMaterial" id=8] -shader = ExtResource( 5 ) -shader_param/mouse_pos = Vector2( 0.01, 0.005 ) -shader_param/vsync_issues = 0.7 +[ext_resource path="res://src/stage/sheet.png" type="Texture" id=14] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=15] [sub_resource type="ShaderMaterial" id=10] shader = ExtResource( 6 ) @@ -209,96 +67,84 @@ script = ExtResource( 7 ) __meta__ = { "_edit_lock_": true } -screen_size = Vector2( 136, 96 ) -[node name="Control" type="Control" parent="."] -margin_right = 320.0 -margin_bottom = 180.0 +[node name="CamBounds" type="Node2D" parent="."] +position = Vector2( 178, 88 ) +script = ExtResource( 12 ) +bounds = Rect2( 9000, 9000, 9000, 9000 ) + +[node name="BG" type="CanvasLayer" parent="."] +layer = -1 + +[node name="ColorRect" type="ColorRect" parent="BG"] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.160784, 0.678431, 1, 1 ) __meta__ = { "_edit_lock_": true } -[node name="Screens" type="Control" parent="Control"] -margin_right = 40.0 -margin_bottom = 40.0 +[node name="MapLayer" type="CanvasLayer" parent="."] +unique_name_in_owner = true +follow_viewport_enable = true -[node name="Screen" type="Control" parent="Control"] -margin_left = 110.0 -margin_top = 40.0 -margin_right = 246.0 -margin_bottom = 136.0 +[node name="Screen" type="VisibilityNotifier2D" parent="MapLayer"] +unique_name_in_owner = true +position = Vector2( 110, 40 ) +rect = Rect2( 0, 0, 136, 96 ) +script = ExtResource( 4 ) + +[node name="Sprite" type="Sprite" parent="MapLayer/Screen"] +texture = ExtResource( 14 ) +centered = false +region_enabled = true +region_rect = Rect2( 0, 0, 136, 96 ) + +[node name="ActorLayer" type="CanvasLayer" parent="."] +layer = 2 + +[node name="Center" type="CenterContainer" parent="ActorLayer"] +unique_name_in_owner = true +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="Control" type="Control" parent="ActorLayer/Center"] +margin_left = 46.0 +margin_top = 16.0 +margin_right = 182.0 +margin_bottom = 112.0 rect_min_size = Vector2( 136, 96 ) rect_clip_content = true -[node name="BG" type="Node2D" parent="Control/Screen"] -z_index = -500 +[node name="Actors" type="Node2D" parent="ActorLayer/Center/Control"] +position = Vector2( 68, 48 ) -[node name="ColorRect" type="ColorRect" parent="Control/Screen/BG"] -margin_right = 136.0 -margin_bottom = 96.0 -rect_min_size = Vector2( 136, 96 ) -color = Color( 0, 0, 0, 1 ) +[node name="Player" parent="ActorLayer/Center/Control/Actors" instance=ExtResource( 5 )] +unique_name_in_owner = true +position = Vector2( -21, 10 ) -[node name="Stage" type="Node2D" parent="Control/Screen"] -position = Vector2( 128, 64 ) -script = ExtResource( 12 ) -__meta__ = { -"_editor_description_": "" -} -palette = 1 -color_solid = Color( 0.768627, 0.407843, 0.454902, 1 ) -color_back = Color( 0.239216, 0.109804, 0.184314, 1 ) -color_grass = Color( 0.741176, 0.580392, 0, 1 ) +[node name="Exit" parent="ActorLayer/Center/Control/Actors" instance=ExtResource( 15 )] +unique_name_in_owner = true +position = Vector2( 19, 17 ) -[node name="SolidTileMap" parent="Control/Screen/Stage" instance=ExtResource( 20 )] -tile_set = SubResource( 1 ) -tile_data = PoolIntArray( -851985, 1, 0, -851984, 1, 0, -851983, 1, 0, -851982, 1, 0, -851981, 1, 0, -851980, 1, 0, -851979, 1, 0, -851978, 1, 0, -851977, 1, 0, -851976, 1, 0, -851975, 1, 0, -851974, 1, 0, -851973, 1, 0, -851972, 1, 0, -851971, 1, 0, -851970, 1, 0, -851969, 1, 0, -917504, 1, 0, -917503, 1, 0, -917502, 1, 0, -917501, 1, 0, -917500, 1, 0, -917499, 1, 0, -917498, 1, 0, -917497, 1, 0, -917496, 1, 0, -917495, 1, 0, -917494, 1, 0, -917493, 1, 0, -917492, 1, 0, -917491, 1, 0, -917490, 1, 0, -917489, 1, 0, -917488, 1, 0, -917487, 1, 0, -917486, 1, 0, -917485, 1, 0, -917484, 1, 0, -917483, 1, 0, -917482, 1, 0, -786449, 1, 0, -851946, 1, 0, -720913, 1, 0, -786410, 1, 0, -655377, 1, 0, -720874, 1, 0, -589841, 1, 0, -655338, 1, 0, -524305, 1, 0, -589802, 1, 0, -458769, 1, 0, -524274, 0, 1, -524273, 0, 0, -524272, 0, 1, -524271, 536870912, 0, -524270, 0, 1, -524269, 536870912, 0, -524268, 536870912, 1, -524266, 1, 0, -393233, 1, 0, -393229, 0, 1, -393228, 0, 0, -393227, 0, 1, -393226, 0, 1, -393225, 536870912, 0, -393224, 0, 1, -393223, 0, 1, -393222, 0, 0, -393221, 0, 1, -393220, 0, 1, -393219, 536870912, 0, -393218, 536870912, 1, -458751, 536870912, 1, -458750, 0, 0, -458749, 536870912, 1, -458748, 536870912, 0, -458747, 0, 1, -458746, 0, 0, -458745, 0, 1, -458744, 536870912, 0, -458743, 0, 1, -458742, 0, 1, -458741, 0, 0, -458740, 0, 1, -458739, 536870912, 1, -458738, 536870912, 0, -458730, 1, 0, -327697, 1, 0, -327693, 0, 0, -327682, 0, 0, -327681, 0, 1, -393216, 0, 1, -393215, 536870912, 0, -393202, 536870912, 1, -393196, 536870912, 1, -393195, 1, 0, -393194, 1, 0, -262161, 1, 0, -262160, 1, 0, -262159, 536870912, 1, -262158, 536870912, 0, -262157, 0, 1, -327666, 0, 0, -327665, 0, 1, -327664, 536870912, 0, -327660, 536870912, 0, -196623, 0, 0, -262124, 536870912, 1, -131087, 536870912, 1, -196588, 0, 0, -65551, 0, 0, -131054, 0, 1, -131053, 536870912, 0, -131052, 536870912, 1, -15, 536870912, 1, -65518, 0, 0, 65521, 0, 0, 65522, 0, 1, 65523, 536870912, 0, 65524, 0, 1, 65525, 0, 0, 65526, 0, 1, 65527, 536870912, 0, 65534, 0, 1, 65535, 0, 0, 0, 0, 1, 1, 536870912, 0, 14, 0, 1, 15, 0, 0, 16, 0, 1, 17, 536870912, 0, 18, 0, 1, 131063, 536870912, 1, 131070, 0, 0, 65537, 0, 1, 65550, 0, 0, 196599, 0, 0, 196600, 0, 1, 196601, 536870912, 0, 196602, 0, 1, 196603, 0, 0, 196604, 0, 1, 196605, 536870912, 0, 196606, 0, 1, 131073, 0, 0, 131074, 0, 1, 131075, 536870912, 0, 131076, 0, 1, 131077, 0, 0, 131078, 0, 1, 131079, 536870912, 0, 131080, 0, 1, 131081, 0, 1, 131082, 0, 0, 131083, 0, 1, 131084, 0, 1, 131085, 536870912, 0, 131086, 0, 1 ) -tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) +[node name="OverlayLayer" type="CanvasLayer" parent="."] +unique_name_in_owner = true +layer = 3 +follow_viewport_enable = true -[node name="SpikeTileMap" parent="Control/Screen/Stage" instance=ExtResource( 18 )] -tile_data = PoolIntArray( 131064, 0, 0, 131065, 0, 0, 131066, 0, 0, 131067, 0, 0, 131068, 0, 0, 131069, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0 ) +[node name="Overlay" type="Control" parent="OverlayLayer"] +unique_name_in_owner = true +margin_left = 110.0 +margin_top = 40.0 +margin_right = 246.0 +margin_bottom = 144.0 -[node name="DetailTileMap" parent="Control/Screen/Stage" instance=ExtResource( 21 )] -z_index = -11 -tile_set = SubResource( 12 ) -tile_data = PoolIntArray( -458766, 536870916, 3, -458765, 536870916, 0, -458764, 4, 1, -458763, 4, 3, -458758, 5, 2, -458757, 5, 0, -458756, 536870917, 2, -524282, 5, 2, -524281, 5, 0, -524280, 5, 0, -524279, 5, 0, -524278, 5, 0, -524277, 536870917, 2, -393230, 4, 0, -393217, 5, 2, -458752, 536870917, 2, -458737, 536870916, 1, -458736, 536870916, 0, -458735, 4, 3, -327694, 4, 2, -327692, 4, 1, -327691, 4, 3, -327688, 6, 0, -327685, 1073741829, 2, -327684, 5, 0, -327683, 1610612741, 2, -393211, 1073741829, 2, -393210, 5, 0, -393209, 1610612741, 2, -393206, 1073741829, 2, -393205, 6, 0, -393204, 5, 0, -393203, 1610612741, 2, -393201, 4, 0, -393200, 536870916, 1, -393199, 536870916, 2, -393197, -2147483643, 2, -262156, 4, 0, -262155, 536870916, 2, -262153, 5, 2, -262152, 5, 0, -262151, -1610612731, 2, -262145, 4, 2, -327680, 536870916, 0, -327679, 4, 3, -327669, 6, 0, -327661, -1073741819, 0, -196617, -1073741819, 0, -196616, -1073741819, 0, -196615, -1073741819, 0, -196613, 4, 2, -196612, 4, 3, -196610, 536870916, 3, -196609, 4, 0, -262144, 536870916, 1, -262143, 4, 3, -262141, 5, 2, -262140, 5, 0, -262139, -1610612731, 2, -262134, 5, 2, -262133, 5, 0, -262132, -1610612731, 2, -262130, 536870916, 3, -262129, 4, 0, -262128, 4, 0, -262127, 4, 3, -262125, -1073741819, 2, -131081, -1073741819, 2, -131080, -1073741819, 0, -131079, 1610612741, 2, -131077, 4, 2, -131076, 4, 3, -131074, 4, 2, -131073, 536870916, 2, -196608, 536870916, 3, -196607, 4, 3, -196605, 5, 0, -196604, 5, 0, -196603, 5, 0, -196601, 536870916, 3, -196600, 536870916, 2, -196598, -1073741819, 2, -196597, 5, 0, -196596, 1610612741, 2, -196594, 4, 2, -196593, 536870916, 2, -196592, 4, 2, -196591, 4, 3, -65550, 536870916, 3, -65549, 536870916, 1, -65548, 4, 0, -65547, 4, 3, -65538, 4, 2, -65537, 536870916, 0, -131072, 536870916, 1, -131071, 4, 3, -131069, -1073741819, 2, -131068, 5, 0, -131067, 1610612741, 2, -131065, 536870916, 3, -131064, 536870916, 2, -131058, 4, 2, -131057, 4, 3, -131056, 536870916, 3, -131055, 536870916, 2, -14, 536870916, 1, -13, 4, 0, -12, 536870916, 1, -11, 4, 0, -10, 4, 3, -5, 5, 0, -2, 4, 2, -1, 536870916, 1, -65536, 4, 0, -65535, 4, 3, -65532, 6, 0, -65522, 536870916, 3, -65521, 4, 0, -65520, 4, 0, -65519, 4, 3, 65531, 6, 0, 4, 6, 0, 5, -1610612731, 2, 9, 5, 2, 131058, 4, 2, 131059, 536870916, 1, 131060, 4, 0, 131061, 536870916, 1, 131062, 536870916, 2, 131067, 6, 0, 131071, 1073741829, 2, 65536, 1610612741, 2, 65540, 6, 0, 65545, 6, 0, 196594, 4, 2, 196595, 4, 0, 196596, 4, 1, 196597, 536870916, 2, 262136, 1073741829, 2, 262137, 5, 0, 262138, 5, 0, 262139, 5, 0, 262140, 1610612741, 2, 196612, 1073741829, 2, 196613, 5, 0, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 196617, 1610612741, 2 ) -brick_color = Color( 0.239216, 0.109804, 0.184314, 1 ) -grass_color = Color( 0.741176, 0.580392, 0, 1 ) - -[node name="ObscureMap" parent="Control/Screen/Stage" instance=ExtResource( 19 )] -tile_set = SubResource( 13 ) -tile_data = PoolIntArray( -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -851948, 536870912, 0, -851947, 536870912, 0, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -786412, 536870912, 0, -786411, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -720876, 536870912, 0, -720875, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -655340, 536870912, 0, -655339, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -589804, 536870912, 0, -589803, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524267, 536870912, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458732, 2, 2, -458731, 536870912, 0, -327696, 536870912, 0, -327695, 536870912, 0, -327694, 536870912, 0 ) -tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) - -[node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] -visible = false -rect = Rect2( 0, 0, 136, 96 ) - -[node name="ViewportContainer" type="ViewportContainer" parent="Control/Screen/Vis"] -margin_right = 136.0 -margin_bottom = 96.0 - -[node name="Viewport" type="Viewport" parent="Control/Screen/Vis/ViewportContainer"] -size = Vector2( 136, 96 ) -handle_input_locally = false -render_target_update_mode = 0 - -[node name="Static" type="ColorRect" parent="Control/Screen/Vis"] -modulate = Color( 0.14, 0.14, 0.14, 1 ) -material = SubResource( 8 ) -margin_right = 136.0 -margin_bottom = 96.0 - -[node name="Overlay" type="Control" parent="Control/Screen"] -margin_right = 136.0 -margin_bottom = 104.0 - -[node name="HBox" type="HBoxContainer" parent="Control/Screen/Overlay"] +[node name="HBox" type="HBoxContainer" parent="OverlayLayer/Overlay"] anchor_right = 1.0 anchor_bottom = 1.0 alignment = 1 -[node name="Gem" type="Control" parent="Control/Screen/Overlay/HBox"] +[node name="Gem" type="Control" parent="OverlayLayer/Overlay/HBox"] margin_left = 48.0 margin_top = 44.0 margin_right = 64.0 @@ -306,13 +152,13 @@ margin_bottom = 60.0 rect_min_size = Vector2( 16, 16 ) size_flags_vertical = 4 -[node name="Sprite" type="Sprite" parent="Control/Screen/Overlay/HBox/Gem"] +[node name="Sprite" type="Sprite" parent="OverlayLayer/Overlay/HBox/Gem"] modulate = Color( 1, 0.92549, 0.152941, 1 ) material = SubResource( 10 ) position = Vector2( 8, 8 ) texture = ExtResource( 9 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/HBox"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/HBox"] margin_left = 68.0 margin_top = 49.0 margin_right = 88.0 @@ -323,17 +169,17 @@ text = "1-1" align = 1 valign = 1 -[node name="Death" type="Control" parent="Control/Screen/Overlay"] +[node name="Death" type="Control" parent="OverlayLayer/Overlay"] margin_top = 96.0 margin_bottom = 96.0 -[node name="Clock" type="Sprite" parent="Control/Screen/Overlay/Death"] +[node name="Clock" type="Sprite" parent="OverlayLayer/Overlay/Death"] material = SubResource( 3 ) position = Vector2( 8, -7 ) texture = ExtResource( 11 ) region_rect = Rect2( 15, 7, 10, 10 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/Death"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/Death"] margin_left = 15.0 margin_top = -9.0 margin_right = 83.0 @@ -342,14 +188,14 @@ grow_horizontal = 2 custom_fonts/font = SubResource( 4 ) text = "79" -[node name="Notes" type="Control" parent="Control/Screen/Overlay"] +[node name="Notes" type="Control" parent="OverlayLayer/Overlay"] -[node name="Sprite" type="Sprite" parent="Control/Screen/Overlay/Notes"] +[node name="Sprite" type="Sprite" parent="OverlayLayer/Overlay/Notes"] material = SubResource( 3 ) position = Vector2( 10, 10 ) texture = ExtResource( 3 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/Notes"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/Notes"] margin_left = 19.0 margin_top = 4.0 margin_right = 101.0 @@ -358,19 +204,19 @@ grow_horizontal = 2 custom_fonts/font = SubResource( 4 ) text = "12:34" -[node name="Gem" type="Control" parent="Control/Screen/Overlay"] +[node name="Gem" type="Control" parent="OverlayLayer/Overlay"] margin_left = 136.0 margin_top = 96.0 margin_right = 136.0 margin_bottom = 96.0 -[node name="Sprite" type="Sprite" parent="Control/Screen/Overlay/Gem"] +[node name="Sprite" type="Sprite" parent="OverlayLayer/Overlay/Gem"] modulate = Color( 0.513726, 0.462745, 0.611765, 1 ) material = SubResource( 9 ) position = Vector2( -12, -12 ) texture = ExtResource( 8 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/Gem"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/Gem"] margin_left = -103.0 margin_top = -9.0 margin_right = -21.0 @@ -380,7 +226,12 @@ custom_fonts/font = SubResource( 4 ) text = "12:34" align = 2 -[node name="Scores" type="Control" parent="Control"] +[node name="ScoreLayer" type="CanvasLayer" parent="."] +layer = 4 +follow_viewport_enable = true + +[node name="Scores" type="Control" parent="ScoreLayer"] +unique_name_in_owner = true visible = false margin_left = 111.0 margin_top = 41.0 @@ -388,20 +239,20 @@ margin_right = 245.0 margin_bottom = 135.0 rect_min_size = Vector2( 134, 94 ) -[node name="Row" type="ColorRect" parent="Control/Scores"] +[node name="Row" type="ColorRect" parent="ScoreLayer/Scores"] margin_left = -1.0 margin_top = 14.0 margin_right = 135.0 margin_bottom = 23.0 -[node name="HBoxContainer" type="HBoxContainer" parent="Control/Scores"] +[node name="HBoxContainer" type="HBoxContainer" parent="ScoreLayer/Scores"] anchor_right = 1.0 margin_top = 1.0 margin_bottom = 11.0 custom_constants/separation = 2 alignment = 1 -[node name="Title" type="Label" parent="Control/Scores/HBoxContainer"] +[node name="Title" type="Label" parent="ScoreLayer/Scores/HBoxContainer"] margin_left = 9.0 margin_top = 2.0 margin_right = 92.0 @@ -410,34 +261,34 @@ custom_fonts/font = SubResource( 6 ) text = "FASTEST note" valign = 1 -[node name="Note" type="Control" parent="Control/Scores/HBoxContainer"] +[node name="Note" type="Control" parent="ScoreLayer/Scores/HBoxContainer"] margin_left = 94.0 margin_right = 103.0 margin_bottom = 10.0 rect_min_size = Vector2( 9, 10 ) -[node name="Sprite" type="Sprite" parent="Control/Scores/HBoxContainer/Note"] +[node name="Sprite" type="Sprite" parent="ScoreLayer/Scores/HBoxContainer/Note"] material = SubResource( 3 ) position = Vector2( 5, 4 ) texture = ExtResource( 10 ) region_enabled = true region_rect = Rect2( 7, 7, 9, 10 ) -[node name="Clock" type="Control" parent="Control/Scores/HBoxContainer"] +[node name="Clock" type="Control" parent="ScoreLayer/Scores/HBoxContainer"] visible = false margin_left = 99.0 margin_right = 109.0 margin_bottom = 10.0 rect_min_size = Vector2( 10, 10 ) -[node name="Sprite" type="Sprite" parent="Control/Scores/HBoxContainer/Clock"] +[node name="Sprite" type="Sprite" parent="ScoreLayer/Scores/HBoxContainer/Clock"] material = SubResource( 3 ) position = Vector2( 5, 4 ) texture = ExtResource( 10 ) region_enabled = true region_rect = Rect2( 15, 7, 10, 10 ) -[node name="Map" type="Label" parent="Control/Scores/HBoxContainer"] +[node name="Map" type="Label" parent="ScoreLayer/Scores/HBoxContainer"] margin_left = 105.0 margin_top = 2.0 margin_right = 125.0 @@ -446,7 +297,7 @@ custom_fonts/font = SubResource( 6 ) text = "1-3" valign = 1 -[node name="List" type="Label" parent="Control/Scores"] +[node name="List" type="Label" parent="ScoreLayer/Scores"] margin_left = 1.0 margin_top = 16.0 margin_right = 133.0 @@ -463,52 +314,48 @@ text = "12:67 long_name1234567 9. waahuu 10. thats it" -[node name="Camera2D" type="Camera2D" parent="."] -position = Vector2( 160, 90 ) -smoothing_enabled = true -editor_draw_screen = false +[node name="CursorLayer" type="CanvasLayer" parent="."] +layer = 5 +follow_viewport_enable = true -[node name="Cursor" type="Control" parent="."] -modulate = Color( 1, 0.92549, 0.152941, 1 ) +[node name="Cursor" type="Control" parent="CursorLayer"] +unique_name_in_owner = true margin_left = 110.0 margin_top = 40.0 margin_right = 246.0 -margin_bottom = 144.0 +margin_bottom = 136.0 + +[node name="Arrows" type="Control" parent="CursorLayer/Cursor"] +modulate = Color( 1, 0.92549, 0.152941, 1 ) +margin_right = 136.0 +margin_bottom = 96.0 script = ExtResource( 13 ) +__meta__ = { +"_editor_description_": "" +} time = 0.5 distance = 12.0 offset = -6.0 size = Vector2( 136, 96 ) -[node name="c1" type="Sprite" parent="Cursor"] +[node name="c1" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) texture = ExtResource( 1 ) -[node name="c2" type="Sprite" parent="Cursor"] +[node name="c2" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 136, 0 ) rotation = 1.5708 texture = ExtResource( 1 ) -[node name="c3" type="Sprite" parent="Cursor"] +[node name="c3" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 0, 103 ) rotation = -1.5708 texture = ExtResource( 1 ) -[node name="c4" type="Sprite" parent="Cursor"] +[node name="c4" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 136, 103 ) rotation = 3.14159 texture = ExtResource( 1 ) - -[node name="BG" type="CanvasLayer" parent="."] -layer = -1 - -[node name="ColorRect" type="ColorRect" parent="BG"] -anchor_right = 1.0 -anchor_bottom = 1.0 -color = Color( 0.160784, 0.678431, 1, 1 ) -__meta__ = { -"_edit_lock_": true -} diff --git a/src/menu/splash.gd b/src/menu/splash.gd index 886459a..29c51fd 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,8 +1,81 @@ extends Node2D +export var is_build_sheet := false + +onready var color_rect := $CanvasLayer/ColorRect +onready var logo := $CanvasLayer/Center/Control/Logo + +onready var viewport := $ViewportContainer/Viewport +onready var view_node := $ViewportContainer/Viewport/Node2D + func _ready(): - yield(get_tree(), "idle_frame") + if is_build_sheet: + color_rect.modulate = Color.black + logo.modulate = Color.white + + yield(get_tree(), "idle_frame") + + Shared.is_level_select = true + Shared.map_dict = {} + var ix = 136 + var iy = 96 + var vx = 5 + var vy = 8 + + var image_sheet = viewport.get_texture().get_data() + image_sheet.resize(ix * vx, iy * vy) + + for i in Shared.maps.size(): + var dx = int(i % vx) + var dy = int(floor(i / vx)) + var s = str(Shared.maps[i]) + Shared.map_dict[s] = [dx,dy,0,0,0,0,0,0] + var dict = Shared.map_dict[s] + + var inst = load(Shared.map_dir + s + ".tscn").instance() + + for c in view_node.get_children(): + c.queue_free() + + view_node.add_child(inst) + + var cb = inst.get_node("CamBounds") + if is_instance_valid(cb): + inst.position -= cb.position + + var p = inst.get_node("Actors/Player") + if is_instance_valid(p): + p.visible = false + dict[2] = int(p.position.x - cb.position.x) + dict[3] = int(p.position.y - cb.position.y) + + var e = inst.get_node("Actors/Exit") + if is_instance_valid(e): + e.visible = false + dict[4] = int(e.position.x - cb.position.x) + dict[5] = int(e.position.y - cb.position.y) + + yield(get_tree(), "idle_frame") + + var image = viewport.get_texture().get_data() + image.flip_y() + + image_sheet.blit_rect(image, Rect2(0, 0, ix, iy), Vector2(dx * ix, dy * iy)) + image_sheet.save_png("res://src/stage/sheet.png") + + var sd := SaveDict.new() + sd.dict = Shared.map_dict + + ResourceSaver.save("res://src/stage/sheet.tres", sd) + + yield(get_tree(), "idle_frame") + + color_rect.modulate = Color.white + logo.modulate = Color.black Music.play() Audio.play("menu_bell") + yield(get_tree().create_timer(1.5), "timeout") + Shared.wipe_scene(Shared.main_menu_path) + diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 5075f02..89b3242 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=5 format=2] -[ext_resource path="res://media/image/title_splash-pixel.png" type="Texture" id=1] +[ext_resource path="res://media/image/harmony-monroe-white.png" type="Texture" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=2] [ext_resource path="res://src/menu/splash.gd" type="Script" id=3] +[ext_resource path="res://media/image/harmony-monroe-square-white.png" type="Texture" id=4] [node name="Splash" type="Node2D"] script = ExtResource( 3 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] -layer = 9 +layer = 90 [node name="ColorRect" type="ColorRect" parent="CanvasLayer"] anchor_right = 1.0 @@ -23,10 +25,34 @@ margin_bottom = 128.0 rect_min_size = Vector2( 228, 128 ) [node name="Logo" type="Sprite" parent="CanvasLayer/Center/Control"] +visible = false modulate = Color( 0, 0, 0, 1 ) position = Vector2( 114, 64 ) +scale = Vector2( 0.1, 0.1 ) texture = ExtResource( 1 ) -[node name="Camera2D" type="Camera2D" parent="CanvasLayer/Center/Control"] +[node name="CamBounds" type="Node2D" parent="CanvasLayer/Center/Control"] position = Vector2( 114, 64 ) -current = true +script = ExtResource( 2 ) + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer/Center/Control"] +modulate = Color( 0, 0, 0, 1 ) +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 4 ) +expand = true +stretch_mode = 6 + +[node name="ViewportContainer" type="ViewportContainer" parent="."] +margin_left = -163.0 +margin_top = -120.0 +margin_right = -27.0 +margin_bottom = -24.0 + +[node name="Viewport" type="Viewport" parent="ViewportContainer"] +size = Vector2( 136, 96 ) +handle_input_locally = false +render_target_update_mode = 3 + +[node name="Node2D" type="Node2D" parent="ViewportContainer/Viewport"] +position = Vector2( 68, 48 ) diff --git a/src/stage/Cam.gd b/src/stage/Cam.gd new file mode 100644 index 0000000..a58daa5 --- /dev/null +++ b/src/stage/Cam.gd @@ -0,0 +1,44 @@ +extends Camera2D + +var node_target : Node2D +var pos_target := Vector2.ZERO +var pos_target_offset := Vector2.ZERO +export var lerp_step := 0.1 +export var lerp_jump := 0.5 +var lerp_pos := Vector2.ZERO + +var bounds_upper := Vector2.ZERO +var bounds_lower := Vector2.ZERO + + +func set_pos(arg : Vector2 = position): + position = arg + lerp_pos = position + pos_target = position + +func _ready(): + set_pos() + + Wipe.connect("finish", self, "wipe_finish") + +func wipe_finish(): + node_target = null + pos_target_offset = Vector2.ZERO + +func _physics_process(delta): + if is_instance_valid(node_target): + pos_target = node_target.position + pos_target_offset + pos_target.x = clamp(pos_target.x, bounds_upper.x, bounds_lower.x) + pos_target.y = clamp(pos_target.y, bounds_upper.y, bounds_lower.y) + + # smoothing + lerp_pos = lerp_pos.linear_interpolate(pos_target, clamp(lerp_step, 0, 1)) + if lerp_pos.distance_to(pos_target) < lerp_jump: + lerp_pos = pos_target + position = lerp_pos.round() + +# super simple screen shake +func shake(dist : int): + position.x += dist if randf() < 0.5 else -dist + position.y += dist if randf() < 0.5 else -dist + lerp_pos = position diff --git a/src/stage/CamBounds.gd b/src/stage/CamBounds.gd new file mode 100644 index 0000000..c4b0ba5 --- /dev/null +++ b/src/stage/CamBounds.gd @@ -0,0 +1,33 @@ +tool +extends Node2D + +export var bounds := Rect2(0, 0, 0, 0) setget _set_bounds + +var cam +var rect : Rect2 +var screen = Vector2(228, 128) + +func _ready(): + rect = Rect2(-screen/2, screen) + + if (!Shared.is_level_select or get_parent().name == "Select") and is_instance_valid(Shared.cam): + cam = Shared.cam + cam.bounds_upper = position - bounds.position + cam.bounds_lower = bounds.size + position + + cam.set_pos(global_position) + cam.zoom = scale + + print("CamBounds upper: ", cam.bounds_upper, " lower: ", cam.bounds_lower) + +func _set_bounds(arg): + bounds.position.x = abs(arg.position.x) + bounds.position.y = abs(arg.position.y) + bounds.size.x = abs(arg.size.x) + bounds.size.y = abs(arg.size.y) + update() + +func _draw(): + if Engine.editor_hint: + draw_rect(Rect2(-bounds.position.x - (screen.x/2), -bounds.position.y - (screen.y/2), screen.x + bounds.size.x + bounds.position.x, screen.y + bounds.size.y + bounds.position.y), Color.red, false) + draw_rect(rect, Color.yellow, false) diff --git a/src/stage/DetailTileMap.gd b/src/stage/DetailTileMap.gd index 2d4a59c..5cfd498 100644 --- a/src/stage/DetailTileMap.gd +++ b/src/stage/DetailTileMap.gd @@ -9,6 +9,9 @@ func _ready(): tile_set = tile_set.duplicate() if Engine.is_editor_hint(): return + Shared.connect("background_signal", self, "background_signal") + background_signal() + set_brick_color() set_grass_color() set_wood_color() @@ -24,3 +27,8 @@ func set_grass_color(arg := grass_color): func set_wood_color(arg := wood_color): wood_color = arg tile_set.tile_set_modulate(6, wood_color) + +func background_signal(): + var f = float(Shared.background_option) + modulate = Color.black.linear_interpolate(Color.white, f / 10.0) + visible = f > 0 diff --git a/src/stage/GameCamera.gd b/src/stage/GameCamera.gd deleted file mode 100644 index 5911347..0000000 --- a/src/stage/GameCamera.gd +++ /dev/null @@ -1,68 +0,0 @@ -tool -extends Camera2D - -export var is_moving := true - -var node_target : Node2D -var pos_target := Vector2.ZERO -var pos_target_offset := Vector2.ZERO -export var lerp_step := 0.1 -var lerp_pos := Vector2.ZERO - -export var is_focal_point := false -# between 0.0 and 1.0, distance of lerp between focal point and target -export var target_influence := 0.5 - -var node_bounds : ColorRect -var bounds_upper := Vector2.ZERO -var bounds_lower := Vector2.ZERO - -export var bounds := Rect2(0, 0, 0, 0) setget _set_bounds - -func _ready(): - if Engine.editor_hint or Shared.is_level_select: - set_physics_process(false) - return - - Shared.cam = self - - # set limits - bounds_upper.x = -bounds.position.x + position.x - bounds_upper.y = -bounds.position.y + position.y - bounds_lower.x = bounds.size.x + position.x - bounds_lower.y = bounds.size.y + position.y - print("GameCamera - bounds upper: ", bounds_upper, " lower: ", bounds_lower) - - # set vars - lerp_pos = position - pos_target = position - -func _physics_process(delta): - if !is_moving or Engine.editor_hint: - return - - if is_instance_valid(node_target): - pos_target = node_target.position + pos_target_offset - pos_target.x = clamp(pos_target.x, bounds_upper.x, bounds_lower.x) - pos_target.y = clamp(pos_target.y, bounds_upper.y, bounds_lower.y) - - # smoothing - lerp_pos = lerp_pos.linear_interpolate(pos_target, lerp_step) - position = lerp_pos.round() - -func _set_bounds(arg): - bounds.position.x = abs(arg.position.x) - bounds.position.y = abs(arg.position.y) - bounds.size.x = abs(arg.size.x) - bounds.size.y = abs(arg.size.y) - update() - -func _draw(): - if Engine.editor_hint: - draw_rect(Rect2(-bounds.position.x - 228/2, -bounds.position.y - 128/2, 228 + bounds.size.x + bounds.position.x, 128 + bounds.size.y + bounds.position.y), Color.red, false) - -# super simple screen shake -func shake(dist : int): - position.x += dist if randf() < 0.5 else -dist - position.y += dist if randf() < 0.5 else -dist - lerp_pos = position diff --git a/src/stage/GameCamera.tscn b/src/stage/GameCamera.tscn deleted file mode 100644 index 6c486dd..0000000 --- a/src/stage/GameCamera.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://src/stage/GameCamera.gd" type="Script" id=1] - -[node name="GameCamera" type="Camera2D" groups=[ -"game_camera", -]] -current = true -script = ExtResource( 1 ) diff --git a/src/stage/preview.gd b/src/stage/preview.gd deleted file mode 100644 index 634ce54..0000000 --- a/src/stage/preview.gd +++ /dev/null @@ -1,19 +0,0 @@ -extends Resource -class_name StagePreview - -export var file_md5 := "" - -export var palette := 0 - -export var camera := "" -export var player := "" -export var exit := "" -export var box := "" - -export var spike := "" - -export var solid := {} -export var detail := {} -export var obscure := {} - -# ID CO-ORDS.x is_transpose + is_x + is_y diff --git a/src/stage/sheet.png b/src/stage/sheet.png new file mode 100644 index 0000000..9c02583 Binary files /dev/null and b/src/stage/sheet.png differ diff --git a/src/stage/sheet.tres b/src/stage/sheet.tres new file mode 100644 index 0000000..df9db77 --- /dev/null +++ b/src/stage/sheet.tres @@ -0,0 +1,45 @@ +[gd_resource type="Resource" load_steps=2 format=2] + +[ext_resource path="res://src/class/savedict.gd" type="Script" id=1] + +[resource] +script = ExtResource( 1 ) +dict = { +"1-1": [ 0, 0, -40, 8, 45, 5, 0, 0 ], +"1-2": [ 1, 0, -48, 24, 45, -19, 0, 0 ], +"1-3": [ 2, 0, -68, 40, -43, -35, 0, 0 ], +"1-4": [ 3, 0, 24, 32, -67, -27, 0, 0 ], +"1-5": [ 4, 0, 2, 40, 21, -43, 0, 0 ], +"1-6": [ 0, 1, -20, 16, -11, -43, 0, 0 ], +"1-7": [ 1, 1, -20, 32, 61, -35, 0, 0 ], +"1-8": [ 2, 1, -4, 40, -3, -35, 0, 0 ], +"2-1": [ 3, 1, -93, 8, 85, 5, 0, 0 ], +"2-2": [ 4, 1, -4, -4, 85, -7, 0, 0 ], +"2-3": [ 0, 2, -70, 16, 139, -27, 0, 0 ], +"2-4": [ 1, 2, 32, 40, 9, -99, 0, 0 ], +"2-5": [ 2, 2, -63, 12, 81, -15, 0, 0 ], +"2-6": [ 3, 2, -35, -32, 49, 41, 0, 0 ], +"2-7": [ 4, 2, -68, 16, -3, -31, 0, 0 ], +"2-8": [ 0, 3, -24, 40, -75, -35, 0, 0 ], +"3-1": [ 1, 3, -36, 0, 53, -27, 0, 0 ], +"3-2": [ 2, 3, -36, 8, 9, -43, 0, 0 ], +"3-3": [ 3, 3, -48, 8, -27, -43, 0, 0 ], +"3-4": [ 4, 3, -80, 24, 133, -27, 0, 0 ], +"3-5": [ 0, 4, -52, 16, 45, -19, 0, 0 ], +"3-6": [ 1, 4, -47, 4, 69, -23, 0, 0 ], +"3-7": [ 2, 4, -68, 12, 79, -23, 0, 0 ], +"3-8": [ 3, 4, -64, 17, 73, -42, 0, 0 ], +"4-1": [ 4, 4, -44, 12, 41, -11, 0, 0 ], +"4-2": [ 0, 5, -9, 44, -3, -47, 0, 0 ], +"4-3": [ 1, 5, 44, 28, -75, -47, 0, 0 ], +"4-4": [ 2, 5, -32, 16, -3, -15, 0, 0 ], +"4-5": [ 3, 5, 13, 4, 57, -35, 0, 0 ], +"4-6": [ 4, 5, 39, 28, -83, -7, 0, 0 ], +"4-7": [ 0, 6, 46, 20, -159, -19, 0, 0 ], +"4-8": [ 1, 6, -48, 28, -87, -35, 0, 0 ], +"5-1": [ 2, 6, -46, 24, 140, -19, 0, 0 ], +"5-2": [ 3, 6, 69, 16, -95, -35, 0, 0 ], +"5-3": [ 4, 6, -15, -16, -87, 1, 0, 0 ], +"5-4": [ 0, 7, 35, 40, -85, -35, 0, 0 ], +"win": [ 1, 7, -13, 32, 89, -15, 0, 0 ] +}