Compare commits

..

No commits in common. "7535d9f28dad4db77e05128b2c66bf3da4accc9e" and "341f5137ebea8160b386d377965e5ca8234a9c9c" have entirely different histories.

6 changed files with 7 additions and 83 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 B

View File

@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://udgjrcaexuaq"
path="res://.godot/imported/arena-arches.png-e49389661487686aa358a9abf48dddfd.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/Sprites/Props/arena-arches.png"
dest_files=["res://.godot/imported/arena-arches.png-e49389661487686aa358a9abf48dddfd.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,7 @@
[gd_resource type="TileSet" load_steps=12 format=3 uid="uid://l61kbx31ug4p"]
[gd_resource type="TileSet" load_steps=10 format=3 uid="uid://l61kbx31ug4p"]
[ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="1_kud44"]
[ext_resource type="Texture2D" uid="uid://j1ekk1ppenm4" path="res://Assets/Sprites/grass-tileset.png" id="2_lihbs"]
[ext_resource type="Texture2D" uid="uid://udgjrcaexuaq" path="res://Assets/Sprites/Props/arena-arches.png" id="3_hbylw"]
[sub_resource type="NavigationPolygon" id="NavigationPolygon_7lhug"]
vertices = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
@ -697,27 +696,6 @@ texture = ExtResource("2_lihbs")
2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:7/0/physics_layer_0/angular_velocity = 0.0
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u4tjf"]
texture = ExtResource("3_hbylw")
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
1:0/0 = 0
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:0/0/physics_layer_0/angular_velocity = 0.0
2:0/0 = 0
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:0/0/physics_layer_0/angular_velocity = 0.0
0:1/0 = 0
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:1/0/physics_layer_0/angular_velocity = 0.0
1:1/0 = 0
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:1/0/physics_layer_0/angular_velocity = 0.0
2:1/0 = 0
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:1/0/physics_layer_0/angular_velocity = 0.0
[resource]
occlusion_layer_0/light_mask = 1
physics_layer_0/collision_layer = 1
@ -734,4 +712,3 @@ terrain_set_1/terrain_1/color = Color(0.5, 0.4375, 0.25, 1)
navigation_layer_0/layers = 1
sources/0 = SubResource("TileSetAtlasSource_fcd6d")
sources/1 = SubResource("TileSetAtlasSource_mdfpe")
sources/2 = SubResource("TileSetAtlasSource_u4tjf")

View File

@ -17,9 +17,6 @@ public partial class SwordBlockState : WeaponState
[Export]
public string BlockAnimKey { get; set; }
[Export]
public float BlockForceMultiplier { get; set; } = 4;
public bool HasBlocked { get; set; }
private double _attackDuration = 0;
@ -34,7 +31,7 @@ public partial class SwordBlockState : WeaponState
{
Sword.EnableParry(ulong.MaxValue);
_oldBlockForce = Sword.BlockForce;
Sword.BlockForce *= BlockForceMultiplier;
Sword.BlockForce *= 4;
_useDuration = Sword.UseAltTime;
_attackDuration = Sword.AttackAltTime;