Merge branch 'develop'

SelinaDev · Aug 16, 2024 · 6cfcb3b · 6cfcb3b
2 parents 1267969 + 44ad274
commit 6cfcb3b
Show file tree

Hide file tree

Showing 84 changed files with 3,106 additions and 184 deletions.
diff --git a/build/web/index.apple-touch-icon.png b/build/web/index.apple-touch-icon.png
diff --git a/build/web/index.audio.worklet.js b/build/web/index.audio.worklet.js
@@ -167,7 +167,7 @@ class GodotProcessor extends AudioWorkletProcessor {
 				GodotProcessor.write_input(this.input_buffer, input);
 				this.input.write(this.input_buffer);
 			} else {
-				this.port.postMessage('Input buffer is full! Skipping input frame.');
+				// this.port.postMessage('Input buffer is full! Skipping input frame.'); // Uncomment this line to debug input buffer.
 			}
 		}
 		const process_output = GodotProcessor.array_has_data(outputs);
@@ -184,7 +184,7 @@ class GodotProcessor extends AudioWorkletProcessor {
 					this.port.postMessage({ 'cmd': 'read', 'data': chunk });
 				}
 			} else {
-				this.port.postMessage('Output buffer has not enough frames! Skipping output frame.');
+				// this.port.postMessage('Output buffer has not enough frames! Skipping output frame.'); // Uncomment this line to debug output buffer.
 			}
 		}
 		this.process_notify();

diff --git a/build/web/index.icon.png b/build/web/index.icon.png
diff --git a/build/web/index.zip b/build/web/index.zip
diff --git a/project/addons/resource_dbs/resource_db_interface.gd b/project/addons/resource_dbs/resource_db_interface.gd
@@ -41,7 +41,6 @@ func _save_config() -> void:
 	var config := ConfigFile.new()
 
 	for category_node: ResourceDbCategory in categories_container.get_children():
-		print(category_node.category_name, category_node.category_path, category_node.get_source_paths())
 		config.set_value(category_node.category_name, "destination_path", category_node.category_path)
 		config.set_value(category_node.category_name, "source_paths", category_node.get_source_paths())
 
@@ -59,7 +58,6 @@ func _on_generate_button_pressed() -> void:
 		return
 
 	var target_categories: PackedStringArray = ProjectSettings.get_setting(PLUGIN_SETTING, [])
-	print(target_categories)
 	for category: String in target_categories:
 		var destination_path: String = config.get_value(category, "destination_path", "")
 		if destination_path == "":
@@ -76,5 +74,4 @@ func _on_generate_button_pressed() -> void:
 					resource_db.entries[file_name.trim_suffix(".tres")] = file
 
 		var db_name := category + "_db.tres"
-		print(resource_db)
 		ResourceSaver.save(resource_db, destination_path.path_join(db_name))
diff --git a/project/export_presets.cfg b/project/export_presets.cfg
@@ -3,22 +3,25 @@
 name="Web"
 platform="Web"
 runnable=true
+advanced_options=false
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
-include_filter=""
+include_filter="*.txt"
 exclude_filter=""
 export_path="../build/web/index.html"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false
 encrypt_directory=false
+script_export_mode=2
 
 [preset.0.options]
 
 custom_template/debug=""
 custom_template/release=""
 variant/extensions_support=false
+variant/thread_support=false
 vram_texture_compression/for_desktop=true
 vram_texture_compression/for_mobile=false
 html/export_icon=true
@@ -28,6 +31,7 @@ html/canvas_resize_policy=2
 html/focus_canvas_on_start=true
 html/experimental_virtual_keyboard=false
 progressive_web_app/enabled=false
+progressive_web_app/ensure_cross_origin_isolation_headers=true
 progressive_web_app/offline_page=""
 progressive_web_app/display=1
 progressive_web_app/orientation=0

diff --git a/project/mar405F.tmp b/project/mar405F.tmp
@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://clb55xo7qyjsx"]
+
+[ext_resource type="Script" path="res://markov_test.gd" id="1_q55wx"]
+
+[node name="MarkovTest" type="Node"]
+script = ExtResource("1_q55wx")
diff --git a/project/project.godot b/project/project.godot
@@ -168,6 +168,22 @@ interact={
 "events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
 ]
 }
