luca/monsterfangen
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

restructured folders

Browse source
This commit is contained in:
Luca 2024-09-26 20:07:44 +02:00
parent e3aec75404
commit 0f5045dc22
22 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

0
scenes/monster/monster.gd → entities/monster/monster.gd
View file

2
scenes/monster/monster.tscn → entities/monster/monster.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://cytaswycabcel"] [gd_scene load_steps=5 format=3 uid="uid://cytaswycabcel"]
[ext_resource type="Script" path="res://scenes/monster/monster.gd" id="1_5gfkg"] [ext_resource type="Script" path="res://entities/monster/monster.gd" id="1_5gfkg"]
[ext_resource type="Material" uid="uid://ctul3e67rcq23" path="res://materials/CollisionDebugMaterial.tres" id="2_bf2kb"] [ext_resource type="Material" uid="uid://ctul3e67rcq23" path="res://materials/CollisionDebugMaterial.tres" id="2_bf2kb"]
[sub_resource type="SphereShape3D" id="SphereShape3D_tjvna"] [sub_resource type="SphereShape3D" id="SphereShape3D_tjvna"]

2
scenes/monster_spawnpoint/monster_spawnpoint.gd → entities/monster_spawnpoint/monster_spawnpoint.gd
View file

@ -1,7 +1,7 @@
class_name MonsterSpawnpoint class_name MonsterSpawnpoint
extends Node3D extends Node3D
@onready var monster_tscn = preload("res://scenes/monster/monster.tscn") @onready var monster_tscn = preload("res://entities/monster/monster.tscn")
# a spawnpoint that can spawn monsters # a spawnpoint that can spawn monsters
# monsters are only spawned, if the player is not looking # monsters are only spawned, if the player is not looking

2
scenes/monster_spawnpoint/monster_spawnpoint.tscn → entities/monster_spawnpoint/monster_spawnpoint.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://dawpmu4vvv3rs"] [gd_scene load_steps=4 format=3 uid="uid://dawpmu4vvv3rs"]
[ext_resource type="Script" path="res://scenes/monster_spawnpoint/monster_spawnpoint.gd" id="1_p2vfw"] [ext_resource type="Script" path="res://entities/monster_spawnpoint/monster_spawnpoint.gd" id="1_p2vfw"]
[sub_resource type="SphereMesh" id="SphereMesh_phb77"] [sub_resource type="SphereMesh" id="SphereMesh_phb77"]
radius = 0.4 radius = 0.4

0
scenes/player/player.gd → entities/player/player.gd
View file

2
scenes/player/player.tscn → entities/player/player.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://be5bc5gjbo875"] [gd_scene load_steps=4 format=3 uid="uid://be5bc5gjbo875"]
[ext_resource type="Script" path="res://scenes/player/player.gd" id="1_mv2yl"] [ext_resource type="Script" path="res://entities/player/player.gd" id="1_mv2yl"]
[ext_resource type="PackedScene" uid="uid://cy36aygvs66pn" path="res://assets/models/gobot/gobot_skin.tscn" id="2_a4t6w"] [ext_resource type="PackedScene" uid="uid://cy36aygvs66pn" path="res://assets/models/gobot/gobot_skin.tscn" id="2_a4t6w"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_xuba7"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_xuba7"]

4
scenes/game.gd → game.gd
View file

@ -18,14 +18,14 @@ func _ready() -> void:
# this event comes from the MainMenu Node in the UI # this event comes from the MainMenu Node in the UI
func _on_ui_on_new_game_started() -> void: func _on_ui_on_new_game_started() -> void:
var world = preload("res://scenes/worlds/debug_level.tscn").instantiate() var world = preload("res://worlds/debug_level.tscn").instantiate()
UI.show_ingame_controls() UI.show_ingame_controls()
# Add the starting world # Add the starting world
%CurrentLevel.add_child(world) %CurrentLevel.add_child(world)
# Add the starting player to the starting world # Add the starting player to the starting world
var player = preload("res://scenes/player/player.tscn").instantiate() var player = preload("res://entities/player/player.tscn").instantiate()
world.add_child(player) world.add_child(player)
# event comes from the MainMenu Node in the UI # event comes from the MainMenu Node in the UI

4
scenes/game.tscn → game.tscn
View file

@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://cswuap81n7t3f"] [gd_scene load_steps=3 format=3 uid="uid://cswuap81n7t3f"]
[ext_resource type="Script" path="res://scenes/game.gd" id="1_mfbtr"] [ext_resource type="Script" path="res://game.gd" id="1_mfbtr"]
[ext_resource type="PackedScene" uid="uid://b5y7pdfe6ougf" path="res://scenes/ui/ui.tscn" id="2_ynhuf"] [ext_resource type="PackedScene" uid="uid://b5y7pdfe6ougf" path="res://ui/ui.tscn" id="2_ynhuf"]
[node name="Game" type="Node3D"] [node name="Game" type="Node3D"]
script = ExtResource("1_mfbtr") script = ExtResource("1_mfbtr")

15
project.godot
View file

