Paladin Taunt Skill - Avengers Shield

design/animations.py

@@ -309,6 +309,69 @@
 		"speed":160,
 		"front":True,
 	},
+	"throw_wshield":{
+		"file":"/images/sprites/animations/throw_wshield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
+	"throw_sshield":{
+		"file":"/images/sprites/animations/throw_sshield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
+	"throw_mshield":{
+		"file":"/images/sprites/animations/throw_mshield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
+	"throw_xshield":{
+		"file":"/images/sprites/animations/throw_xshield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
+	"throw_tigershield":{
+		"file":"/images/sprites/animations/throw_tigershield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
+	"throw_shield":{
+		"file":"/images/sprites/animations/throw_shield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
+	"throw_crusader_shield":{
+		"file":"/images/sprites/animations/throw_crusader_shield.png",
+		"frames":4,
+		"continuous":True,
+		"directional":True,
+		"speed":500,
+		"size":0.75,
+		"front":True,
+	},
 	"arrow_hit":{
 		"file":"/images/sprites/animations/Slash0Arrow.png", # nice animation, damage-like
 		"frames":7,

design/projectiles.py

@@ -123,6 +123,41 @@
 		"speed":320,
 		"hit_animation":"explode_b",
 	},
+	"wshield":{
+		"animation":"throw_wshield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
+	"sshield":{
+		"animation":"throw_sshield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
+	"shield":{
+		"animation":"throw_shield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
+	"mshield":{
+		"animation":"throw_mshield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
+	"xshield":{
+		"animation":"throw_xshield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
+	"tigershield":{
+		"animation":"throw_tigershield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
+	"crusader_shield":{
+		"animation":"throw_crusader_shield",
+		"speed":220,
+		"hit_animation":"explode_c",
+	},
 	"fireball":{
 		"animation":"fireball",
 		"speed":320,

design/skills.py

@@ -955,6 +955,23 @@
 		"procs":True,
 		"pierces_immunity":True,
 	},
+	"avengers_shield":{
+		"type":"skill",
+		"skin":"shield",
+		"class":["paladin"],
+		"slot": [["offhand","shield"]],
+		"name":"Avengers Shield",
+		"explanation":"Hurls your shield at an enemy target, dealing (10% of Attack power) Holy damage, interrupting and silencing the non-Player target for 3 sec, and then jumping to 2 additional nearby enemie", 
+		"attack_multiplier": 0.10, # 10% of Attack power
+		"range":200, # range multiplier of character range?
+		"mp":40,
+		"cooldown":3000,
+		"target":True,
+		"hostile":True,
+		"projectile":"crusader_shield", # would be cool if this could adapt to the equipped shield
+		"pierces_immunity":True,
+		"chained": { "targets": 2 }
+	},
 	"alchemy":{
 		"type":"skill",
 		"skin":"skill_alchemy",

js/game.js

@@ -2956,7 +2956,27 @@ function init_socket(args)
 		var owner=get_entity(data.hid);
 		var color="red";
 
-		if(map_animations[data.pid]) map_animations[data.pid].to_delete=true;
+		const asprite = map_animations[data.pid];
+
+		const shouldDeleteAnimation = !data.chained
+		if(shouldDeleteAnimation && asprite) asprite.to_delete=true;
+
+
+		console.log('hit',data.id, data.chained, asprite?.to_delete, data.next_chain_id, asprite?.going_x,asprite?.going_y, asprite?.speed)
+		if (data.chained) {
+			if (asprite) {
+				asprite.chained = data.chained;
+				if(data.next_chain_id)
+				{
+					const chain_target=get_entity(data.next_chain_id)
+					asprite.target=chain_target;
+					asprite.going_x=get_x(chain_target);
+					asprite.going_y=get_y(chain_target)-get_height(chain_target)/2;
+					if(point_distance(asprite.x,asprite.y,asprite.going_x,asprite.going_y)<100) asprite.speed*=0.75;
+					console.log('next chain',data.next_chain_id,asprite.going_x,asprite.going_y, asprite.speed)
+				}
+			}
+		}
 
 		var attack_data=clone(data); delete attack_data.id; delete attack_data.hid;
 		attack_data.actor=data.hid; attack_data.target=data.id;
@@ -3734,39 +3754,75 @@ function update_sprite(sprite)
 
 	}
 
-	if((sprite.stype=="animation" || sprite.stype=="item") && sprite.atype=="map")
-	{
-		var target_x=get_x(sprite.target),target_y=get_y(sprite.target)-get_height(sprite.target)/2;
-		if(sprite.m!=sprite.target.m) target_x=sprite.going_x,target_y=sprite.going_y;
-		var ms=mssince(sprite.last_update);
-		sprite.crotation=Math.atan2(target_y-sprite.y,target_x-sprite.x)+Math.PI/2;
-		if(sprite.first_rotation===undefined)
-		{
-			sprite.first_rotation=sprite.crotation;
-			if(sprite.directional) sprite.rotation=sprite.crotation;
+	if ((sprite.stype == "animation" || sprite.stype == "item") && sprite.atype == "map") {
+		if (!sprite.target) {
+			console.error(`sprite has no target`, sprite);
 		}
-		if(sprite.directional && point_distance(target_x,target_y,sprite.x,sprite.y)>50)
-		{
-			sprite.rotation=sprite.crotation;
+
+		// sprite.target can be undefined causing get_x to throw an error, so we default to going_ because the code does that with .m
+		let target_x = sprite.target ? get_x(sprite.target) : sprite.going_x;
+		let target_y = sprite.target ? get_y(sprite.target) - get_height(sprite.target) / 2 : sprite.going_y;
+
+		// TODO: what is .m? and why do we use going_ instead?
+		if (sprite.target && sprite.m != sprite.target.m) {
+			target_x = sprite.going_x;
+			target_y = sprite.going_y;
+		}
+
+		var ms = mssince(sprite.last_update);
+
+		// calculate current rotation
+		sprite.crotation = Math.atan2(target_y - sprite.y, target_x - sprite.x) + Math.PI / 2;
+
+		// update rotation if sprite is directional and it has not been updated yet
+		if (sprite.first_rotation === undefined) {
+			sprite.first_rotation = sprite.crotation;
+			if (sprite.directional) sprite.rotation = sprite.crotation;
 		}
-		sprite.from_x=sprite.x; sprite.from_y=sprite.y;
-		sprite.going_x=target_x; sprite.going_y=target_y;
+
+		// Update rotation to match current rotation if we are more than 50px away
+		if (sprite.directional && point_distance(target_x, target_y, sprite.x, sprite.y) > 50) {
+			sprite.rotation = sprite.crotation;
+		}
+
+		// move sprite based on velocity
+		sprite.from_x = sprite.x;
+		sprite.from_y = sprite.y;
+		sprite.going_x = target_x;
+		sprite.going_y = target_y;
+
 		calculate_vxy(sprite);
-		sprite.x=sprite.x+sprite.vx*ms/1000.0;
-		sprite.y=sprite.y+sprite.vy*ms/1000.0;
-		if(mssince(sprite.last_frame)>=sprite.framefps) sprite.frame+=1,sprite.last_frame=new Date();
-		if(sprite.to_fade) sprite.alpha-=((sprite.to_fade!==true&&sprite.to_fade)||0.025)*ms/16.6;
-		if(sprite.frame>=sprite.frames) sprite.frame=0;
-		set_texture(sprite,sprite.frame);
-		sprite.crotation=Math.atan2(target_y-sprite.y,target_x-sprite.x)+Math.PI/2;
-		if(sprite.to_delete || point_distance(target_x,target_y,sprite.x,sprite.y)<(sprite.limit||16) || abs(sprite.first_rotation-sprite.crotation)>Math.PI/2)
-		{
-			destroy_sprite(sprite,"children");
+		sprite.x = sprite.x + (sprite.vx * ms) / 1000.0;
+		sprite.y = sprite.y + (sprite.vy * ms) / 1000.0;
+
+		// set next sprite animation frame depending on sprite framefps
+		if (mssince(sprite.last_frame) >= sprite.framefps) (sprite.frame += 1), (sprite.last_frame = new Date());
+
+		// fade sprite to invisible over time
+		if (sprite.to_fade) sprite.alpha -= (((sprite.to_fade !== true && sprite.to_fade) || 0.025) * ms) / 16.6;
+
+		// reset sprite animation frame to first frame
+		if (sprite.frame >= sprite.frames) sprite.frame = 0;
+		set_texture(sprite, sprite.frame);
+
+		// TODO: calculate current rotation again? not sure why
+		sprite.crotation = Math.atan2(target_y - sprite.y, target_x - sprite.x) + Math.PI / 2;
+
+		// delete unchained sprites that are close enough or if it has rotated more than half compared to the first rotation
+		if (
+			sprite.to_delete ||
+			(!sprite.chained &&
+				(point_distance(target_x, target_y, sprite.x, sprite.y) < (sprite.limit || 16) ||
+					abs(sprite.first_rotation - sprite.crotation) > Math.PI / 2))
+		) {
+			destroy_sprite(sprite, "children");
 			delete map_animations[sprite.id];
 			return;
 		}
-		sprite.last_update=new Date();
-	}
+
+		sprite.last_update = new Date();
+
+	}	
 	else if(sprite.stype=="animation" && sprite.atype=="cmap")
 	{
 		var ms=mssince(sprite.last_update);

js/html.js

@@ -4219,14 +4219,18 @@ function render_skills()
 		var s=[],slast=0,a=[],alast=0;
 		object_sort(G.skills).forEach(function(io){
 			var name=io[0],skill=io[1];
-			if(skill.slot)
+
+			// We still want to show class specific skills, like avenger's shield
+			if(skill.slot && !skill.class)
 			{
 				var found=false;
 				skill.slot.forEach(function(p){
 					if(character.slots[p[0]] && character.slots[p[0]].name==p[1]) found=true;
 				});
+
 				if(!found) return;
 			}
+
 			if(skill.inventory)
 			{
 				var found=false;
@@ -4239,6 +4243,7 @@ function render_skills()
 				});
 				if(!found) return;
 			}
+
 			if(skill.type=="skill" && (!skill['class'] || in_arr(character.ctype,skill['class']) || character.role=="gm"))
 				s.push({name:name});
 			if(skill.type=="passive" && (!skill['class'] || in_arr(character.ctype,skill['class']) || character.role=="gm"))