+pause={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":false,"script":null)
+]
+}
+stairs={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":60,"unicode":60,"location":0,"echo":false,"script":null)
+]
+}
+character={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":80,"physical_keycode":0,"key_label":0,"unicode":112,"location":0,"echo":false,"script":null)
+]
+}
 
 [rendering]
 

diff --git a/project/resources/Entities/Actors/goblin.tres b/project/resources/Entities/Actors/goblin.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="Entity" load_steps=13 format=3 uid="uid://bdaryf1h2fgfo"]
+[gd_resource type="Resource" script_class="Entity" load_steps=15 format=3 uid="uid://bdaryf1h2fgfo"]
 
 [ext_resource type="Script" path="res://src/Entity/entity.gd" id="1_71i23"]
 [ext_resource type="Script" path="res://src/Entity/Component/DrawableComponent/drawable_component.gd" id="1_ad45g"]
@@ -7,6 +7,7 @@
 [ext_resource type="Texture2D" uid="uid://cl5u3naxm2fy" path="res://assets/urizen_onebit_tileset__v1d0.png" id="2_fo3nt"]
 [ext_resource type="Script" path="res://src/Entity/Component/durability_component.gd" id="3_1gaep"]
 [ext_resource type="Resource" uid="uid://cr15gc6rayc4v" path="res://resources/Entities/Actors/Templates/creature_template.tres" id="4_jkxms"]
+[ext_resource type="Script" path="res://src/Entity/Component/xp_component.gd" id="6_6cfnt"]
 [ext_resource type="Script" path="res://src/Entity/entity_template.gd" id="7_wyj2n"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_d711m"]
@@ -37,9 +38,14 @@ death_z_index = 1
 death_removes_movement_blocker = true
 death_removes_visibility_blocker = true
 
+[sub_resource type="Resource" id="Resource_llwwi"]
+script = ExtResource("6_6cfnt")
+xp = 10
+
 [resource]
 script = ExtResource("1_71i23")
 name = "Goblin"
 is_proper_name = false
 templates = Array[ExtResource("7_wyj2n")]([ExtResource("4_jkxms")])
-initial_components = Array[ExtResource("1_f6mlm")]([SubResource("Resource_wv305"), SubResource("Resource_j5qmc")])
+initial_components = Array[ExtResource("1_f6mlm")]([SubResource("Resource_wv305"), SubResource("Resource_j5qmc"), SubResource("Resource_llwwi")])
+_components = {}
diff --git a/project/resources/Entities/Actors/orc.tres b/project/resources/Entities/Actors/orc.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="Entity" load_steps=13 format=3 uid="uid://b44koamww3qdl"]
+[gd_resource type="Resource" script_class="Entity" load_steps=15 format=3 uid="uid://b44koamww3qdl"]
 
 [ext_resource type="Script" path="res://src/Entity/Component/component.gd" id="1_cyk4p"]
 [ext_resource type="Script" path="res://src/Entity/entity.gd" id="1_emt5n"]
@@ -7,6 +7,7 @@
 [ext_resource type="Texture2D" uid="uid://cl5u3naxm2fy" path="res://assets/urizen_onebit_tileset__v1d0.png" id="2_f1yj4"]
 [ext_resource type="Script" path="res://src/Entity/Component/durability_component.gd" id="3_r1iu2"]
 [ext_resource type="Resource" uid="uid://cr15gc6rayc4v" path="res://resources/Entities/Actors/Templates/creature_template.tres" id="4_smwea"]
+[ext_resource type="Script" path="res://src/Entity/Component/xp_component.gd" id="6_nlap5"]
 [ext_resource type="Script" path="res://src/Entity/entity_template.gd" id="7_8aesf"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_kd78y"]
@@ -37,9 +38,14 @@ death_z_index = 1
 death_removes_movement_blocker = true
 death_removes_visibility_blocker = true
 
+[sub_resource type="Resource" id="Resource_ongov"]
+script = ExtResource("6_nlap5")
+xp = 30
+
 [resource]
 script = ExtResource("1_emt5n")
 name = "Orc"
 is_proper_name = false
 templates = Array[ExtResource("7_8aesf")]([ExtResource("4_smwea")])
-initial_components = Array[ExtResource("1_cyk4p")]([SubResource("Resource_lihad"), SubResource("Resource_kba1c")])
+initial_components = Array[ExtResource("1_cyk4p")]([SubResource("Resource_lihad"), SubResource("Resource_kba1c"), SubResource("Resource_ongov")])
+_components = {}
diff --git a/project/resources/Entities/Actors/player.tres b/project/resources/Entities/Actors/player.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="Entity" load_steps=27 format=3 uid="uid://08un78dx64fi"]
+[gd_resource type="Resource" script_class="Entity" load_steps=31 format=3 uid="uid://08un78dx64fi"]
 
 [ext_resource type="Script" path="res://src/Entity/Component/component.gd" id="1_5seo2"]
 [ext_resource type="Script" path="res://src/Entity/entity.gd" id="1_ge48h"]