@ -11,14 +11,14 @@ config_version=5
[application] [application]
config/name="monsterfangen" config/name="monsterfangen"
run/main_scene="res://scenes/game.tscn" run/main_scene="res://game.tscn"
config/features=PackedStringArray("4.3", "Mobile") config/features=PackedStringArray("4.3", "Mobile")
boot_splash/image="res://assets/logo/logo.png" boot_splash/image="res://assets/logo/logo.png"
config/icon="res://assets/logo/logo.png" config/icon="res://assets/logo/logo.png"
[autoload] [autoload]
UI="*res://scenes/ui/ui.gd" UI="*res://ui/ui.gd"
SaveGame="*res://globals/save_game.gd" SaveGame="*res://globals/save_game.gd"
SaveData="*res://resources/save_data.gd" SaveData="*res://resources/save_data.gd"
@ -30,6 +30,17 @@ window/stretch/mode="canvas_items"
window/stretch/aspect="expand" window/stretch/aspect="expand"
window/handheld/orientation=1 window/handheld/orientation=1
[file_customization]
folder_colors={
"res://assets/": "red",
"res://entities/": "blue",
"res://globals/": "gray",
"res://materials/": "pink",
"res://resources/": "yellow",
"res://ui/": "green"
}
[global_group] [global_group]
Persist="Contains all nodes that need to be saved" Persist="Contains all nodes that need to be saved"

0
scripts/camera_controls.gd → ui/camera_controls.gd
View file

0
scenes/ui/ingame_controls.gd → ui/ingame_controls.gd
View file

4
scenes/ui/ingame_controls.tscn → ui/ingame_controls.tscn
View file

@ -1,8 +1,8 @@
[gd_scene load_steps=11 format=3 uid="uid://1anjhvi173g3"] [gd_scene load_steps=11 format=3 uid="uid://1anjhvi173g3"]
[ext_resource type="Script" path="res://scenes/ui/ingame_controls.gd" id="1_iw1sp"] [ext_resource type="Script" path="res://ui/ingame_controls.gd" id="1_iw1sp"]
[ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="1_wr5sh"] [ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="1_wr5sh"]
[ext_resource type="Script" path="res://scripts/joystick.gd" id="2_pyri2"] [ext_resource type="Script" path="res://ui/joystick.gd" id="2_pyri2"]
[ext_resource type="Texture2D" uid="uid://8anyvhkcy4ng" path="res://assets/textures/Xbox Series/Vector/xbox_button_a.svg" id="3_lgi8v"] [ext_resource type="Texture2D" uid="uid://8anyvhkcy4ng" path="res://assets/textures/Xbox Series/Vector/xbox_button_a.svg" id="3_lgi8v"]
[ext_resource type="Texture2D" uid="uid://cbep021ykpb23" path="res://assets/textures/Game Icons/Vector/2x/save.png" id="5_2pil1"] [ext_resource type="Texture2D" uid="uid://cbep021ykpb23" path="res://assets/textures/Game Icons/Vector/2x/save.png" id="5_2pil1"]
[ext_resource type="Texture2D" uid="uid://bwyoxxotdisyp" path="res://assets/textures/Game Icons/Vector/2x/gear.png" id="5_nwwsc"] [ext_resource type="Texture2D" uid="uid://bwyoxxotdisyp" path="res://assets/textures/Game Icons/Vector/2x/gear.png" id="5_nwwsc"]

2
scenes/ui/ingame_menu.gd → ui/ingame_menu.gd
View file

@ -2,7 +2,7 @@ extends MarginContainer
class_name MonsterList class_name MonsterList
@onready var monster_list_entry_container: MarginContainer = $MarginContainer/PanelContainer/VBoxContainer/MonsterListEntryContainer @onready var monster_list_entry_container: MarginContainer = $MarginContainer/PanelContainer/VBoxContainer/MonsterListEntryContainer
@onready var monster_list_entry = preload("res://scenes/ui/monster_list_entry.tscn") @onready var monster_list_entry = preload("res://ui/monster_list_entry.tscn")
func _ready() -> void: func _ready() -> void:
visible = false visible = false

2
scenes/ui/ingame_menu.tscn → ui/ingame_menu.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=8 format=3 uid="uid://bbvbnrcjatkrb"] [gd_scene load_steps=8 format=3 uid="uid://bbvbnrcjatkrb"]
[ext_resource type="Script" path="res://scenes/ui/ingame_menu.gd" id="1_beinb"] [ext_resource type="Script" path="res://ui/ingame_menu.gd" id="1_beinb"]
[ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_1e4kf"] [ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_1e4kf"]
[ext_resource type="Texture2D" uid="uid://bhh31i3wgww43" path="res://assets/textures/Game Icons/Vector/2x/singleplayer.png" id="2_c2ia0"] [ext_resource type="Texture2D" uid="uid://bhh31i3wgww43" path="res://assets/textures/Game Icons/Vector/2x/singleplayer.png" id="2_c2ia0"]
[ext_resource type="Texture2D" uid="uid://c737p2osplq2o" path="res://assets/textures/Xbox Series/Vector/xbox_button_x_outline.svg" id="3_kgfth"] [ext_resource type="Texture2D" uid="uid://c737p2osplq2o" path="res://assets/textures/Xbox Series/Vector/xbox_button_x_outline.svg" id="3_kgfth"]

