Relintai/broken_seals_2d
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals_2d.git synced 2025-04-24 11:33:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated everything except the UI.

Browse Source
This commit is contained in:
Relintai 2021-02-21 16:45:04 +01:00
parent 76dc05ae2a
commit 4424f32e75
30 changed files with 326 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/modules/core/game_module.tres
View File

@ -5,4 +5,5 @@
[resource]
script = ExtResource( 1 )
enabled = true
resource_db = ExtResource( 2 )

4
game/modules/entity_classes/naturalist/1_naturalist.tres
View File

@ -1,10 +1,11 @@
[gd_resource type="EntityClassData" load_steps=25 format=2]
[gd_resource type="EntityClassData" load_steps=26 format=2]
[ext_resource path="res://modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2]
[ext_resource path="res://modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=3]
[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=4]
[ext_resource path="res://modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5]
[ext_resource path="res://modules/entity_classes/naturalist/stats/player_statdata.tres" type="StatData" id=6]
[ext_resource path="res://modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=7]
[ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=9]
[ext_resource path="res://modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=10]
@ -33,6 +34,7 @@ id = 1
resource_name = "Naturalist"
id = 1
text_name = "Naturalist"
stat_data = ExtResource( 6 )
entity_resources = [ ExtResource( 4 ) ]
specs = [ SubResource( 2 ) ]
spells = [ ExtResource( 7 ), ExtResource( 3 ), ExtResource( 15 ), ExtResource( 5 ), ExtResource( 12 ), ExtResource( 23 ), ExtResource( 1 ), ExtResource( 10 ), ExtResource( 24 ), ExtResource( 2 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 17 ), ExtResource( 20 ), ExtResource( 11 ), ExtResource( 22 ), ExtResource( 16 ), ExtResource( 21 ), ExtResource( 14 ) ]

5
game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres
View File

@ -13,9 +13,4 @@ aura_type = 1
text_name = "Nature's Swiftness"
text_description = "Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown."
visual_spell_effects = ExtResource( 2 )
attribute_count = 1
StatModAttribute_0/stat = 1
StatModAttribute_0/base_mod = 0.0
StatModAttribute_0/bonus_mod = 0.0
StatModAttribute_0/percent_mod = 60.0
script = ExtResource( 1 )

27
game/modules/entity_classes/naturalist/entities/1_naturalist.tres
View File

@ -1,40 +1,15 @@
[gd_resource type="EntityData" load_steps=8 format=2]
[gd_resource type="EntityData" load_steps=4 format=2]
[ext_resource path="res://modules/core/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=1]
[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2]
[ext_resource path="res://modules/species/species_human.tres" type="EntitySpeciesData" id=3]
[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4]
[ext_resource path="res://modules/core/crafting/1_test_craft.tres" type="CraftRecipe" id=5]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 4
strength = 3
stamina = 6
intellect = 5
spirit = 3
[sub_resource type="StatData" id=2]
level_stat_data = SubResource( 1 )
stat/agility = 23.0
stat/strength = 14.0
stat/stamina = 23.0
stat/intellect = 19.0
stat/spirit = 3.0
stat/health = 100.0
stat/mana = 100.0
stat/speed = 20.0
stat/global_cooldown = 1.5
[resource]
resource_name = "Naturalist"
id = 1
entity_type = 4
entity_controller = 1
is_playable = true
text_name = "Naturalist"
bag_size = 24
stat_data = SubResource( 2 )
entity_species_data = ExtResource( 3 )
entity_class_data = ExtResource( 2 )
craft_recipes = [ ExtResource( 5 ), ExtResource( 1 ) ]
script = ExtResource( 4 )

19
game/modules/entity_classes/naturalist/stats/mob_statdata.tres Normal file
View File

@ -0,0 +1,19 @@
[gd_resource type="StatData" load_steps=2 format=2]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 3
strength = 2
stamina = 3
intellect = 4
spirit = 5
[resource]
level_stat_data = SubResource( 1 )
stat/agility = 14.0
stat/strength = 15.0
stat/stamina = 13.0
stat/intellect = 13.0
stat/spirit = 10.0
stat/health = 20.0
stat/mana = 20.0
stat/global_cooldown = 1.5

19
game/modules/entity_classes/naturalist/stats/player_statdata.tres Normal file
View File

@ -0,0 +1,19 @@
[gd_resource type="StatData" load_steps=2 format=2]
[sub_resource type="SimpleLevelStatData" id=1]
agility = 4
strength = 3
stamina = 6
intellect = 5
spirit = 3
[resource]
level_stat_data = SubResource( 1 )
stat/agility = 23.0
stat/strength = 14.0
stat/stamina = 23.0
stat/intellect = 19.0
stat/spirit = 3.0
stat/health = 100.0
stat/mana = 100.0
stat/global_cooldown = 1.5

398
game/player/DisplayEntity.gd
View File

@ -1,398 +0,0 @@
extends Entity
# Copyright Péter Magyar relintai@gmail.com
# MIT License, functionality from this class needs to be protable to the entity spell system
# Copyright (c) 2019 Péter Magyar
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
export (float) var MOUSE_SENSITIVITY : float = 0.05
export (String) var map_path : String
const ray_length = 1000
const ACCEL : float = 100.0
const DEACCEL : float = 100.0
const GRAVITY : float = -24.8
const JUMP_SPEED : float = 3.8
const MAX_SLOPE_ANGLE : float = 40.0
const MOUSE_TARGET_MAX_OFFSET : int = 10
var _on : bool = true
var y_rot : float = 0.0
var vel : Vector3 = Vector3()
var dir : Vector3 = Vector3()
var input_dir : Vector2 = Vector2()
var mouse_dir : Vector2 = Vector2()
var mouse_move_dir : Vector2 = Vector2()
var mouse_left_down : bool = false
var mouse_right_down : bool = false
var touchpad_dir : Vector2 = Vector2()
var mouse_down_delta : Vector2 = Vector2()
var queued_camera_rotaions : Vector2 = Vector2()
var key_left : bool = false
var key_right : bool = false
var key_up : bool = false
var key_down : bool = false
var cursor_grabbed : bool = false
var last_cursor_pos : Vector2 = Vector2()
var mouse_down_pos : Vector2 = Vector2()
var total_down_mouse_delta : Vector2 = Vector2()
var camera : Camera
var camera_pivot : Spatial
var animation_tree : AnimationTree
var anim_node_state_machine : AnimationNodeStateMachinePlayback = null
var animation_run : bool = false
var moving : bool = false
var casting_anim : bool = false
var last_mouse_over : Entity = null
func _ready() -> void:
camera = $CameraPivot/Camera as Camera
camera_pivot = $CameraPivot as Spatial
animation_tree = get_character_skeleton().get_animation_tree()
if animation_tree != null:
anim_node_state_machine = animation_tree["parameters/playback"]
set_process(true)
func _physics_process(delta : float) -> void:
if not _on:
return
process_input(delta)
process_movement(delta)
func process_input(delta: float) -> void:
var key_dir : Vector2 = Vector2()
if key_up:
key_dir.y += 1
if key_down:
key_dir.y -= 1
if key_left:
key_dir.x += 1
if key_right:
key_dir.x -= 1
input_dir = key_dir + mouse_dir + touchpad_dir + mouse_move_dir
var state : int = getc_state()
if state & EntityEnums.ENTITY_STATE_TYPE_FLAG_ROOT != 0 or state & EntityEnums.ENTITY_STATE_TYPE_FLAG_STUN != 0:
input_dir = Vector2()
return
var input_length : float = input_dir.length_squared()
if input_length > 0.1:
if anim_node_state_machine != null and not animation_run:
anim_node_state_machine.travel("run-loop")
animation_run = true
input_dir = input_dir.normalized()
animation_tree["parameters/run-loop/blend_position"] = input_dir
else:
if anim_node_state_machine != null and animation_run:
anim_node_state_machine.travel("idle-loop")
animation_run = false
if queued_camera_rotaions.length_squared() > 1:
camera_pivot.rotate_delta(queued_camera_rotaions.x * 2.0, -queued_camera_rotaions.y)
queued_camera_rotaions = Vector2()
func process_movement(delta : float) -> void:
var state : int = getc_state()
if state & EntityEnums.ENTITY_STATE_TYPE_FLAG_ROOT != 0 or state & EntityEnums.ENTITY_STATE_TYPE_FLAG_STUN != 0:
moving = false
return
if input_dir.x > 0.1 or input_dir.y > 0.1 or input_dir.x < -0.1 or input_dir.y < -0.1:
var forward : Vector3 = Vector3(0, 0, 1).rotated(Vector3(0, 1, 0), deg2rad(y_rot))
var right : Vector3 = forward.cross(Vector3(0, 1, 0)) * -input_dir.x
forward *= input_dir.y #only potentially make it zero after getting the right vector
dir = forward
dir += right
if dir.length_squared() > 0.1:
dir = dir.normalized()
moving = true
moved()
else:
dir = Vector3()
moving = false
vel.y += delta * GRAVITY
var hvel : Vector3 = vel
hvel.y = 0
var target : Vector3 = dir
target *= get_speed().ccurrent
var accel
if dir.dot(hvel) > 0:
accel = ACCEL
else:
accel = DEACCEL
hvel = hvel.linear_interpolate(target, accel * delta) as Vector3
vel.x = hvel.x
vel.z = hvel.z
# vel = move_and_slide(vel, Vector3(0,1,0), false, 4, deg2rad(MAX_SLOPE_ANGLE))
if get_tree().network_peer:
if get_tree().is_network_server():
rset_position(get_body().position, get_body().rotation)
else:
rpc("set_position", get_body().position, get_body().rotation)
func _input(event: InputEvent) -> void:
if not cursor_grabbed:
set_process_input(false)
return
if event is InputEventMouseMotion and event.device != -1:
var s : float = ProjectSettings.get("display/mouse_cursor/sensitivity")
var relx : float = event.relative.x * s
var rely : float = event.relative.y * s
mouse_down_delta.x += relx
mouse_down_delta.y += rely
total_down_mouse_delta.x += relx
total_down_mouse_delta.y += rely
get_tree().set_input_as_handled()
func _unhandled_input(event: InputEvent) -> void:
if event is InputEventKey:
var ievkey : InputEventKey = event as InputEventKey
if ievkey.scancode == KEY_W:
key_up = ievkey.pressed
if ievkey.scancode == KEY_S:
key_down = ievkey.pressed
if ievkey.scancode == KEY_A:
key_left = ievkey.pressed
if ievkey.scancode == KEY_D:
key_right = ievkey.pressed
if event is InputEventMouseMotion and not (mouse_right_down or mouse_left_down) and event.device != -1:
cmouseover(event)
if event is InputEventMouseButton:
if event.button_index == BUTTON_LEFT and event.device != -1:
mouse_left_down = event.pressed
if mouse_left_down:
mouse_down_delta = Vector2()
mouse_down_pos = event.position
if event.button_index == BUTTON_RIGHT and event.device != -1:
mouse_right_down = event.pressed
if mouse_left_down and mouse_right_down:
mouse_move_dir.y = 1
else:
mouse_move_dir.y = 0
if event.is_pressed() and event.device != -1:
if event.button_index == BUTTON_WHEEL_UP:
camera_pivot.camera_distance_set_delta(-0.2)
if event.button_index == BUTTON_WHEEL_DOWN:
camera_pivot.camera_distance_set_delta(0.2)
if not event.pressed and event.button_index == BUTTON_LEFT and event.device != -1:
if mouse_down_delta.length() < MOUSE_TARGET_MAX_OFFSET:
target(event.position)
if event is InputEventScreenTouch and event.pressed:
target(event.position)
update_cursor_mode()
func update_cursor_mode():
if mouse_left_down or mouse_right_down:
if not cursor_grabbed:
set_process_input(true)
total_down_mouse_delta = Vector2()
cursor_grabbed = true
last_cursor_pos = get_viewport().get_mouse_position()
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
else:
if cursor_grabbed:
set_process_input(false)
cursor_grabbed = false
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
get_viewport().warp_mouse(last_cursor_pos)
if total_down_mouse_delta.length_squared() < 8:
target(last_cursor_pos)
func target(position : Vector2):
var from = camera.project_ray_origin(position)
var to = from + camera.project_ray_normal(position) * ray_length
var space_state = get_body().get_world_2d().direct_space_state
var result = space_state.intersect_ray(from, to, [], 2)
if result:
print(result)
if result.collider and result.collider is Entity:
var ent : Entity = result.collider as Entity
crequest_target_change(ent.get_path())
return
crequest_target_change(NodePath())
else:
crequest_target_change(NodePath())
func cmouseover(event):
var from = camera.project_ray_origin(event.position)
var to = from + camera.project_ray_normal(event.position) * ray_length
var space_state = get_body().get_world_2d().direct_space_state
var result = space_state.intersect_ray(from, to, [], 2)
if result:
if result.collider and result.collider is Entity:
var mo : Entity = result.collider as Entity
if last_mouse_over != null and last_mouse_over != mo:
if is_instance_valid(last_mouse_over):
last_mouse_over.onc_mouse_exit()
last_mouse_over = null
if last_mouse_over == null:
mo.onc_mouse_enter()
last_mouse_over = mo
return
if last_mouse_over != null:
last_mouse_over.onc_mouse_exit()
last_mouse_over = null
func analog_force_change(vector, touchpad):
if touchpad.padname == "TouchPad":
touchpad_dir = vector
touchpad_dir.x *= -1
elif touchpad.padname == "TargetPad":
#try to target
return
func queue_camera_rotation(rot : Vector2) -> void:
queued_camera_rotaions += rot
remote func rset_position(pposition : Vector2, protation : float) -> void:
if get_tree().is_network_server():
rpc("set_position", pposition, protation)
func _moved() -> void:
if sis_casting():
sfail_cast()
func _con_target_changed(entity: Node, old_target: Node) -> void:
if is_instance_valid(old_target):
old_target.onc_untargeted()
if is_instance_valid(ctarget):
ctarget.onc_targeted()
if canc_interact():
crequest_interact()
func _con_cast_started(info):
if anim_node_state_machine != null and not casting_anim:
anim_node_state_machine.travel("casting-loop")
casting_anim = true
animation_run = false
func _con_cast_failed(info):
if anim_node_state_machine != null and casting_anim:
anim_node_state_machine.travel("idle-loop")
casting_anim = false
if animation_run:
anim_node_state_machine.travel("run-loop")
func _con_cast_finished(info):
if anim_node_state_machine != null:
anim_node_state_machine.travel("cast-end")
casting_anim = false
if animation_run:
anim_node_state_machine.travel("run-loop")
func _con_spell_cast_success(info):
if anim_node_state_machine != null:
anim_node_state_machine.travel("cast-end")
casting_anim = false
if animation_run:
anim_node_state_machine.travel("run-loop")
func _son_level_up(level: int) -> void:
if sentity_data == null:
return
var ecd : EntityClassData = sentity_data.entity_class_data
if ecd == null:
return
sfree_spell_points += ecd.spell_points_per_level * level
sfree_talent_points += level
for i in range(Stat.MAIN_STAT_ID_COUNT):
var st : int = sentity_data.entity_class_data.get_stat_data().get_level_stat_data().get_stat_diff(i, slevel - level, slevel)
var statid : int = i + Stat.MAIN_STAT_ID_START
var stat : Stat = get_stat_int(statid)
var sm : StatModifier = stat.get_modifier(0)
sm.base_mod += st

4
game/player/Mob.gd
View File

@ -54,6 +54,10 @@ func _notification_cmouse_enter() -> void:
Input.set_default_cursor_shape(Input.CURSOR_CROSS)
elif centity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_NONE:
Input.set_default_cursor_shape(Input.CURSOR_ARROW)
elif centity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_TRAIN:
Input.set_default_cursor_shape(Input.CURSOR_HELP)
elif centity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_VENDOR:
Input.set_default_cursor_shape(Input.CURSOR_HELP)
else:
Input.set_default_cursor_shape(Input.CURSOR_MOVE)

11
game/player/NetworkedPlayer.tscn
View File

@ -1,15 +1,20 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://player/NetworkedPlayer.gd" type="Script" id=1]
[ext_resource path="res://ui/nameplates/NamePlate.tscn" type="PackedScene" id=2]
[ext_resource path="res://characters/Character.tscn" type="PackedScene" id=3]
[sub_resource type="CircleShape2D" id=1]
[sub_resource type="EntityResourceHealth" id=1]
[sub_resource type="EntityResourceSpeed" id=2]
[sub_resource type="CircleShape2D" id=3]
radius = 20.0
[node name="NetworkedPlayer" type="Entity"]
body_path = NodePath("KinematicBody2D")
character_skeleton_path = NodePath("KinematicBody2D/Character")
sresources = [ SubResource( 1 ), SubResource( 2 ) ]
script = ExtResource( 1 )
[node name="NamePlate" parent="." instance=ExtResource( 2 )]
@ -17,6 +22,6 @@ script = ExtResource( 1 )
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
shape = SubResource( 3 )
[node name="Character" parent="KinematicBody2D" instance=ExtResource( 3 )]

8
game/player/bs_entity_spawner.gd
View File

@ -75,7 +75,7 @@ remote func creceive_spawn_for(data: String, global_name : String, position: Vec
remote func creceive_despawn_for(path : NodePath) -> void:
# print("recdespawnfor " + path)
var ent = get_scene_tree().root.get_node_or_null(path)
var ent = get_tree().root.get_node_or_null(path)
if ent:
ent.queue_free()
@ -83,7 +83,7 @@ remote func creceive_despawn_for(path : NodePath) -> void:
puppet func spawn_owned_player(data : String, position : Vector3) -> Entity:
var createinfo : EntityCreateInfo = EntityCreateInfo.new()
createinfo.guid = get_scene_tree().multiplayer.get_network_unique_id()
createinfo.guid = get_tree().multiplayer.get_network_unique_id()
# createinfo.player_name = ""
createinfo.entity_controller = EntityEnums.ENITIY_CONTROLLER_PLAYER
createinfo.entity_player_type = EntityEnums.ENTITY_PLAYER_TYPE_PLAYER
@ -259,14 +259,14 @@ func _request_entity_spawn(createinfo : EntityCreateInfo):
if (createinfo.parent_path == ""):
if _spawn_parent == null:
_spawn_parent = get_scene_tree().root.get_node(spawn_parent_path)
_spawn_parent = get_tree().root.get_node(spawn_parent_path)
if _spawn_parent.current_scene != null:
var spawn_parent = _spawn_parent.current_scene
spawn_parent.add_child(entity_node)
else:
get_scene_tree().root.get_node(createinfo.parent_path).add_child(entity_node)
get_tree().root.get_node(createinfo.parent_path).add_child(entity_node)
entity_node.setup(createinfo)

10
game/player/bs_entity_spawner.tres
View File

@ -1,10 +0,0 @@
[gd_resource type="ESSEntitySpawner" load_steps=3 format=2]
[ext_resource path="res://player/bs_entity_spawner.gd" type="Script" id=1]
[ext_resource path="res://player/DisplayPlayer.tscn" type="PackedScene" id=4]
[resource]
script = ExtResource( 1 )
player_display_scene = ExtResource( 4 )
spawn_parent_path = "/root/Main"
default_level_override = 0

8
game/player/bs_entity_spawner.tscn Normal file
View File

@ -0,0 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://player/bs_entity_spawner.gd" type="Script" id=1]
[ext_resource path="res://player/DisplayPlayer.tscn" type="PackedScene" id=2]
[node name="ESSEntitySpawner" type="ESSEntitySpawner"]
script = ExtResource( 1 )
player_display_scene = ExtResource( 2 )

18
game/project.godot
View File

@ -283,6 +283,16 @@ _global_script_classes=[ {
"class": "SpellGD",
"language": "GDScript",
"path": "res://scripts/spells/gd_spell_script.gd"
}, {
"base": "GameModule",
"class": "UIGuiChildModule",
"language": "GDScript",
"path": "res://scripts/game_modules/ui_gui_child_module.gd"
}, {
"base": "GameModule",
"class": "UIWindowModule",
"language": "GDScript",
"path": "res://scripts/game_modules/ui_window_module.gd"
} ]
_global_script_class_icons={
"AuraGD": "",
@ -339,7 +349,9 @@ _global_script_class_icons={
"PlayerMaster": "",
"SpeedResource": "",
"SpellEffectVisualBasic": "",
"SpellGD": ""
"SpellGD": "",
"UIGuiChildModule": "",
"UIWindowModule": ""
}
Node="input/actionbar_5_11"
@ -359,6 +371,8 @@ WorldNumbers="*res://ui/world_numbers_2d/WorldNumbers.tscn"
CursorManager="*res://cursors/autoload/CursorManager.tscn"
Settings="*res://ui/autoload/SettingsManager.tscn"
Logger="*res://autoload/Logger.tscn"
DataManager="*res://scripts/game_modules/DataManager.tscn"
EntitySpawner="*res://player/bs_entity_spawner.tscn"
[debug]
@ -380,13 +394,13 @@ window/size/viewport_scale=100
[ess]
data/ess_resource_db_path="res://data/resource_db.tres"
data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres"
enums/stats="Agility,Strength,Stamina,Intellect,Spirit,Health,Mana,Speed,Global Cooldown,Haste,Haste Rating,Resilience,Armor,Attack Power,Spell Power,Melee Crit,Melee Crit bonus,Spell Crit,Spell Crit Bonus,Block,Parry,Damage Reduction,Melee Damage Reduction,Spell Damage Reduction,Damage Taken,Heal Taken,Melee Damage,Spell Damage,Holy Resist,Shadow Resist,Nature Resist,Fire Resist,Frost Resist,Lightning Resist,Chaos Resist,Silence Resist,Fear Resist,Stun Resist,Energy,Rage,XP Rate"
enums/skeletons_bones=PoolStringArray( "", "root,pelvis,spine,spine_1,spine_2,neck,head,left_clavicle,left_upper_arm,left_forearm,left_hand,left_thumb_base,left_thumb_end,left_fingers_base,left_fingers_end,right_clavicle,right_upper_arm,right_forearm,right_hand,right_thumb_base,right_thumb_end,right_fingers_base,right_fingers_end,left_thigh,left_calf,left_foot,right_thigh,right_calf,right_foot" )
enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2,weapon_left,weapon_right,weapon_left_back,weapon_right_back,weapon_shield_left" )
xp/class_xps=PoolIntArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
xp/character_xps=PoolIntArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
profiles/automatic_save=true
data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres"
level/max_character_level=60
level/max_class_level=60

57
game/scenes/MainScene.gd
View File

@ -36,63 +36,11 @@ var _loading_screen : Node
var current_scene : Node
var current_character_file_name : String = ""
var _modules : Array
func _ready() -> void:
_loading_screen = get_node(loading_screen_path)
ProfileManager.load()
ESS.load_entity_spawner()
# ESS.resource_db = ESSResourceDBMap.new()
ESS.resource_db = ESSResourceDBStatic.new()
ESS.resource_db.remap_ids = true
# ESS.load_all()
initialize_modules()
switch_scene(start_scene)
func initialize_modules() -> void:
_modules.clear()
load_modules_at("res://")
_modules.sort_custom(ModulePathSorter, "sort_ascending")
for module in _modules:
if module.has_method("load_module"):
module.load_module()
func load_modules_at(path : String) -> void:
var dir = Directory.new()
if dir.open(path) == OK:
dir.list_dir_begin()
var file_name = dir.get_next()
while file_name != "":
if file_name == "." or file_name == "..":
file_name = dir.get_next()
continue
if dir.current_is_dir():
if path == "res://":
load_modules_at(path + file_name)
else:
load_modules_at(path + "/" + file_name)
else:
if file_name == "game_module.tres":
var res : Resource = null
if path == "res://":
res = ResourceLoader.load(path + file_name)
else:
res = ResourceLoader.load(path + "/" + file_name)
_modules.append(res)
file_name = dir.get_next()
else:
print("An error occurred when trying to access the path: " + path)
func switch_scene(scene : int) -> void:
if current_scene != null:
for s in get_tree().get_nodes_in_group("save"):
@ -160,8 +108,3 @@ func show_loading_screen() -> void:
func hide_loading_screen() -> void:
_loading_screen.hide()
class ModulePathSorter:
static func sort_ascending(a, b):
if a.resource_path < b.resource_path:
return true
return false

8
game/scripts/ai/EntityAIGD.gd
View File

@ -35,6 +35,8 @@ func _ready():
func _on_set_owner():
if not is_instance_valid(owner):
return
#owner.connect("starget_changed", self, "starget_changed")
if not owner.sentity_data:
return
@ -132,3 +134,9 @@ func sort_spells_by_rank(a, b):
return true
return a["rank"] > b["rank"]
func starget_changed(entity: Entity, old_target: Entity):
if entity:
owner.ai_state = EntityEnums.AI_STATE_ATTACK
else:
owner.ai_state = EntityEnums.AI_STATE_OFF

9
game/scripts/auras/CastTimeReductionAura.gd Normal file
View File

@ -0,0 +1,9 @@
extends Aura
export(String) var spell_name : String
export(float) var reduction_value : float
func _notification_ccast(what : int, data : AuraData, info: SpellCastInfo):
if SpellEnums.NOTIFICATION_CAST_STARTED:
if info.spell.get_name() == spell_name:
info.cast_time -= reduction_value

26
game/scripts/auras/SpeedModAura.gd Normal file
View File

@ -0,0 +1,26 @@
extends "aura_script.gd"
export(bool) var does_stack : bool = true
export(float) var mod_speed : float = 0
func apply_mods(ad : AuraData):
#slows never stack
if mod_speed < 0:
ad.owner.gets_speed().add_non_stacking_mod(mod_speed)
return
if does_stack:
ad.owner.gets_speed().add_stacking_mod(mod_speed)
else:
ad.owner.gets_speed().add_non_stacking_mod(mod_speed)
func deapply_mods(ad : AuraData):
#slows never stack
if mod_speed < 0:
ad.owner.gets_speed().remove_non_stacking_mod(mod_speed)
return
if does_stack:
ad.owner.gets_speed().remove_stacking_mod(mod_speed)
else:
ad.owner.gets_speed().remove_non_stacking_mod(mod_speed)

14
game/scripts/auras/SpellDamageModAura.gd Normal file
View File

@ -0,0 +1,14 @@
extends "aura_script.gd"
export(String) var spell_name : String
export(float) var mod_value : float
func _sapply_passives_damage_deal(data : SpellDamageInfo):
var spell : Spell = data.spell_source_get()
if !spell:
return
if spell.get_name() == spell_name:
data.damage *= (100.0 + mod_value) / 100.0

53
game/scripts/auras/aura_script.gd
View File

@ -22,32 +22,6 @@ class_name AuraGD
# SOFTWARE.
func _handle_aura_damage(aura_data : AuraData, damage_info : SpellDamageInfo) -> void:
randomize()
if damage_info.dealer == null:
printerr("_handle_aura_damage: damage_info.dealer is null! ")
return
damage_info.damage = damage_min + (randi() % (damage_max - damage_min))
if scale_with_level:
damage_info.damage *= int(float(damage_info.dealer.scharacter_level) / float(EntityEnums.MAX_CHARACTER_LEVEL))
damage_info.damage_source_type = aura_data.aura.damage_type
if (is_instance_valid(damage_info.dealer)):
damage_info.dealer.sdeal_damage_to(damage_info)
func _handle_aura_heal(aura_data : AuraData, shi : SpellHealInfo) -> void:
randomize()
shi.heal = heal_min + (randi() % (heal_max - heal_min))
shi.damage *= shi.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL)
shi.heal_source_type = aura_data.aura.aura_type
shi.dealer.sdeal_heal_to(shi)
func _sapply(info : AuraApplyInfo) -> void:
# var add : bool = false
var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
@ -55,35 +29,46 @@ func _sapply(info : AuraApplyInfo) -> void:
if ad == null:
# add = true
ad = AuraData.new()
setup_aura_data(ad, info);
for i in range(stat_attribute_get_count()):
info.target.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
info.target.stat_mod(stat_attribute_get_stat(id), stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
if states_add != 0:
for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
var t : int = 1 << i
if states_add & t != 0:
info.target.adds_state_ref(i)
info.target.aura_adds(ad);
apply_mods(ad)
else:
ad.remaining_time = time
func _sdeapply(data : AuraData) -> void:
for i in range(stat_attribute_get_count()):
data.owner.stat_mod(id, stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
data.owner.stat_mod(stat_attribute_get_stat(id), -stat_attribute_get_base_mod(i), -stat_attribute_get_bonus_mod(i), -stat_attribute_get_percent_mod(i))
if states_add != 0:
for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
var t : int = 1 << i
if states_add & t != 0:
data.owner.removes_state_ref(i)
deapply_mods(data)
func apply_mods(ad : AuraData):
pass
func deapply_mods(ad : AuraData):
pass
func _con_aura_added(data : AuraData) -> void:
if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:

4
game/scripts/entities/EntityDataGD.gd
View File

@ -51,6 +51,10 @@ func _sinteract(entity: Entity) -> void:
entity.starget_bag = target.sbag
entity.ssend_open_window(EntityEnums.ENTITY_WINDOW_LOOT)
elif target.sentity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_TRAIN:
entity.ssend_open_window(EntityEnums.ENTITY_WINDOW_TRAINER)
elif target.sentity_interaction_type == EntityEnums.ENITIY_INTERACTION_TYPE_VENDOR:
entity.ssend_open_window(EntityEnums.ENTITY_WINDOW_VENDOR)
func _cans_interact(entity):
var target : Entity = entity.gets_target()

78
game/scripts/game_modules/DataManager.gd Normal file
View File

@ -0,0 +1,78 @@
extends Node
const PLAYER_UI_INSTANCE : int = 0
export(PackedScene) var player_ui : PackedScene
var _modules : Array
func _ready() -> void:
ProfileManager.load()
# ESS.resource_db = ESSResourceDBMap.new()
ESS.resource_db = ESSResourceDBStatic.new()
ESS.resource_db.remap_ids = true
# ESS.load_all()
initialize_modules()
func initialize_modules() -> void:
_modules.clear()
load_modules_at("res://")
_modules.sort_custom(ModulePathSorter, "sort_ascending")
for module in _modules:
if module.has_method("load_module"):
module.load_module()
func load_modules_at(path : String) -> void:
var dir = Directory.new()
if dir.open(path) == OK:
dir.list_dir_begin()
var file_name = dir.get_next()
while file_name != "":
if file_name == "." or file_name == "..":
file_name = dir.get_next()
continue
if dir.current_is_dir():
if path == "res://":
load_modules_at(path + file_name)
else:
load_modules_at(path + "/" + file_name)
else:
if file_name == "game_module.tres":
var res : Resource = null
if path == "res://":
res = ResourceLoader.load(path + file_name)
else:
res = ResourceLoader.load(path + "/" + file_name)
if res.enabled:
_modules.append(res)
file_name = dir.get_next()
else:
print("An error occurred when trying to access the path: " + path)
func request_instance(what : int) -> Node:
var inst : Node = null
if what == PLAYER_UI_INSTANCE:
inst = player_ui.instance()
inst.initialize()
for module in _modules:
# if module.has_method("on_request_instance"):
module.on_request_instance(what, inst)
return inst
class ModulePathSorter:
static func sort_ascending(a, b):
if a.resource_path < b.resource_path:
return true
return false

8
game/scripts/game_modules/DataManager.tscn Normal file
View File

@ -0,0 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://scripts/game_modules/DataManager.gd" type="Script" id=1]
[ext_resource path="res://ui/player_ui/player_ui.tscn" type="PackedScene" id=2]
[node name="DataManager" type="Node"]
script = ExtResource( 1 )
player_ui = ExtResource( 2 )

5
game/scripts/game_modules/GameModule.gd
View File

@ -1,6 +1,8 @@
extends Resource
class_name GameModule
export(bool) var enabled : bool = true
export(ESSResourceDB) var resource_db : ESSResourceDB
func load_module():
@ -18,3 +20,6 @@ func load_module():
# for s in r.get_spells():
# print(s.resource_name)
# print(s.get_id())
func on_request_instance(what : int, node : Node) -> void:
return

15
game/scripts/game_modules/ui_gui_child_module.gd Normal file
View File

@ -0,0 +1,15 @@
extends GameModule
class_name UIGuiChildModule
export(PackedScene) var scene : PackedScene
export(bool) var hide : bool = false
func on_request_instance(what : int, node : Node) -> void:
if what == DataManager.PLAYER_UI_INSTANCE:
var sc = scene.instance()
node.gui_base.add_child(sc)
if hide:
sc.hide()

22
game/scripts/game_modules/ui_window_module.gd Normal file
View File

@ -0,0 +1,22 @@
extends GameModule
class_name UIWindowModule
export(PackedScene) var scene : PackedScene
export(Texture) var opener_button_texture : Texture
export(int) var index : int = -1
export(bool) var add_button : bool = true
func on_request_instance(what : int, node : Node) -> void:
if what == DataManager.PLAYER_UI_INSTANCE:
var sc = scene.instance()
node.windows.add_child(sc)
if add_button:
var b = node.buttons.add_image_button(opener_button_texture, index)
b.connect("toggled", sc, "_on_button_toggled")
sc.opener_button = b
sc.hide()

7
game/scripts/networking/SpawnPoint.gd
View File

@ -41,7 +41,7 @@ var connect_button : Button
var naturalist_button : Button
var player : Entity
var terrarin : VoxelWorld
#var terrarin : VoxelWorld
var spawned : bool = false
@ -61,7 +61,7 @@ func _ready():
naturalist_button = get_node(naturalist_button_path)
naturalist_button.connect("pressed", self, "_on_client_naturalist_button_clicked")
terrarin = get_node(terrarin_path) as VoxelWorld
# terrarin = get_node(terrarin_path) as VoxelWorld
Server.connect("cplayer_master_created", self, "_cplayer_master_created")
@ -91,7 +91,8 @@ func spawn():
# ESS.entity_spawner.spawn_mob(1, 50, Vector3(76, 6, 54))
func set_terrarin_player():
terrarin.set_player(player.get_body() as Spatial)
pass
# terrarin.set_player(player.get_body() as Spatial)
func _on_host_button_clicked():
get_tree().connect("network_peer_connected", self, "_network_peer_connected")

12
game/scripts/spells/gd_spell_script.gd
View File

@ -21,6 +21,10 @@ class_name SpellGD
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
var gcd_id : int = 0
func _init():
gcd_id = ESS.stat_get_id("Global Cooldown")
func _cast_starts(info : SpellCastInfo) -> void:
if needs_target and info.target == null:
@ -154,7 +158,7 @@ func handle_effect(info : SpellCastInfo) -> void:
if damage_enabled and info.target:
var sdi : SpellDamageInfo = SpellDamageInfo.new()
sdi.damage_source = self
sdi.spell_source = self
sdi.dealer = info.caster
sdi.receiver = info.target
@ -163,7 +167,7 @@ func handle_effect(info : SpellCastInfo) -> void:
if heal_enabled and info.target:
var shi : SpellHealInfo = SpellHealInfo.new()
shi.heal_source = self
shi.spell_source = self
shi.dealer = info.caster
shi.receiver = info.target
@ -207,8 +211,8 @@ func handle_cooldown(info : SpellCastInfo) -> void:
info.caster.cooldown_adds(id, cooldown_cooldown)
func handle_gcd(info : SpellCastInfo) -> void:
if cooldown_global_cooldown_enabled and cast_cast_time < 0.01:
info.caster.gcd_starts(info.caster.get_gcd().scurrent)
if cooldown_global_cooldown_enabled and not cast_enabled:
info.caster.gcd_starts(info.caster.stat_gets_current(gcd_id))
func add_spell_cast_effect(info : SpellCastInfo) -> void:
var basic_spell_effect : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic

15
game/scripts/ui/AdaptiveTheme.gd
View File

@ -3,6 +3,9 @@ extends Theme
export(float) var content_margin_vertical_normal : float = 6
export(float) var content_margin_vertical_touch : float = 10
export(float) var content_margin_horizontal_normal : float = 5
export(float) var content_margin_horizontal_touch : float = 20
func _init():
Settings.connect("setting_changed", self, "setting_changed")
Settings.connect("settings_loaded", self, "settings_loaded")
@ -20,22 +23,28 @@ func settings_loaded():
func adapt(touchscreen_mode : bool) -> void:
var content_martgin_vert : float = 0
var content_margin_horiz : float = 0
if touchscreen_mode:
content_martgin_vert = content_margin_vertical_touch
content_margin_horiz = content_margin_horizontal_touch
else:
content_martgin_vert = content_margin_vertical_normal
content_margin_horiz = content_margin_horizontal_normal
for sbs in get_stylebox_list("Button"):
var sb : StyleBoxTexture = get_stylebox(sbs, "Button") as StyleBoxTexture
if sb == null:
continue
sb.margin_top = content_martgin_vert
sb.margin_bottom = content_martgin_vert
sb.content_margin_top = content_martgin_vert
sb.content_margin_bottom = content_martgin_vert
sb.content_margin_left = content_margin_horiz
sb.content_margin_right = content_margin_horiz

2
game/scripts/world_generators/MainPlanetGenerator.gd
View File

@ -60,7 +60,7 @@ func create_planet():
else:
ind = _force_planet
var planet_data : PlanetData = ResourceLoader.load(planet_files[ind], "PlanetData")
var planet_data : Planet = ResourceLoader.load(planet_files[ind], "PlanetData")
if planet_data == null:
print("planet_data is null!")

18
game/ui/theme/ui_theme.tres
View File

File diff suppressed because one or more lines are too long