Rzucanie sztyletami

Author: KoBeWi

Diff for: Nodes/Projectiles/PBone.tscn

@@ -6,7 +6,7 @@
 resource_name = "Bone"
 script/source = "extends KinematicBody2D
 
-var velocity = Vector2(300, -800)
+var velocity = Vector2(250, -800)
 var player
 
 onready var sprite = $Sprite
@@ -73,10 +73,3 @@ shape = SubResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="."]
 texture = ExtResource( 1 )
-
-[node name="Hitbox" type="Area2D" parent="."]
-collision_layer = 4
-collision_mask = 0
-
-[node name="Shape" type="CollisionShape2D" parent="Hitbox"]
-shape = SubResource( 2 )

Diff for: Nodes/Projectiles/PDagger.tscn

@@ -0,0 +1,71 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://Graphics/Projectiles/Dagger.png" type="Texture" id=1]
+
+[sub_resource type="GDScript" id=1]
+resource_name = "Bone"
+script/source = "extends Enemy
+
+var velocity = Vector2(600, 0)
+var player
+
+onready var sprite = $Sprite
+
+func _ready():
+	if Com.register_node(self, \"Projectiles/PDagger\"): return
+
+func attack():
+	return {damage = player.stats.magic_attack + 10}
+
+func _physics_process(delta):
+	if sprite.position.length_squared() > 1:
+		sprite.position *= 0.7
+	else:
+		sprite.position = Vector2()
+	
+	var col = move_and_collide(velocity * delta)
+	if col:
+		Com.dispose_node(self)
+
+func state_vector_types():
+	return [
+			Data.TYPE.U16,
+			Data.TYPE.U16,
+			Data.TYPE.U16
+		]
+
+func get_state_vector():
+	return [
+			round(position.x),
+			round(position.y),
+			round(velocity.x) + 10000
+		]
+
+func apply_state_vector(timestamp, diff_vector, vector):
+	var old_position = position
+	position.x = vector[0]
+	position.y = vector[1]
+	if has_meta(\"initialized\"): sprite.position = (old_position - position) + sprite.position
+	
+	velocity.x = vector[2] - 10000
+	sprite.flip_h = velocity.x < 0
+
+func on_hit():
+	Com.dispose_node(self)"
+
+[sub_resource type="RectangleShape2D" id=2]
+extents = Vector2( 30, 12 )
+
+[node name="Dagger" type="KinematicBody2D" groups=[
+"player_attack",
+]]
+collision_layer = 0
+collision_mask = 5
+script = SubResource( 1 )
+attack = 20
+
+[node name="Collider" type="CollisionShape2D" parent="."]
+shape = SubResource( 2 )
+
+[node name="Sprite" type="Sprite" parent="."]
+texture = ExtResource( 1 )

Diff for: Resources/Data/Souls/Souls1.json

@@ -7,28 +7,27 @@
         "name": "Summon Bat",
         "description": "Summons a weak bat to chase enemies.",
         "type": "trigger",
-        "mp": 8
+        "mp": 6
     },
 
     {
         "name": "Echo of Bat",
         "description": "Attack with a sonic wave around you.",
         "type": "trigger",
-        "mp": 8
+        "mp": 5
     },
 
     {
         "name": "Auto-Jump",
         "description": "Jump by holding jump key.",
-        "type": "ability",
-        "mp": 8
+        "type": "ability"
     },
 
     {
         "name": "Short Hover",
         "description": "Hover briefly in air.",
         "type": "active",
-        "mp": 8
+        "mp": 3
     },
 
     {
@@ -41,13 +40,15 @@
     {
         "name": "Skeleton Disguise",
         "description": "You look like skeleton!",
-        "type": "active"
+        "type": "active",
+        "mp": 2
     },
 
     {
         "name": "Dagger Throw",
         "description": "Throw a dagger.",
-        "type": "trigger"
+        "type": "trigger",
+        "mp": 12
     },
 
     {

Diff for: Scripts/Networking/Data.gd

@@ -29,6 +29,7 @@ const NODES = [
 	"Enemies/Bone",
 	"Enemies/Dagger",
 	"Projectiles/PBone",
+	"Projectiles/PDagger",
 	"Effects/Soul",
 	"Objects/Item"
 ]

Diff for: Scripts/Player.gd

@@ -211,13 +211,20 @@ func trigger_soul():
 
 		get_meta("character").call("SyncStat", "mp", stats.mp)
 
-		match int(souls[0]):
-			1:
+		match Res.get_res(Res.souls, int(souls[0])).name:
+			"Bone Throw":
 				var bone = preload("res://Nodes/Projectiles/PBone.tscn").instance()
 				get_parent().add_child(bone)
 				bone.position = position + Vector2(0, -80)
 				bone.velocity.x = abs(bone.velocity.x) * direction_i()
 				bone.player = self
+			
+			"Dagger Throw":
+				var dagger = preload("res://Nodes/Projectiles/PDagger.tscn").instance()
+				get_parent().add_child(dagger)
+				dagger.position = position
+				dagger.velocity.x = abs(dagger.velocity.x) * direction_i()
+				dagger.player = self
 
 func active_soul():
 	if !Com.is_server: return ##TODO: klient może dostawać info