0
scripts/joystick.gd → ui/joystick.gd
View file

0
scenes/ui/main_menu.gd → ui/main_menu.gd
View file

2
scenes/ui/main_menu.tscn → ui/main_menu.tscn
View file

@ -1,7 +1,7 @@
[gd_scene load_steps=10 format=3 uid="uid://dt00rjsodtady"] [gd_scene load_steps=10 format=3 uid="uid://dt00rjsodtady"]
[ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_1fmce"] [ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_1fmce"]
[ext_resource type="Script" path="res://scenes/ui/main_menu.gd" id="1_5gs73"] [ext_resource type="Script" path="res://ui/main_menu.gd" id="1_5gs73"]
[ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_aqmkw"] [ext_resource type="FontFile" uid="uid://bjaavdnopfh0q" path="res://assets/fonts/aoboshi_one/AoboshiOne-Regular.ttf" id="2_aqmkw"]
[ext_resource type="Texture2D" uid="uid://da7o6lfuoliid" path="res://assets/textures/Backgrounds/meadow2.jpg" id="2_bb61v"] [ext_resource type="Texture2D" uid="uid://da7o6lfuoliid" path="res://assets/textures/Backgrounds/meadow2.jpg" id="2_bb61v"]

0
scenes/ui/monster_list_entry.gd → ui/monster_list_entry.gd
View file

2
scenes/ui/monster_list_entry.tscn → ui/monster_list_entry.tscn
View file

@ -1,7 +1,7 @@
[gd_scene load_steps=9 format=3 uid="uid://brp2sljqnkuhe"] [gd_scene load_steps=9 format=3 uid="uid://brp2sljqnkuhe"]
[ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_16gb7"] [ext_resource type="Texture2D" uid="uid://b6ylra30qxf30" path="res://assets/logo/logo.png" id="1_16gb7"]
[ext_resource type="Script" path="res://scenes/ui/monster_list_entry.gd" id="1_spojl"] [ext_resource type="Script" path="res://ui/monster_list_entry.gd" id="1_spojl"]
[ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="2_5n4ar"] [ext_resource type="Texture2D" uid="uid://2vxx2waofxpw" path="res://assets/textures/Xbox Series/Vector/xbox_button_menu_outline.svg" id="2_5n4ar"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_s3mod"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_s3mod"]

0
scenes/ui/ui.gd → ui/ui.gd
View file

8
scenes/ui/ui.tscn → ui/ui.tscn
View file

@ -1,9 +1,9 @@
[gd_scene load_steps=5 format=3 uid="uid://b5y7pdfe6ougf"] [gd_scene load_steps=5 format=3 uid="uid://b5y7pdfe6ougf"]
[ext_resource type="Script" path="res://scripts/camera_controls.gd" id="1_x56x6"] [ext_resource type="Script" path="res://ui/camera_controls.gd" id="1_x56x6"]
[ext_resource type="PackedScene" uid="uid://dt00rjsodtady" path="res://scenes/ui/main_menu.tscn" id="3_tcmm8"] [ext_resource type="PackedScene" uid="uid://dt00rjsodtady" path="res://ui/main_menu.tscn" id="3_tcmm8"]
[ext_resource type="PackedScene" uid="uid://1anjhvi173g3" path="res://scenes/ui/ingame_controls.tscn" id="4_likk0"] [ext_resource type="PackedScene" uid="uid://1anjhvi173g3" path="res://ui/ingame_controls.tscn" id="4_likk0"]
[ext_resource type="PackedScene" uid="uid://bbvbnrcjatkrb" path="res://scenes/ui/ingame_menu.tscn" id="5_qjqu1"] [ext_resource type="PackedScene" uid="uid://bbvbnrcjatkrb" path="res://ui/ingame_menu.tscn" id="5_qjqu1"]
[node name="UI" type="CanvasLayer"] [node name="UI" type="CanvasLayer"]

2
scenes/worlds/debug_level.tscn → worlds/debug_level.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=10 format=3 uid="uid://p8agd0dfam0p"] [gd_scene load_steps=10 format=3 uid="uid://p8agd0dfam0p"]
[ext_resource type="PackedScene" uid="uid://dawpmu4vvv3rs" path="res://scenes/monster_spawnpoint/monster_spawnpoint.tscn" id="3_esgto"] [ext_resource type="PackedScene" uid="uid://dawpmu4vvv3rs" path="res://entities/monster_spawnpoint/monster_spawnpoint.tscn" id="3_esgto"]
[ext_resource type="Script" path="res://resources/monster_data.gd" id="3_iktqp"] [ext_resource type="Script" path="res://resources/monster_data.gd" id="3_iktqp"]
[ext_resource type="Resource" uid="uid://0xqaef8uftnv" path="res://resources/monsters/debuggy.tres" id="4_noslo"] [ext_resource type="Resource" uid="uid://0xqaef8uftnv" path="res://resources/monsters/debuggy.tres" id="4_noslo"]