Cleaning up Merge
This commit is contained in:
parent
5255092171
commit
a82210061e
14 changed files with 190 additions and 24 deletions
34
Assets/ColorPallet.png.import
Normal file
34
Assets/ColorPallet.png.import
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="CompressedTexture2D"
|
||||||
|
uid="uid://1tn0jeyhxy1k"
|
||||||
|
path="res://.godot/imported/ColorPallet.png-9feaa0f98adb7b976a9666999fd546c6.ctex"
|
||||||
|
metadata={
|
||||||
|
"vram_texture": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/ColorPallet.png"
|
||||||
|
dest_files=["res://.godot/imported/ColorPallet.png-9feaa0f98adb7b976a9666999fd546c6.ctex"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
compress/mode=0
|
||||||
|
compress/high_quality=false
|
||||||
|
compress/lossy_quality=0.7
|
||||||
|
compress/hdr_compression=1
|
||||||
|
compress/normal_map=0
|
||||||
|
compress/channel_pack=0
|
||||||
|
mipmaps/generate=false
|
||||||
|
mipmaps/limit=-1
|
||||||
|
roughness/mode=0
|
||||||
|
roughness/src_normal=""
|
||||||
|
process/fix_alpha_border=true
|
||||||
|
process/premult_alpha=false
|
||||||
|
process/normal_map_invert_y=false
|
||||||
|
process/hdr_as_srgb=false
|
||||||
|
process/hdr_clamp_exposure=false
|
||||||
|
process/size_limit=0
|
||||||
|
detect_3d/compress_to=1
|
34
Assets/Sprites/Cross.png.import
Normal file
34
Assets/Sprites/Cross.png.import
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="CompressedTexture2D"
|
||||||
|
uid="uid://6snf183fgfo5"
|
||||||
|
path="res://.godot/imported/Cross.png-a35d7d54d47ceec63c1f7d015bd7540a.ctex"
|
||||||
|
metadata={
|
||||||
|
"vram_texture": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Sprites/Cross.png"
|
||||||
|
dest_files=["res://.godot/imported/Cross.png-a35d7d54d47ceec63c1f7d015bd7540a.ctex"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
compress/mode=0
|
||||||
|
compress/high_quality=false
|
||||||
|
compress/lossy_quality=0.7
|
||||||
|
compress/hdr_compression=1
|
||||||
|
compress/normal_map=0
|
||||||
|
compress/channel_pack=0
|
||||||
|
mipmaps/generate=false
|
||||||
|
mipmaps/limit=-1
|
||||||
|
roughness/mode=0
|
||||||
|
roughness/src_normal=""
|
||||||
|
process/fix_alpha_border=true
|
||||||
|
process/premult_alpha=false
|
||||||
|
process/normal_map_invert_y=false
|
||||||
|
process/hdr_as_srgb=false
|
||||||
|
process/hdr_clamp_exposure=false
|
||||||
|
process/size_limit=0
|
||||||
|
detect_3d/compress_to=1
|
34
Assets/Sprites/Jesus/jesus_spritesheet.png.import
Normal file
34
Assets/Sprites/Jesus/jesus_spritesheet.png.import
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="CompressedTexture2D"
|
||||||
|
uid="uid://ojlfqxj5bilo"
|
||||||
|
path="res://.godot/imported/jesus_spritesheet.png-2f2e431acd4617eba93529f5420694c6.ctex"
|
||||||
|
metadata={
|
||||||
|
"vram_texture": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Sprites/Jesus/jesus_spritesheet.png"
|
||||||
|
dest_files=["res://.godot/imported/jesus_spritesheet.png-2f2e431acd4617eba93529f5420694c6.ctex"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
compress/mode=0
|
||||||
|
compress/high_quality=false
|
||||||
|
compress/lossy_quality=0.7
|
||||||
|
compress/hdr_compression=1
|
||||||
|
compress/normal_map=0
|
||||||
|
compress/channel_pack=0
|
||||||
|
mipmaps/generate=false
|
||||||
|
mipmaps/limit=-1
|
||||||
|
roughness/mode=0
|
||||||
|
roughness/src_normal=""
|
||||||
|
process/fix_alpha_border=true
|
||||||
|
process/premult_alpha=false
|
||||||
|
process/normal_map_invert_y=false
|
||||||
|
process/hdr_as_srgb=false
|
||||||
|
process/hdr_clamp_exposure=false
|
||||||
|
process/size_limit=0
|
||||||
|
detect_3d/compress_to=1
|
34
Assets/Sprites/TileMap.png.import
Normal file
34
Assets/Sprites/TileMap.png.import
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="CompressedTexture2D"
|
||||||
|
uid="uid://dl2qogjortsbo"
|
||||||
|
path="res://.godot/imported/TileMap.png-5a8ebee45e38c1e4c53b5e5cf69bfe18.ctex"
|
||||||
|
metadata={
|
||||||
|
"vram_texture": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Sprites/TileMap.png"
|
||||||
|
dest_files=["res://.godot/imported/TileMap.png-5a8ebee45e38c1e4c53b5e5cf69bfe18.ctex"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
compress/mode=0
|
||||||
|
compress/high_quality=false
|
||||||
|
compress/lossy_quality=0.7
|
||||||
|
compress/hdr_compression=1
|
||||||
|
compress/normal_map=0
|
||||||
|
compress/channel_pack=0
|
||||||
|
mipmaps/generate=false
|
||||||
|
mipmaps/limit=-1
|
||||||
|
roughness/mode=0
|
||||||
|
roughness/src_normal=""
|
||||||
|
process/fix_alpha_border=true
|
||||||
|
process/premult_alpha=false
|
||||||
|
process/normal_map_invert_y=false
|
||||||
|
process/hdr_as_srgb=false
|
||||||
|
process/hdr_clamp_exposure=false
|
||||||
|
process/size_limit=0
|
||||||
|
detect_3d/compress_to=1
|
34
Assets/Sprites/crucefix.png.import
Normal file
34
Assets/Sprites/crucefix.png.import
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="CompressedTexture2D"
|
||||||
|
uid="uid://dlxjdb0tchrps"
|
||||||
|
path="res://.godot/imported/crucefix.png-cb219c7b600f79e2811b5e89faa1becb.ctex"
|
||||||
|
metadata={
|
||||||
|
"vram_texture": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://Assets/Sprites/crucefix.png"
|
||||||
|
dest_files=["res://.godot/imported/crucefix.png-cb219c7b600f79e2811b5e89faa1becb.ctex"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
compress/mode=0
|
||||||
|
compress/high_quality=false
|
||||||
|
compress/lossy_quality=0.7
|
||||||
|
compress/hdr_compression=1
|
||||||
|
compress/normal_map=0
|
||||||
|
compress/channel_pack=0
|
||||||
|
mipmaps/generate=false
|
||||||
|
mipmaps/limit=-1
|
||||||
|
roughness/mode=0
|
||||||
|
roughness/src_normal=""
|
||||||
|
process/fix_alpha_border=true
|
||||||
|
process/premult_alpha=false
|
||||||
|
process/normal_map_invert_y=false
|
||||||
|
process/hdr_as_srgb=false
|
||||||
|
process/hdr_clamp_exposure=false
|
||||||
|
process/size_limit=0
|
||||||
|
detect_3d/compress_to=1
|
|
@ -1,6 +1,6 @@
|
||||||
[gd_resource type="TileSet" load_steps=4 format=3 uid="uid://bj7uu2180mie3"]
|
[gd_resource type="TileSet" load_steps=4 format=3 uid="uid://bj7uu2180mie3"]
|
||||||
|
|
||||||
[ext_resource type="Texture2D" uid="uid://bqi3ddjrcj2bh" path="res://Assets/Sprites/TileMap.png" id="1_cl3se"]
|
[ext_resource type="Texture2D" uid="uid://dl2qogjortsbo" path="res://Assets/Sprites/TileMap.png" id="1_cl3se"]
|
||||||
|
|
||||||
[sub_resource type="NavigationPolygon" id="NavigationPolygon_fhapu"]
|
[sub_resource type="NavigationPolygon" id="NavigationPolygon_fhapu"]
|
||||||
vertices = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
|
vertices = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="3_o045y"]
|
[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="3_o045y"]
|
||||||
[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="4_hpafd"]
|
[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="4_hpafd"]
|
||||||
[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="5_d2cbj"]
|
[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="5_d2cbj"]
|
||||||
[ext_resource type="Texture2D" uid="uid://db70wcy5ua3jd" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="6_p526i"]
|
[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="6_p526i"]
|
||||||
[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="7_mtrts"]
|
[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="7_mtrts"]
|
||||||
[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="8_fp1vx"]
|
[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="8_fp1vx"]
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
[gd_scene load_steps=13 format=3 uid="uid://c061h8kte43oy"]
|
[gd_scene load_steps=12 format=3 uid="uid://c061h8kte43oy"]
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://Scripts/MainMenuManager.gd" id="1_0vcve"]
|
[ext_resource type="Script" path="res://Scripts/MainMenuManager.gd" id="1_0vcve"]
|
||||||
[ext_resource type="Script" path="res://Scripts/MenuButton.gd" id="1_croa2"]
|
[ext_resource type="Script" path="res://Scripts/MenuButton.gd" id="1_croa2"]
|
||||||
[ext_resource type="Texture2D" uid="uid://ce6njuef2g4vy" path="res://Assets/Sprites/Cross.png" id="1_joe3h"]
|
[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/Cross.png" id="1_joe3h"]
|
||||||
[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Easter Egg/Shadow.png" id="4_8qs7j"]
|
[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Easter Egg/Shadow.png" id="4_8qs7j"]
|
||||||
[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Easter Egg/Egg 3.png" id="5_1ocdn"]
|
[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Easter Egg/Egg 3.png" id="5_1ocdn"]
|
||||||
[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Props/Cake.png" id="5_5gyoe"]
|
[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Props/Cake.png" id="5_5gyoe"]
|
||||||
[ext_resource type="Texture2D" uid="uid://cnrja43wk2mmd" path="res://Assets/Sprites/Jesus.png" id="6_ag6vh"]
|
[ext_resource type="Texture2D" uid="uid://cnrja43wk2mmd" path="res://Assets/Sprites/Jesus.png" id="6_ag6vh"]
|
||||||
|
[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_4mc3t"]
|
||||||
[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Easter Egg/Egg 2.png" id="8_cha7m"]
|
[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Easter Egg/Egg 2.png" id="8_cha7m"]
|
||||||
[ext_resource type="Texture2D" uid="uid://y532moy2ihmn" path="res://Assets/Sprites/Good Bunny/good bunny.png" id="8_j5v2i"]
|
|
||||||
[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Easter Egg/Egg 1.png" id="9_ujgvg"]
|
[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Easter Egg/Egg 1.png" id="9_ujgvg"]
|
||||||
[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/Theme.tres" id="10_dmxwi"]
|
[ext_resource type="PackedScene" uid="uid://ck2ggeynybwdb" path="res://Scenes/MusicPlayer.tscn" id="12_x3k6e"]
|
||||||
[ext_resource type="PackedScene" path="res://Scenes/MusicPlayer.tscn" id="12_x3k6e"]
|
|
||||||
|
|
||||||
[node name="MainMenu" type="Node" node_paths=PackedStringArray("button_to_focus_on_start")]
|
[node name="MainMenu" type="Node" node_paths=PackedStringArray("button_to_focus_on_start")]
|
||||||
script = ExtResource("1_0vcve")
|
script = ExtResource("1_0vcve")
|
||||||
|
@ -89,7 +88,6 @@ texture = ExtResource("9_ujgvg")
|
||||||
[node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"]
|
[node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"]
|
||||||
position = Vector2(331, 458.5)
|
position = Vector2(331, 458.5)
|
||||||
scale = Vector2(7.14286, 7.02941)
|
scale = Vector2(7.14286, 7.02941)
|
||||||
texture = ExtResource("8_j5v2i")
|
|
||||||
hframes = 6
|
hframes = 6
|
||||||
|
|
||||||
[node name="MainVBox" type="VBoxContainer" parent="."]
|
[node name="MainVBox" type="VBoxContainer" parent="."]
|
||||||
|
@ -98,7 +96,7 @@ anchor_right = 1.0
|
||||||
anchor_bottom = 1.0
|
anchor_bottom = 1.0
|
||||||
grow_horizontal = 2
|
grow_horizontal = 2
|
||||||
grow_vertical = 2
|
grow_vertical = 2
|
||||||
theme = ExtResource("10_dmxwi")
|
theme = ExtResource("8_4mc3t")
|
||||||
|
|
||||||
[node name="CenterContainer" type="CenterContainer" parent="MainVBox"]
|
[node name="CenterContainer" type="CenterContainer" parent="MainVBox"]
|
||||||
custom_minimum_size = Vector2(0, 150)
|
custom_minimum_size = Vector2(0, 150)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=2 format=3]
|
[gd_scene load_steps=2 format=3 uid="uid://ck2ggeynybwdb"]
|
||||||
|
|
||||||
[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="1_wb1gf"]
|
[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="1_wb1gf"]
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[gd_scene load_steps=4 format=3 uid="uid://dosnlh8axkov6"]
|
[gd_scene load_steps=4 format=3]
|
||||||
|
|
||||||
[ext_resource type="Script" path="res://Scripts/SettingsMenu.gd" id="1_2rgd2"]
|
[ext_resource type="Script" path="res://Scripts/SettingsMenu.gd" id="1_2rgd2"]
|
||||||
[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/Theme.tres" id="2_swcn6"]
|
[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="2_swcn6"]
|
||||||
[ext_resource type="Script" path="res://Scripts/RemapButton.gd" id="3_gktg3"]
|
[ext_resource type="Script" path="res://Scripts/RemapButton.gd" id="3_gktg3"]
|
||||||
|
|
||||||
[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")]
|
[node name="SettingsMenu" type="Node" node_paths=PackedStringArray("display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")]
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="3_dvklj"]
|
[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="3_dvklj"]
|
||||||
[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="4_0fyd5"]
|
[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="4_0fyd5"]
|
||||||
[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="5_uv7bh"]
|
[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="5_uv7bh"]
|
||||||
[ext_resource type="Texture2D" uid="uid://db70wcy5ua3jd" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="6_es2l8"]
|
[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="6_es2l8"]
|
||||||
[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="7_8kdie"]
|
[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="7_8kdie"]
|
||||||
[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="8_wx0kk"]
|
[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="8_wx0kk"]
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ extends Node
|
||||||
const SAVE_FILE : String = "user://SAVEFILE.save"
|
const SAVE_FILE : String = "user://SAVEFILE.save"
|
||||||
var game_data = {}
|
var game_data = {}
|
||||||
|
|
||||||
# Engine callbacks
|
|
||||||
func _ready():
|
func _ready():
|
||||||
load_data()
|
load_data()
|
||||||
|
|
||||||
|
@ -22,11 +21,11 @@ func load_data():
|
||||||
else:
|
else:
|
||||||
game_data = file.get_var()
|
game_data = file.get_var()
|
||||||
file.close()
|
file.close()
|
||||||
file.flush()
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
func save_data():
|
func save_data():
|
||||||
var file = FileAccess.open(SAVE_FILE, FileAccess.WRITE)
|
var file = FileAccess.open(SAVE_FILE, FileAccess.WRITE)
|
||||||
file.store_var(game_data)
|
file.store_var(game_data)
|
||||||
file.close()
|
|
||||||
file.flush()
|
file.flush()
|
||||||
|
file.close()
|
||||||
|
pass
|
||||||
|
|
|
@ -11,18 +11,10 @@ config_version=5
|
||||||
[application]
|
[application]
|
||||||
|
|
||||||
config/name="HoppyEaster"
|
config/name="HoppyEaster"
|
||||||
|
|
||||||
run/main_scene="res://Scenes/Test.tscn"
|
run/main_scene="res://Scenes/Test.tscn"
|
||||||
config/features=PackedStringArray("4.0", "GL Compatibility")
|
config/features=PackedStringArray("4.0", "GL Compatibility")
|
||||||
config/icon="res://icon.svg"
|
config/icon="res://icon.svg"
|
||||||
|
|
||||||
[display]
|
|
||||||
|
|
||||||
window/size/viewport_width=1280
|
|
||||||
window/size/viewport_height=720
|
|
||||||
window/stretch/mode="viewport"
|
|
||||||
window/stretch/aspect="expand"
|
|
||||||
|
|
||||||
[audio]
|
[audio]
|
||||||
|
|
||||||
buses/default_bus_layout="res://Assets/Temp Music/default_bus_layout.tres"
|
buses/default_bus_layout="res://Assets/Temp Music/default_bus_layout.tres"
|
||||||
|
@ -32,6 +24,13 @@ buses/default_bus_layout="res://Assets/Temp Music/default_bus_layout.tres"
|
||||||
GlobalSettings="*res://Scripts/GlobalSettings.gd"
|
GlobalSettings="*res://Scripts/GlobalSettings.gd"
|
||||||
Save="*res://Scripts/GameDataSaver.gd"
|
Save="*res://Scripts/GameDataSaver.gd"
|
||||||
|
|
||||||
|
[display]
|
||||||
|
|
||||||
|
window/size/viewport_width=1280
|
||||||
|
window/size/viewport_height=720
|
||||||
|
window/stretch/mode="viewport"
|
||||||
|
window/stretch/aspect="expand"
|
||||||
|
|
||||||
[dotnet]
|
[dotnet]
|
||||||
|
|
||||||
project/assembly_name="HoppyEaster"
|
project/assembly_name="HoppyEaster"
|
||||||
|
|
Reference in a new issue