Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-02-19 03:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update the game to go with the new modules.

Browse Source
This commit is contained in:
Relintai 2020-07-06 22:33:56 +02:00
parent 1a35955b55
commit 3cacc01945
21 changed files with 164 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
game/modules/core/materials/10_standard_vman_mdr_material.tres Normal file
View File

File diff suppressed because one or more lines are too long

150
game/modules/core/xp/xp_data.tres
View File

@ -1,83 +1,73 @@
[gd_resource type="XPData" format=2]
[resource]
character_level_1 = 22
character_level_2 = 34
character_level_3 = 43
character_level_4 = 200
character_level_5 = 200
character_level_6 = 200
character_level_7 = 200
character_level_8 = 200
character_level_9 = 200
character_level_10 = 200
character_level_11 = 200
character_level_12 = 200
character_level_13 = 200
character_level_14 = 200
character_level_15 = 200
character_level_16 = 200
character_level_17 = 200
character_level_18 = 200
character_level_19 = 200
character_level_20 = 200
class_level_1 = 100
class_level_2 = 200
class_level_3 = 300
class_level_4 = 400
class_level_5 = 500
class_level_6 = 600
class_level_7 = 700
class_level_8 = 800
class_level_9 = 1000
class_level_10 = 1000
class_level_11 = 1000
class_level_12 = 1000
class_level_13 = 1000
class_level_14 = 1000
class_level_15 = 1000
class_level_16 = 1000
class_level_17 = 1000
class_level_18 = 1000
class_level_19 = 1000
class_level_20 = 1000
class_level_21 = 1000
class_level_22 = 1000
class_level_23 = 1000
class_level_24 = 1000
class_level_25 = 1000
class_level_26 = 1000
class_level_27 = 1000
class_level_28 = 1000
class_level_29 = 1000
class_level_30 = 1000
class_level_31 = 1000
class_level_32 = 1000
class_level_33 = 1000
class_level_34 = 1000
class_level_35 = 1000
class_level_36 = 1000
class_level_37 = 1000
class_level_38 = 1000
class_level_39 = 1000
class_level_40 = 1000
class_level_41 = 1000
class_level_42 = 1000
class_level_43 = 1000
class_level_44 = 1000
class_level_45 = 1000
class_level_46 = 1000
class_level_47 = 1000
class_level_48 = 1000
class_level_49 = 1000
class_level_50 = 1000
class_level_51 = 1000
class_level_52 = 1000
class_level_53 = 1000
class_level_54 = 1000
class_level_55 = 1000
class_level_56 = 1000
class_level_57 = 1000
class_level_58 = 1000
class_level_59 = 1000
class_level_60 = 1000
character_level/1 = 2
character_level/2 = 3
character_level/3 = 4
character_level/4 = 5
character_level/5 = 6
character_level/6 = 7
character_level/7 = 8
character_level/8 = 9
character_level/9 = 1
character_level/10 = null
class_level/1 = 1
class_level/2 = 1
class_level/3 = 1
class_level/4 = 1
class_level/5 = 500
class_level/6 = 600
class_level/7 = 700
class_level/8 = 800
class_level/9 = 1000
class_level/10 = 1000
class_level/11 = 1000
class_level/12 = 1000
class_level/13 = 1000
class_level/14 = 1000
class_level/15 = 1000
class_level/16 = 1000
class_level/17 = 1000
class_level/18 = 1000
class_level/19 = 1000
class_level/20 = 1000
class_level/21 = 1000
class_level/22 = 1000
class_level/23 = 1000
class_level/24 = 1000
class_level/25 = 1000
class_level/26 = 1000
class_level/27 = 1000
class_level/28 = 1000
class_level/29 = 1000
class_level/30 = 1000
class_level/31 = 1000
class_level/32 = 1000
class_level/33 = 1000
class_level/34 = 1000
class_level/35 = 1000
class_level/36 = 1000
class_level/37 = 1000
class_level/38 = 1000
class_level/39 = 1000
class_level/40 = 1000
class_level/41 = 1000
class_level/42 = 1000
class_level/43 = 1000
class_level/44 = 1000
class_level/45 = 1000
class_level/46 = 1000
class_level/47 = 1000
class_level/48 = 1000
class_level/49 = 1000
class_level/50 = 1000
class_level/51 = 1000
class_level/52 = 1000
class_level/53 = 1000
class_level/54 = 1000
class_level/55 = 1000
class_level/56 = 1000
class_level/57 = 1000
class_level/58 = 1000
class_level/59 = 1000
class_level/60 = null

