Fixed a weird double assignment on line 47.

Added Wraith Form to timedScripts.cfg.
Changed NoCure setting to NoEnd setting for In Cognito and Polymorph in timedScripts.cfg.
Improvements to incognito spell script in :magery:spells/circle5.
Improvements to polymorph in :magery:spells/circle7.
Improvements to wform in :necromancy:
Still a work in progress - slow progress :D

Author: Admin-Yukiko

pkg/skills/magery/spellStarter.src

@@ -13,6 +13,7 @@ include ":containers:containers";
 include ":itemUtils:itemdesc";
 include "include/client";
 include "include/sounds";
+include ":timedScripts:timedScripts";
 
 program SpellStarter(params)
 	var mobile := params[1]; // Caster
@@ -44,7 +45,7 @@ program SpellStarter(params)
 	endif
 
 	// Check for conflicting spells.
-	var conflict := conflict := ConflictsCheck( mobile, spell_id );
+	var conflict := ConflictsCheck( mobile, spell_id );
 	if( conflict )
 		SendSysMessage( mobile, "You cannot cast this spell while under the influence of " + conflict + ".", color := 33 );
 		return 0;
@@ -356,24 +357,24 @@ function ConflictsCheck( byref mobile, byref spell_id )
 	var conlicting_spells := current_spell_elem.Conflicts;
 	var conflicts := SplitWords( conlicting_spells );
 	var conlicting_spells_names := {};
-	var temp := CStr(spell_id) in conflicts;
+	var con_spel_elem;
+	var con_spell_name := "";
+// Print("current_spell == "+current_spell);
+
 	// Added the following on 2024-02-06
-	// var running_timers := TS_GetTimerNames(mobile);
-	// foreach spell in conflicts
+	var running_timers := TS_GetTimerNames(mobile);
+	foreach con_spell_id in conflicts
 		// Get spell_name of conflicting spell.
+		con_spel_elem := MS_GetSpellsCfgElem(con_spell_id);
+		con_spell_name := con_spel_elem.Name;
 		// Check against running timers.
-		// If spell_name in running_timers.
-		// return spell_name.
-	// endforeach
-	// return "";
+		If (con_spell_name in running_timers)
+			return con_spell_name;
+		endif
+	endforeach
+
+	return "";
 
 
-	if( current_spell == "Incognito" && GetObjProperty( mobile, "Polymorphed" ) )
-		return "Polymorph";
-	elseif( current_spell == "Polymorph" && GetObjProperty( mobile, "Incognito" ) )
-		return "Incognito";
-	else
-		return "";
-	endif
 // NecroHBeast
 endfunction

pkg/skills/magery/spells/circle5/incognito.src

@@ -11,15 +11,23 @@ include ":virtue:virtue";
 program cast_incognito(parms)
 	var caster := parms[1];
     var info := parms[2];
+	var duration := 0;
 
 
 	MS_PlaySpellSFX(info.spell_id, caster);
 	MS_PlaySpellGFX(info.spell_id, caster, caster);
 
-	// Duration: ((Eval / 5) + 1) * 6
-	var duration := AP_GetSkill(caster, MAGERY) * 1.2;
-	TS_StartTimer(caster, "Incognito", duration, 0, caster);
-	VS_AdjustVirtue(caster, "Honesty", -1, 100);
+
+	if( !GetObjProperty( caster, "Incognito" ) )
+		// On OSI Duration is calculated ((Eval / 5) + 1) * 6
+		duration := AP_GetSkill(caster, MAGERY) * 1.2;
+
+		// TS_StartTimer(caster, "Incognito", duration, 0, caster);
+		TS_StartTimer(caster, "Incognito", 1);
+		VS_AdjustVirtue(caster, "Honesty", -1, 100);
+	else
+		TS_LowerDuration( caster, "Incognito", -1 );
+	endif
 
 	return 1;
 endprogram

pkg/skills/magery/spells/circle7/polymorph.src

@@ -73,13 +73,13 @@ program cast_polymorph( parms )
 	endif
 
 
-
-	if(!GetObjProperty(caster, "Polymorphed"))
+	if(!("Polymorph" in TS_GetTimerNames(caster)))
+	// if(!GetObjProperty(caster, "Polymorph"))
 		// Preserve caster's graphic and colour in a CProp on the character.
-		my_form.+graphic := caster.graphic;
+		// my_form.+graphic := caster.graphic;
 		my_form.colour := caster.color;
-		SetObjProperty(caster, "MyOrigForm", my_form);
-		SetObjProperty(caster, "Polymorphed", 1);
+		// SetObjProperty(caster, "MyOrigForm", my_form);
+		SetObjProperty(caster, "Polymorph", caster.color);
 		// Get the appropriate group of creatures based on magery skill.
 		critter_group := GetGroup(critgroup);
 		// Pick a random creature from the group.
