Closes #125

- Acid lance throw ability transfers to new thrown location if it is already summoned
- - Also refreshes duration when transferred to new location

Author: greatguys1

scripts/items/proj_pole_a.script

@@ -20,6 +20,8 @@
 	const PROJ_AOE_FALLOFF	0
 	const PROJ_STICK_DURATION	0  //Don't stick in enemies
 	const PROJ_COLLIDE	1
+	
+	const PROJ_CLOUD_DURATION 20.0
 }
 
 #include items/proj_arrow_base
@@ -116,5 +118,19 @@
 	dbg game_projectile_landed MY_ORG
 	local GROUND_Z $get_ground_height(MY_ORG)
 	vectorset MY_ORG z GROUND_Z
-	createnpc monsters/summon/affliction_lance MY_ORG $get(ent_expowner,id) MY_ORG $get(ent_me,angles)
+	
+	//ent_expowner
+	//
+	//scriptflags <target> add <name> <type> [value:1] [expiretime:-1] [expiremsg:none]
+	//$get_scriptflag(<target>,<type>,type_exists) - returns 1 if <type> found
+	
+	local L_FX_ID $get_scriptflag(ent_expowner,pole_a,name_value)
+	if ( L_FX_ID isnot 'none' )
+	{
+		callexternal L_FX_ID transfer_location MY_ORG
+	}
+	else
+	{
+		createnpc monsters/summon/affliction_lance MY_ORG $get(ent_expowner,id) MY_ORG $get(ent_me,angles) PROJ_CLOUD_DURATION //<ownerId> <origin> <angles> <duration>
+	}
 }

scripts/monsters/summon/affliction_lance.script

@@ -1,12 +1,13 @@
 {
 	const AOE_RADIUS 255
-	const AOE_DURATION 20.0
+	//const AOE_DURATION 20.0
 	const AOE_SCAN_FREQ 1.0
 	const AOE_VADJ 32
 	const AOE_AFFECTS_WARY 1
 }
 
 { game_spawn
+
 	setmodel weapons/projectiles.mdl
 	setmodelbody 0 70
 	nopush 1
@@ -20,21 +21,24 @@
 	fly 1
 	invincible 1
 	gravity 0
-	setangle face $vec(270,0,0)
+	//setangle face $vec(270,0,0)
 }
 
 #include monsters/summon/base_aoe2
 
-{ game_dynamically_created //<owner> <origin> <pitch>
+{ game_dynamically_created //<owner> <origin> <pitch> <duration>
 
 	dbg game_dynamically_created $get(PARAM1,name) PARAM2
 
 	setvard MY_OWNER PARAM1
 	local SPAWN_ORG PARAM2
+	setvard AOE_DURATION PARAM4
 	vectoradd SPAWN_ORG z 32
 	setorigin ent_me SPAWN_ORG
 	setidleanim axis_spin
 	playanim once axis_spin
+	
+	scriptflags MY_OWNER add pole_a "Affliction Lance" $get(ent_me,id) AOE_DURATION
 
 	setvard CUR_PITCH $vec.pitch(PARAM3)
 	//subtract CUR_PITCH 360
@@ -48,6 +52,8 @@
 	svplaysound 1 10 ambience/steamjet1.wav
 
 	clientevent new all monsters/summon/affliction_lance_cl $get(ent_me,index) 19.0
+	setvard MY_FX game.script.last_sent_id
+	setvard MY_END_TIME $math(add,game.time,AOE_DURATION)
 }
 
 { fix_pitch_loop
@@ -72,7 +78,30 @@
 	applyeffect PARAM1 effects/effect_poison 5.0 MY_OWNER DOT_POISON
 }
 
-{ aoe_end
-	svplaysound 1 0 ambience/steamjet1.wav
-	deleteent ent_me fade
+{ [override] aoe_end
+
+	if ( game.time >= MY_END_TIME )
+	{
+		setvard AOE_ACTIVE 0
+		svplaysound 1 0 ambience/steamjet1.wav
+		deleteent ent_me fade
+	}
+	else
+	{
+		callevent 1 aoe_end
+	}
+}
+
+{ transfer_location //<newLocationVector>
+
+	local L_NEW_POS PARAM1
+	
+	setvard MY_END_TIME $math(add,game.time,AOE_DURATION) //Resets the duration
+	clientevent update all MY_FX keep_on //Resets duration of client effect
+	
+	vectoradd L_NEW_POS z 32
+	setorigin ent_me L_NEW_POS
+	
+	scriptflags MY_OWNER edit pole_a "Affliction Lance" $get(ent_me,id) AOE_DURATION
+	//scriptflags <target> edit <name> <type> <value> [expiretime] [msg] - edits properties of first flag found with this name
 }

scripts/monsters/summon/affliction_lance_cl.script

@@ -3,12 +3,17 @@
 	setvard FX_DURATION PARAM2
 
 	setvard FX_ACTIVE 1
-	callevent FX_DURATION end_fx
 	setvard FX_ANGS 0
+	
+	setvard END_TIME $math(add,game.time,FX_DURATION)
 	callevent fx_loop
 }
 
 { end_fx
+
+	repeatdelay 1.0
+	if game.time >= END_TIME
+	setvard FX_ACTIVE 0
 	callevent 2.0 remove_fx
 }
 
@@ -54,4 +59,9 @@
 	cleffect tempent set_current_prop velocity CLOUD_VEL
 	cleffect tempent set_current_prop collide 	none
 	cleffect tempent set_current_prop fadeout lifetime	
+}
+
+{ keep_on
+
+	setvard END_TIME $math(add,game.time,FX_DURATION)
 }