4
game/modules/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="VoxelmanLibraryMerger" load_steps=8 format=2]
[gd_resource type="VoxelmanLibraryMerger" load_steps=9 format=2]
[ext_resource path="res://modules/planets/test_planet/voxel_library/surfaces/2_test.tres" type="VoxelSurfaceMerger" id=1]
[ext_resource path="res://modules/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2]
@ -7,8 +7,10 @@
[ext_resource path="res://modules/planets/test_planet/voxel_library/surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5]
[ext_resource path="res://modules/core/materials/5_standard_material_nouv2.tres" type="Material" id=6]
[ext_resource path="res://modules/core/materials/7_standard_material_notex.tres" type="Material" id=7]
[ext_resource path="res://modules/core/materials/10_standard_vman_mdr_material.tres" type="Material" id=8]
[resource]
materials = [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ) ]
prop_materials = [ ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ) ]
texture_flags = 1
voxel_surfaces = [ ExtResource( 3 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 2 ) ]

1
game/modules/species/Human/Female/character_models/huf_finger.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_finger.gltf-fc6a4109f05e60059f0a11b7ba33b0ea.res
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_fingers.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_fingers.gltf-db10298fea679155f38e09be0e9528ba.re
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_foot_left.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_foot_left.gltf-f05ae177d93fd866b85bdc979f084a3e.
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_forearm.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_forearm.gltf-8b78258ea9daca7cc382c76da07171af.re
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_hand.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_hand.gltf-fcf6ee970e736831a55e77cbf1e6bfcd.res"
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_handl.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_handl.gltf-9e3cf6d88e445ef9c1ccd02373d98266.res"
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_head.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_head.gltf-f0b5ec17eb5bf5da6946f16df53024b2.res"
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_neck.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_neck.gltf-d56952b61ff8a42dece5b949ad0f9a7f.res"
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_pelvis.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_pelvis.gltf-baa4b0d9142b08da9d67512c62b46f55.res
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_spine.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_spine.gltf-1872146be20593ed8d52842436b52a43.res"
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_spine1.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_spine1.gltf-84f91ea882551fffc99bde3501e66a5e.res
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_spine2.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_spine2.gltf-c26b5ef93a0effb389f435f55f147f23.res
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_thigh_left.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_thigh_left.gltf-f967ea8aff882be703adaf054058d4f8
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_thigh_right.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_thigh_right.gltf-9b46efec2793396d125292492f104d4
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

1
game/modules/species/Human/Female/character_models/huf_upperarm.gltf.import
View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/huf_upperarm.gltf-49cf57be440edffb44c0bea754dd6de2.r
[params]
collider_type=0
offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 )
scale=Vector3( 0.011, 0.011, 0.011 )

17
game/modules/species/Human/Female/character_textures/armor_green_scarfv2.png.import
View File

@ -2,26 +2,29 @@
importer="texture"
type="StreamTexture"
path="res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.stex"
path.s3tc="res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.s3tc.stex"
path.etc2="res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.etc2.stex"
path.etc="res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.etc.stex"
metadata={
"vram_texture": false
"imported_formats": [ "s3tc", "etc2", "etc" ],
"vram_texture": true
}
[deps]
source_file="res://modules/species/Human/Female/character_textures/armor_green_scarfv2.png"
dest_files=[ "res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.stex" ]
dest_files=[ "res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.s3tc.stex", "res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.etc2.stex", "res://.import/armor_green_scarfv2.png-c8b630b7e909d6ec74663005e37e16c6.etc.stex" ]
[params]
compress/mode=0
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/repeat=true
flags/filter=true
flags/mipmaps=false
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
@ -30,5 +33,5 @@ process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
detect_3d=false
svg/scale=1.0

4
game/scenes/World.tscn
View File

@ -55,6 +55,9 @@ glow_hdr_luminance_cap = 1.0
[node name="World" type="VoxelWorldDefault" groups=[
"save",
]]
chunk_size_x = 8
chunk_size_y = 8
chunk_size_z = 8
data_margin_end = 2
max_concurrent_generations = 8
max_frame_chunk_build_steps = 4
@ -62,6 +65,7 @@ library = ExtResource( 2 )
level_generator = SubResource( 1 )
voxel_scale = 3.0
build_flags = 511
lod_update_interval = 2.0
script = ExtResource( 8 )
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]

68
game/voxelman/world/TVVoxelChunk.gd
View File

