Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor filesystem #306

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Final small path fixes
Just reassigning some paths, the game should be bootable now.

The tutorial level has been removed in this refactor since we're probably gonna load it as a JSON file as opposed to a Godot scene.
cruglet committed Dec 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 110e3ef73e2fb19a801b2d8f192237326a5c8cd6
3 changes: 1 addition & 2 deletions global/touch_control/touch_controls.gd
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ const BUTTON_DIMENSIONS = Vector2(20, 21)
const ANCHOR_DIRECTION_OFFSETS = [Vector2(1, -1), Vector2(-1, -1), Vector2(1, 1), Vector2(-1, 1)]
const ANCHOR_PIVOT_OFFSETS = [Vector2(0, -1), Vector2(-1, -1), Vector2(0, 0), Vector2(-1, 0)]
const ANCHOR_REVERSE_OFFSETS = [false, true, false, true]
const BUTTON_PREFAB = preload("res://classes/global/touch_control/touch_button.tscn")
const BUTTON_PREFAB = preload("res://global/touch_control/touch_button.tscn")
const LAYOUT_PRESETS = {
"new": "up:jump,up/down:dive,down/z:pound,interact#fludd:fludd/x:spin,skip@left:left/right:right#nozzle:switch_fludd/pause:pause@_/shift:feedback/_",
"one-finger": "nozzle:switch_fludd,skip/z:pound,interact/pipe:down#pause:pause@_/left:left/x:spin,skip/right:right/_#dl:dive,left/jleft:jump,left/up:jump,up/jright:jump,right/dr:dive,right#_/fleft:fludd,left/fludd:fludd/fright:fludd,right/_@_/shift:feedback/_",
@@ -129,4 +129,3 @@ func _generate_buttons(pattern: String) -> void:
pos_offset.y += BUTTON_DIMENSIONS.y
pos_offset.y = 0
anchor_index += 1

2 changes: 1 addition & 1 deletion gui/ingame/hud/hud.tscn
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
[ext_resource type="PackedScene" uid="uid://bycv605ap1b6u" path="res://gui/ingame/water_meter/water_meter.tscn" id="11"]
[ext_resource type="PackedScene" uid="uid://bud0fk28v3h76" path="res://gui/ingame/life_meter/life_meter.tscn" id="13"]
[ext_resource type="Script" path="res://gui/ingame/hud/hud.gd" id="14"]
[ext_resource type="Shader" path="res://game/materials/post/flash.gdshader" id="28"]
[ext_resource type="Shader" path="res://game/shaders/post/flash.gdshader" id="28"]

[sub_resource type="AtlasTexture" id="4"]
atlas = ExtResource("2")
2 changes: 1 addition & 1 deletion gui/ingame/pause/level_info/level_info.tscn
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://87w6u8a6gqvy" path="res://gui/ingame/pause/map/map_coin_1.png" id="2"]
[ext_resource type="Texture2D" uid="uid://1pctsggfusdc" path="res://gui/ingame/pause/map/map_shine_0.png" id="3"]
[ext_resource type="Texture2D" uid="uid://dr5le5k54odf6" path="res://gui/ingame/pause/map/map_coin_0.png" id="4"]
[ext_resource type="Shader" path="res://game/materials/material/glow.gdshader" id="4_ne3kv"]
[ext_resource type="Shader" path="res://game/shaders/material/glow.gdshader" id="4_ne3kv"]
[ext_resource type="Texture2D" uid="uid://cw3yd45xx6bf8" path="res://gui/ingame/pause/map/map_shine_1.png" id="5"]
[ext_resource type="StyleBox" uid="uid://cuiaksyau07pv" path="res://gui/ingame/pause/pause_back.tres" id="6"]
[ext_resource type="Script" path="res://gui/ingame/hud/level_info.gd" id="10"]
2 changes: 1 addition & 1 deletion gui/ingame/pause/map/map.tscn
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
[ext_resource type="Texture2D" uid="uid://hjwjcoop1ep5" path="res://game/objects/item/fludd/textures/pickup_turbo.png" id="1"]
[ext_resource type="Texture2D" uid="uid://01rvhulbgmob" path="res://game/objects/item/fludd/textures/pickup_rocket.png" id="2"]
[ext_resource type="Texture2D" uid="uid://pw2ksn3vsasj" path="res://game/objects/item/fludd/textures/pickup_hover.png" id="3"]
[ext_resource type="Shader" path="res://game/materials/post/flash.gdshader" id="4"]
[ext_resource type="Shader" path="res://game/shaders/post/flash.gdshader" id="4"]
[ext_resource type="Texture2D" uid="uid://cy7rvh7j0kpi3" path="res://gui/ingame/pause/map/paintings/mini.png" id="5"]
[ext_resource type="Texture2D" uid="uid://dvhma2mthdmuo" path="res://game/objects/item/fludd/textures/map_rocket.png" id="7"]
[ext_resource type="Texture2D" uid="uid://cc7aclwxhmsha" path="res://game/objects/item/fludd/textures/map_turbo.png" id="8"]
2 changes: 1 addition & 1 deletion gui/ingame/pause/options/bind_list.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extends VBoxContainer

const PREFAB_REBIND_OPTION = preload("res://gui/pause/options/rebind_option.tscn")
const PREFAB_REBIND_OPTION = preload("res://gui/ingame/pause/options/rebind_option.tscn")


func _ready():