@@ -103,14 +103,16 @@ program cast_polymorph( parms )
 		caster.addbuff(buff_icon, 0, cliloc_name, cliloc_desc, article + "\t" + crit_name); // You are transformed into ~1_ARTICLE~ ~2_FORM~.
 		// Honesty takes a hit for polymorphing.
 		VS_AdjustVirtue(caster, "Honesty", -1, 50);
+		TS_StartTimer(caster, "Polymorph", 10);
 	else
 		// Restore caster's graphic and colour.
-		my_form := GetObjProperty(caster, "MyOrigForm");
-		caster.graphic := my_form.graphic;
-		caster.color := my_form.colour;
+		// my_form := GetObjProperty(caster, "MyOrigForm");
+		// caster.graphic := my_form.graphic;
+		// caster.color := my_form.colour;
 		// Clear the CProps and delete the buff icon.
-		EraseObjProperty(caster, "MyOrigForm");
-		EraseObjProperty(caster, "Polymorphed");
+		// EraseObjProperty(caster, "MyOrigForm");
+		// EraseObjProperty(caster, "Polymorphed");
+		TS_LowerDuration(caster, "Polymorph", -1);
 		caster.delbuff(buff_icon);
 	endif
 

pkg/skills/necromancy/wform.src

@@ -11,7 +11,7 @@ program wraith_form( params )
 	//var spellID := params[3];
 	//var cast_on := params[4]; // Target of spell if required.
 
-	if(Getobjproperty(caster, "wraith"))
+	if(Getobjproperty(caster, "WraithForm"))
 		PlayObjectCenteredEffectEx( caster, 0x374A, 1, 15, 9902, 4, 3, 1108 );
 		caster.graphic := caster.trueobjtype;
 		caster.color := caster.truecolor;
@@ -35,7 +35,7 @@ program wraith_form( params )
 
 		return 0;
 	endif
-	
+
 	if (Getobjproperty(caster, "poly")  == 1)
 		SendSysMessage(caster,"You are already under the influence of the spell!");
 		return 0;
@@ -62,7 +62,7 @@ program wraith_form( params )
         eraseobjproperty(caster,"NewRegenRateForStamina");
 		RecalcVitals(caster);
 	endif
-	
+
 	PlaySoundEffect(caster, 0x17F);
 	PlayObjectCenteredEffectEx( caster, 0x374A, 1, 15, 9902, 4, 3, 1108 );
 	Sleep(1);
@@ -72,7 +72,7 @@ program wraith_form( params )
 	else
 		caster.graphic := 0x2EB;
 	endif
-	
+
 	caster.color :=0;
 	caster.title_prefix := "";
 	caster.title_suffix := "";
@@ -83,5 +83,5 @@ program wraith_form( params )
 	ModifyResistance(caster, "Energy", -5);
 	ModifyResistance(caster, "Physical", 15);
 	SetobjProperty(caster, "poly", 2);
-	SetObjProperty(caster, "wraith", 1);
+	SetObjProperty(caster, "Wraith Form", 1);
 endprogram

pkg/utils/timedScripts/config/timedScripts.cfg

@@ -283,7 +283,7 @@ TimerElem Incognito
 	Name				Incognito
 	Script				subScripts/magery/incognito
 	EndScript			subScripts/magery/endIncognito
-	NoCure				1
+	NoEnd				1
 	ContinueOnDeath		0
 	BuffIcon			1032
 	cliloc_name			1075819
@@ -374,7 +374,7 @@ TimerElem Polymorph
 	EndScript			subScripts/magery/endPolymorph
     LogOffScript		subScripts/magery/endPolymorph
 
-	NoCure				1
+	NoEnd				1
 	ContinueOnDeath		0	// On OSI, it ends when Resed.
     BuffIcon			1035
 	cliloc_name			1075822
@@ -465,6 +465,23 @@ TimerElem Weaken
 	cliloc_desc			1075838
 }
 
+#--=[ Necromancy ]=--------------------
+
+TimerElem WraithForm
+{
+	Name				Wraith Form
+	Script				subScripts/magery/wraithForm
+	EndScript			subScripts/magery/endWraithForm
+    LogOffScript		subScripts/magery/endWraithForm
+
+	NoEnd				1
+	ContinueOnDeath		0	// On OSI, it ends when Resed.
+    BuffIcon			1124
+	cliloc_name			1060524
+	cliloc_desc			1153829
+}
+
+
 #--=[ Fish Pies ]=--------------------
 
 TimerElem FishMedBoost