Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved the xp data into core aswell, and removed the data module. Also updated HEADS to get the xp_data property fix from ESS.

Browse Source
This commit is contained in:
Relintai 2020-04-26 13:30:31 +02:00
parent 37acb59dba
commit dd4fb4fd0b
7 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "be5a47e75d4b671a48b0a35eb17887ee38d8516c", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "85e06a4ca99d64b4002b94ecfa556c36360c80c3"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} {"engine": {"3.2": "be5a47e75d4b671a48b0a35eb17887ee38d8516c", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "157edcc8d628d1598c35f4496dae32b1359a0e0a"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}}

4
game/data/core/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

4
game/data/core/materials/5_standard_material_nouv2.tres
View File

File diff suppressed because one or more lines are too long

4
game/data/core/resource_db.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="ESSResourceDBStatic" load_steps=8 format=2] [gd_resource type="ESSResourceDBStatic" load_steps=9 format=2]
[ext_resource path="res://data/core/item_templates/2_test.tres" type="ItemTemplate" id=1] [ext_resource path="res://data/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
[ext_resource path="res://data/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2] [ext_resource path="res://data/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
@ -7,8 +7,10 @@
[ext_resource path="res://data/core/item_templates/1_gold.tres" type="ItemTemplate" id=5] [ext_resource path="res://data/core/item_templates/1_gold.tres" type="ItemTemplate" id=5]
[ext_resource path="res://data/core/crafting/1_test_craft.tres" type="CraftRecipe" id=6] [ext_resource path="res://data/core/crafting/1_test_craft.tres" type="CraftRecipe" id=6]
[ext_resource path="res://data/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=7] [ext_resource path="res://data/core/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=7]
[ext_resource path="res://data/core/xp/xp_data.tres" type="XPData" id=8]
[resource] [resource]
xp_data = ExtResource( 8 )
entity_resources = [ ExtResource( 7 ) ] entity_resources = [ ExtResource( 7 ) ]
entity_skills = [ ExtResource( 4 ) ] entity_skills = [ ExtResource( 4 ) ]
craft_recipes = [ ExtResource( 6 ), ExtResource( 3 ) ] craft_recipes = [ ExtResource( 6 ), ExtResource( 3 ) ]

0
game/data/xp/xp_data.tres → game/data/core/xp/xp_data.tres
View File

8
game/data/game_module.tres
View File

@ -1,8 +0,0 @@
[gd_resource type="Resource" load_steps=3 format=2]
[ext_resource path="res://scripts/game_modules/GameModule.gd" type="Script" id=1]
[ext_resource path="res://data/resource_db.tres" type="ESSResourceDBFolders" id=2]
[resource]
script = ExtResource( 1 )
resource_db = ExtResource( 2 )

4
game/data/resource_db.tres
View File

@ -1,4 +0,0 @@
[gd_resource type="ESSResourceDBFolders" format=2]
[resource]
xp_data_path = "res://data/xp/xp_data.tres"