@@ -15,10 +15,13 @@
 [ext_resource type="Script" path="res://src/Entity/entity_template.gd" id="11_l0emg"]
 [ext_resource type="Script" path="res://src/Entity/Component/faction_component.gd" id="12_b1s0l"]
 [ext_resource type="Script" path="res://src/Entity/Component/StatusEffects/status_effects_component.gd" id="13_lvm21"]
+[ext_resource type="Script" path="res://src/Entity/Component/level_component.gd" id="14_71xcd"]
+[ext_resource type="Script" path="res://src/Entity/Component/resistance_component.gd" id="15_0oxg0"]
 
 [sub_resource type="Resource" id="Resource_yntj7"]
 script = ExtResource("1_paibh")
 player_index = 0
+player_name = ""
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_r61x0"]
 atlas = ExtResource("3_ifa31")
@@ -71,9 +74,21 @@ faction = 1
 script = ExtResource("13_lvm21")
 effects = {}
 
+[sub_resource type="Resource" id="Resource_pi4ht"]
+script = ExtResource("14_71xcd")
+current_level = 1
+current_xp = 0
+level_up_base = 200
+level_up_factor = 150
+
+[sub_resource type="Resource" id="Resource_slbl7"]
+script = ExtResource("15_0oxg0")
+defense = 0
+
 [resource]
 script = ExtResource("1_ge48h")
 name = "Player"
 is_proper_name = true
 templates = Array[ExtResource("11_l0emg")]([ExtResource("3_kx7dw")])
-initial_components = Array[ExtResource("1_5seo2")]([SubResource("Resource_yntj7"), SubResource("Resource_qlvlf"), SubResource("Resource_merbi"), SubResource("Resource_bihn8"), SubResource("Resource_n76u1"), SubResource("Resource_foi8v"), SubResource("Resource_gpmxi"), SubResource("Resource_o14as"), SubResource("Resource_u8cb1")])
+initial_components = Array[ExtResource("1_5seo2")]([SubResource("Resource_yntj7"), SubResource("Resource_qlvlf"), SubResource("Resource_merbi"), SubResource("Resource_bihn8"), SubResource("Resource_n76u1"), SubResource("Resource_foi8v"), SubResource("Resource_gpmxi"), SubResource("Resource_o14as"), SubResource("Resource_u8cb1"), SubResource("Resource_pi4ht"), SubResource("Resource_slbl7")])
+_components = {}
diff --git a/project/resources/Entities/Environment/door.tres b/project/resources/Entities/Environment/door.tres
@@ -67,3 +67,4 @@ name = "Door"
 is_proper_name = false
 templates = Array[ExtResource("11_bjthg")]([])
 initial_components = Array[ExtResource("1_owng2")]([SubResource("Resource_ku177"), SubResource("Resource_45j3k"), SubResource("Resource_bf7hl"), SubResource("Resource_oiumw"), SubResource("Resource_0yx4u"), SubResource("Resource_lv2on")])