@ -33,7 +33,21 @@ var _entities_spawned : bool
var _prop_mesh_instance_rid : RID
var _prop_mesh_rid : RID
#func _init():
# add_mesh_data_resource(get_transform().scaled(Vector3(10, 10, 10)), ResourceLoader.load("res://modules/species/Human/Female/character_models/huf_calf_left.gltf"))
# add_mesh_data_resource(get_transform().translated(Vector3(0, 4, 0)), ResourceLoader.load("res://modules/species/Human/Female/character_models/huf_calf_left.gltf"))
func _create_meshers():
prop_mesher = TVVoxelMesher.new()
prop_mesher.base_light_value = 0.45
prop_mesher.ao_strength = 0.2
prop_mesher.uv_margin = Rect2(0.017, 0.017, 1 - 0.034, 1 - 0.034)
prop_mesher.lod_size = lod_size
prop_mesher.voxel_scale = voxel_scale
prop_mesher.build_flags = build_flags
prop_mesher.texture_scale = 3
var mesher : TVVoxelMesher = TVVoxelMesher.new()
mesher.base_light_value = 0.45
mesher.ao_strength = 0.2
@ -201,8 +215,7 @@ func build_phase_prop_mesh() -> void:
VisualServer.instance_geometry_set_material_override(_prop_mesh_instance_rid, _prop_material.get_rid())
for i in range(get_prop_mesher_count()):
get_prop_mesher(i).material = _prop_material
get_prop_mesher().material = _prop_material
for i in range(get_prop_count()):
var prop : VoxelChunkPropData = get_prop(i)
@ -225,20 +238,17 @@ func build_phase_prop_mesh() -> void:
if prop.mesh != null:
var t : Transform = get_prop_transform(prop, prop.snap_to_mesh, prop.snap_axis)
for j in range(get_prop_mesher_count()):
prop.prop.add_meshes_into(get_prop_mesher(j), _prop_texture_packer, t, get_voxel_world())
prop.prop.add_meshes_into(get_prop_mesher(), _prop_texture_packer, t, get_voxel_world())
if prop.prop != null:
var vmanpp : PropData = prop.prop as PropData
var t : Transform = get_prop_transform(prop, vmanpp.snap_to_mesh, vmanpp.snap_axis)
for j in range(get_prop_mesher_count()):
prop.prop.add_meshes_into(get_prop_mesher(j), _prop_texture_packer, t, get_voxel_world())
prop.prop.add_meshes_into(get_prop_mesher(), _prop_texture_packer, t, get_voxel_world())
for i in range(get_prop_mesher_count()):
get_prop_mesher(i).bake_colors(self)
get_prop_mesher(i).build_mesh_into(_prop_mesh_rid)
get_prop_mesher(i).material = null
get_prop_mesher().bake_colors(self)
get_prop_mesher().build_mesh_into(_prop_mesh_rid)
get_prop_mesher().material = null
if not _entities_spawned:
for i in range(get_prop_count()):
@ -282,27 +292,27 @@ func get_prop_mesh_transform(base_transform : Transform, snap_to_mesh: bool, sna
return base_transform
func _build_phase(phase):
if phase == VoxelChunkDefault.BUILD_PHASE_PROP_SETUP:
active_build_phase_type = VoxelChunkDefault.BUILD_PHASE_TYPE_PHYSICS_PROCESS
return
elif phase == VoxelChunkDefault.BUILD_PHASE_PROP_MESH:
next_phase()
return
._build_phase(phase)
#func _build_phase(phase):
# if phase == VoxelChunkDefault.BUILD_PHASE_COLLIDER:
# active_build_phase_type = VoxelChunkDefault.BUILD_PHASE_TYPE_PHYSICS_PROCESS
# return
# elif phase == VoxelChunkDefault.BUILD_PHASE_PROP_MESH:
# next_phase()
# return
#
# ._build_phase(phase)
func _build_phase_physics_process(phase):
if phase == VoxelChunkDefault.BUILD_PHASE_PROP_SETUP:
# add_prop(ResourceLoader.load("res://prop_tool/ToolTes2at.tres"))
build_phase_prop_mesh()
active_build_phase_type = VoxelChunkDefault.BUILD_PHASE_TYPE_NORMAL
next_phase()
return
._build_phase_physics_process(phase)
#func _build_phase_physics_process(phase):
# if phase == VoxelChunkDefault.BUILD_PHASE_PROP_SETUP:
## add_prop(ResourceLoader.load("res://prop_tool/ToolTes2at.tres"))
# build_phase_prop_mesh()
# active_build_phase_type = VoxelChunkDefault.BUILD_PHASE_TYPE_NORMAL
# next_phase()
# return
#
# ._build_phase_physics_process(phase)
#
func build_phase_lights() -> void:
var vl : VoxelLight = VoxelLight.new()