From d3e68a365d389c775651f87c8521b8cc2dd1b822 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 14 Jul 2021 01:10:53 +0200 Subject: [PATCH] Fix up NatureCast. Duplicated the character into a new scene. --- game/characters/NaturalistSheetRenderer.tscn | 92 +++++++++++++++++++ .../elementalist/spells/31_overload.tres | 4 +- .../effect_data/aspect_of_scorpions.tres | 4 +- .../effect_data/natures_swiftness.tres | 2 +- .../spell_effects/nature/NatureCast.tscn | 3 - .../{nature => nature2d}/AOSCastFinish.tscn | 0 .../{nature => nature2d}/AmplifyPain.tscn | 0 .../spell_effects/nature2d/NatureCast.tscn | 26 ++++++ .../{nature => nature2d}/NautreSwiftness.tscn | 0 .../spells/14_amplify_pain_rank_1.tres | 4 +- .../naturalist/spells/35_strike.tres | 4 +- 11 files changed, 127 insertions(+), 12 deletions(-) create mode 100644 game/characters/NaturalistSheetRenderer.tscn delete mode 100644 game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn rename game/modules/entity_classes/naturalist/spell_effects/{nature => nature2d}/AOSCastFinish.tscn (100%) rename game/modules/entity_classes/naturalist/spell_effects/{nature => nature2d}/AmplifyPain.tscn (100%) create mode 100644 game/modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn rename game/modules/entity_classes/naturalist/spell_effects/{nature => nature2d}/NautreSwiftness.tscn (100%) diff --git a/game/characters/NaturalistSheetRenderer.tscn b/game/characters/NaturalistSheetRenderer.tscn new file mode 100644 index 0000000..adb0793 --- /dev/null +++ b/game/characters/NaturalistSheetRenderer.tscn @@ -0,0 +1,92 @@ +[gd_scene load_steps=10 format=2] + +[ext_resource path="res://scripts/item_visuals/CharacterAtlasEntry2D.gd" type="Script" id=1] +[ext_resource path="res://player/CharacterSkeleton2DGD.gd" type="Script" id=2] +[ext_resource path="res://scripts/item_visuals/CharacterAtlas2D.gd" type="Script" id=3] +[ext_resource path="res://characters/char_t1_outline_split.png" type="Texture" id=4] +[ext_resource path="res://characters/CharacterSideModel.tscn" type="PackedScene" id=5] +[ext_resource path="res://characters/CharacterFrontModel.tscn" type="PackedScene" id=6] + +[sub_resource type="CharacterAtlasEntry" id=1] +script = ExtResource( 1 ) +front_rect = Rect2( 101, 15, 9, 12 ) +back_rect = Rect2( 74, 18, 9, 12 ) +right_rect = Rect2( 8, 13, 9, 12 ) +left_rect = Rect2( 8, 13, 9, 12 ) + +[sub_resource type="CharacterAtlasEntry" id=2] +script = ExtResource( 1 ) +front_rect = Rect2( 102, 2, 7, 8 ) +back_rect = Rect2( 75, 5, 7, 8 ) +right_rect = Rect2( 9, 0, 7, 8 ) +left_rect = Rect2( 9, 0, 7, 8 ) + +[sub_resource type="CharacterAtlas" id=3] +script = ExtResource( 3 ) +comments = "HUMANOID_BONE_HIP = 0, +HUMANOID_BONE_TORSO = 1, +HUMANOID_BONE_LEG_R = 2, +HUMANOID_BONE_FOOT_R = 3, +HUMANOID_BONE_TOE_R = 4, +HUMANOID_BONE_LEG_L = 5, +HUMANOID_BONE_FOOT_L = 6, +HUMANOID_BONE_TOE_L = 7, +HUMANOID_BONE_ARM_R = 8, +#HUMANOID_BONE_SHOULDER_GUARD_R = 0, +HUMANOID_BONE_HAND_R = 9, +HUMANOID_BONE_FINGERS_R = 10, +HUMANOID_BONE_ARM_L = 11, +#HUMANOID_BONE_SHOULDER_GUARD_L = 0, +HUMANOID_BONE_HAND_L = 12, +HUMANOID_BONE_FINGERS_L = 13, +HUMANOID_BONE_HEAD = 14, +HUMANOID_BONE_HEAD_TOP = 15, +HUMANOID_BONES_MAX = 16," +texture = ExtResource( 4 ) +slots = [ null, SubResource( 1 ), null, null, null, null, null, null, null, null, null, null, null, null, SubResource( 2 ), null ] + +[node name="Character" type="CharacterSkeleton2D"] +entity_type = 1 +attach_point_paths/0_left_hand = NodePath("") +attach_point_paths/1_right_hand = NodePath("") +attach_point_paths/2_torso = NodePath("") +attach_point_paths/3_root = NodePath("") +attach_point_paths/4_right_hip = NodePath("") +attach_point_paths/5_left_hip = NodePath("") +attach_point_paths/6_spine_2 = NodePath("") +attach_point_paths/7_weapon_left = NodePath("") +attach_point_paths/8_weapon_right = NodePath("") +attach_point_paths/9_weapon_left_back = NodePath("") +attach_point_paths/10_weapon_right_back = NodePath("") +attach_point_paths/11_weapon_shield_left = NodePath("") +script = ExtResource( 2 ) +front_node_path = NodePath("CharacterFrontModel") +front_animation_player_path = NodePath("../Character/CharacterFrontModel/AnimationPlayer") +front_animation_tree_path = NodePath("../Character/CharacterFrontModel/AnimationTree") +side_node_path = NodePath("CharacterSideModel") +side_animation_player_path = NodePath("../Character/CharacterSideModel/AnimationPlayer") +side_animation_tree_path = NodePath("../Character/CharacterSideModel/AnimationTree") +character_atlas = SubResource( 3 ) + +[node name="CharacterFrontModel" parent="." instance=ExtResource( 6 )] +visible = false + +[node name="Torso" parent="CharacterFrontModel/Hip" index="1"] +position = Vector2( 0, -2.18636 ) + +[node name="leg_r" parent="CharacterFrontModel/Hip/Torso" index="0"] +position = Vector2( -2, 0.999999 ) + +[node name="CharacterSideModel" parent="." instance=ExtResource( 5 )] + +[node name="arm_r" parent="CharacterSideModel" index="0"] +position = Vector2( -3.50001, -24.3486 ) + +[node name="hand_r" parent="CharacterSideModel" index="1"] +position = Vector2( -3.50001, -18.8486 ) + +[node name="Torso" parent="CharacterSideModel/Hip" index="3"] +position = Vector2( 3.24121e-05, -1.73312 ) + +[editable path="CharacterFrontModel"] +[editable path="CharacterSideModel"] diff --git a/game/modules/entity_classes/elementalist/spells/31_overload.tres b/game/modules/entity_classes/elementalist/spells/31_overload.tres index d27497a..d45c8b0 100644 --- a/game/modules/entity_classes/elementalist/spells/31_overload.tres +++ b/game/modules/entity_classes/elementalist/spells/31_overload.tres @@ -3,8 +3,8 @@ [ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=1] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=3] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/AmplifyPain.tscn" type="PackedScene" id=4] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn" type="PackedScene" id=5] diff --git a/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres b/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres index 4488404..9d05767 100644 --- a/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres +++ b/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres @@ -1,8 +1,8 @@ [gd_resource type="SpellEffectVisual" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=3] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/AOSCastFinish.tscn" type="PackedScene" id=3] [resource] script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres b/game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres index 033be2a..1712626 100644 --- a/game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres +++ b/game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres @@ -1,7 +1,7 @@ [gd_resource type="SpellEffectVisual" load_steps=3 format=2] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn" type="PackedScene" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/NautreSwiftness.tscn" type="PackedScene" id=2] [resource] script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn b/game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn deleted file mode 100644 index 64da04d..0000000 --- a/game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn +++ /dev/null @@ -1,3 +0,0 @@ -[gd_scene format=2] - -[node name="NatureCast" type="Spatial"] diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn b/game/modules/entity_classes/naturalist/spell_effects/nature2d/AOSCastFinish.tscn similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn rename to game/modules/entity_classes/naturalist/spell_effects/nature2d/AOSCastFinish.tscn diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn b/game/modules/entity_classes/naturalist/spell_effects/nature2d/AmplifyPain.tscn similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn rename to game/modules/entity_classes/naturalist/spell_effects/nature2d/AmplifyPain.tscn diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn b/game/modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn new file mode 100644 index 0000000..8812ae3 --- /dev/null +++ b/game/modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/big_glow.png" type="Texture" id=1] + +[node name="NatureCast" type="CPUParticles2D"] +preprocess = 0.8 +randomness = 0.07 +local_coords = false +texture = ExtResource( 1 ) +spread = 112.0 +gravity = Vector2( 0, 0 ) +initial_velocity = 12.0 +initial_velocity_random = 0.54 +angular_velocity = 310.0 +angular_velocity_random = 0.84 +linear_accel = 11.77 +radial_accel = 37.26 +tangential_accel = -13.72 +tangential_accel_random = 0.79 +damping = 77.44 +damping_random = 0.09 +angle = 0.9 +scale_amount = 0.3 +color = Color( 0.13, 0.4, 0.02, 0.83 ) +hue_variation = 0.22 +hue_variation_random = 0.88 diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn b/game/modules/entity_classes/naturalist/spell_effects/nature2d/NautreSwiftness.tscn similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn rename to game/modules/entity_classes/naturalist/spell_effects/nature2d/NautreSwiftness.tscn diff --git a/game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres b/game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres index 7031c2b..b4cbfd5 100644 --- a/game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres @@ -1,10 +1,10 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn" type="PackedScene" id=1] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=3] [ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/AmplifyPain.tscn" type="PackedScene" id=5] [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/spells/35_strike.tres b/game/modules/entity_classes/naturalist/spells/35_strike.tres index 7d69c11..e6dbdc1 100644 --- a/game/modules/entity_classes/naturalist/spells/35_strike.tres +++ b/game/modules/entity_classes/naturalist/spells/35_strike.tres @@ -1,8 +1,8 @@ [gd_resource type="Spell" load_steps=7 format=2] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=3] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/AmplifyPain.tscn" type="PackedScene" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature2d/NatureCast.tscn" type="PackedScene" id=3] [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=4] [ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=5]