+_components = {}
diff --git a/project/resources/Entities/Environment/stairs_down.tres b/project/resources/Entities/Environment/stairs_down.tres
@@ -0,0 +1,42 @@
+[gd_resource type="Resource" script_class="Entity" load_steps=13 format=3 uid="uid://wm7jwgulk3qw"]
+
+[ext_resource type="Script" path="res://src/Entity/Component/component.gd" id="1_i4e47"]
+[ext_resource type="Script" path="res://src/Entity/entity.gd" id="2_5wqww"]
+[ext_resource type="Script" path="res://src/Entity/Component/DrawableComponent/DrawableEffects/drawable_effect.gd" id="2_akf0l"]
+[ext_resource type="Script" path="res://src/Entity/Component/DrawableComponent/drawable_component.gd" id="3_nhg5v"]
+[ext_resource type="Script" path="res://src/Entity/entity_template.gd" id="3_rin70"]
+[ext_resource type="Texture2D" uid="uid://cl5u3naxm2fy" path="res://assets/urizen_onebit_tileset__v1d0.png" id="4_iubcv"]
+[ext_resource type="Script" path="res://src/Entity/Component/rememberable_component.gd" id="5_rnsd8"]
+[ext_resource type="Script" path="res://src/Entity/Component/stairs_component.gd" id="6_slrol"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_eotiq"]
+atlas = ExtResource("4_iubcv")
+region = Rect2(300, 14, 12, 12)
+
+[sub_resource type="Resource" id="Resource_i53o7"]
+script = ExtResource("3_nhg5v")
+texture = SubResource("AtlasTexture_eotiq")
+render_order = 2
+color = Color(1, 1, 1, 1)
+modulate = Color(1, 1, 1, 1)
+visible = true
+position = Vector2i(0, 0)
+drawable_effects = Array[ExtResource("2_akf0l")]([])
+_active_drawable_effects = {}
+
+[sub_resource type="Resource" id="Resource_ljg01"]
+script = ExtResource("5_rnsd8")
+not_in_view_color = Color(1, 1, 1, 1)
+
+[sub_resource type="Resource" id="Resource_vuvas"]
+script = ExtResource("6_slrol")
+target_map_index = 0
+use_verb = "descends"
+
+[resource]
+script = ExtResource("2_5wqww")
+name = "Stairs (Down)"
+is_proper_name = false
+templates = Array[ExtResource("3_rin70")]([])
+initial_components = Array[ExtResource("1_i4e47")]([SubResource("Resource_i53o7"), SubResource("Resource_ljg01"), SubResource("Resource_vuvas")])
+_components = {}
diff --git a/project/resources/Entities/Environment/stairs_up.tres b/project/resources/Entities/Environment/stairs_up.tres
@@ -0,0 +1,42 @@
+[gd_resource type="Resource" script_class="Entity" load_steps=13 format=3 uid="uid://mk0fsop75a3g"]
+
+[ext_resource type="Script" path="res://src/Entity/Component/component.gd" id="1_mawj2"]
+[ext_resource type="Script" path="res://src/Entity/Component/DrawableComponent/DrawableEffects/drawable_effect.gd" id="2_vv4yp"]
+[ext_resource type="Script" path="res://src/Entity/Component/DrawableComponent/drawable_component.gd" id="3_s0b70"]
+[ext_resource type="Texture2D" uid="uid://cl5u3naxm2fy" path="res://assets/urizen_onebit_tileset__v1d0.png" id="4_1iwii"]
+[ext_resource type="Script" path="res://src/Entity/Component/rememberable_component.gd" id="5_etnwx"]
+[ext_resource type="Script" path="res://src/Entity/Component/stairs_component.gd" id="6_8vshh"]
+[ext_resource type="Script" path="res://src/Entity/entity.gd" id="7_0xedi"]
+[ext_resource type="Script" path="res://src/Entity/entity_template.gd" id="8_uu8ya"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_hxywt"]
+atlas = ExtResource("4_1iwii")
+region = Rect2(313, 14, 12, 12)
+
+[sub_resource type="Resource" id="Resource_7uarv"]
+script = ExtResource("3_s0b70")
+texture = SubResource("AtlasTexture_hxywt")
+render_order = 0
+color = Color(1, 1, 1, 1)
+modulate = Color(1, 1, 1, 1)
+visible = true
+position = Vector2i(0, 0)
+drawable_effects = Array[ExtResource("2_vv4yp")]([])
+_active_drawable_effects = {}
+
+[sub_resource type="Resource" id="Resource_eumk6"]
+script = ExtResource("5_etnwx")
+not_in_view_color = Color(1, 1, 1, 1)
+
+[sub_resource type="Resource" id="Resource_nm6ar"]
+script = ExtResource("6_8vshh")
+target_map_index = 0
+use_verb = "climbss"
+
+[resource]
+script = ExtResource("7_0xedi")
+name = "Stairs (Up)"
+is_proper_name = false
+templates = Array[ExtResource("8_uu8ya")]([])
+initial_components = Array[ExtResource("1_mawj2")]([SubResource("Resource_7uarv"), SubResource("Resource_eumk6"), SubResource("Resource_nm6ar")])
+_components = {}
diff --git a/project/resources/Entities/Items/potion_health.tres b/project/resources/Entities/Items/potion_health.tres
@@ -47,3 +47,4 @@ name = "Potion of Healing"
 is_proper_name = false
 templates = Array[ExtResource("3_cssym")]([ExtResource("7_tw7p6")])
 initial_components = Array[ExtResource("1_iu87o")]([SubResource("Resource_qlm4l"), SubResource("Resource_rv1y4")])
+_components = {}
diff --git a/project/resources/Entities/Items/scroll_confusion.tres b/project/resources/Entities/Items/scroll_confusion.tres
@@ -70,3 +70,4 @@ name = "Scroll of Confusion"
 is_proper_name = false
 templates = Array[ExtResource("13_g0q11")]([ExtResource("14_upvga")])
 initial_components = Array[ExtResource("1_rnyew")]([SubResource("Resource_5v8pb"), SubResource("Resource_v3vo7")])
+_components = {}
diff --git a/project/resources/Entities/Items/scroll_fireball.tres b/project/resources/Entities/Items/scroll_fireball.tres
@@ -76,3 +76,4 @@ name = "Scroll of Fireball"
 is_proper_name = false
 templates = Array[ExtResource("3_nrbt7")]([ExtResource("14_x5vsh")])
 initial_components = Array[ExtResource("1_y56au")]([SubResource("Resource_mfigx"), SubResource("Resource_c5fdn")])
+_components = {}
diff --git a/project/resources/Entities/Items/scroll_lightning.tres b/project/resources/Entities/Items/scroll_lightning.tres
@@ -31,7 +31,7 @@ _active_drawable_effects = {}
 
 [sub_resource type="Resource" id="Resource_1p5nc"]
 script = ExtResource("6_qdb5l")
-amount = 3
+amount = 10
 verb = "damaged"
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_uiwjw"]
@@ -67,3 +67,4 @@ name = "Scroll of Lightning"
 is_proper_name = false
 templates = Array[ExtResource("3_e30fq")]([ExtResource("11_3yu3q")])
 initial_components = Array[ExtResource("1_aslml")]([SubResource("Resource_4jrrs"), SubResource("Resource_46q2h")])
+_components = {}
diff --git a/project/resources/Entities/Items/scroll_magic_missile.tres b/project/resources/Entities/Items/scroll_magic_missile.tres
@@ -59,3 +59,4 @@ name = "Scroll of Magic Missile"
 is_proper_name = false
 templates = Array[ExtResource("3_6cicf")]([ExtResource("7_lyvug")])
 initial_components = Array[ExtResource("1_a086o")]([SubResource("Resource_080yj"), SubResource("Resource_pquyw")])
+_components = {}
diff --git a/project/resources/MapGeneration/world_config.tres b/project/resources/MapGeneration/world_config.tres
@@ -0,0 +1,23 @@
+[gd_resource type="Resource" script_class="WorldConfig" load_steps=6 format=3 uid="uid://crh05juyhbrvy"]
+
+[ext_resource type="Script" path="res://src/Map/map_config.gd" id="1_nsr08"]
+[ext_resource type="Resource" uid="uid://c3pn25g7s1xse" path="res://resources/Tiles/Variations/dungeon_floor_variation.tres" id="2_klk6a"]
+[ext_resource type="Script" path="res://src/Map/World/WorldGenerator/world_config.gd" id="2_toqqe"]
+[ext_resource type="Resource" uid="uid://bueuip5l015ph" path="res://resources/Tiles/Variations/dungeon_wall_variation.tres" id="3_h53sn"]
+
+[sub_resource type="Resource" id="Resource_2jf63"]
+script = ExtResource("1_nsr08")
+map_width = 100
+map_height = 100
+max_rooms = 20
+max_tries = 1000
+max_enemies_per_room = 2
+max_items_per_room = 1
+floor_variation = ExtResource("2_klk6a")
+wall_variation = ExtResource("3_h53sn")
+map_type = 0
+room_pack = "dungeon"
+
+[resource]
+script = ExtResource("2_toqqe")
+map_configs = Array[ExtResource("1_nsr08")]([SubResource("Resource_2jf63"), SubResource("Resource_2jf63"), SubResource("Resource_2jf63")])