Added fallbacks to GetName()

source/scripts/_00E_SkillControl.psc

@@ -79,7 +79,12 @@ Function ReadMemorySkillBook(String sClass, Int iTier, Message talentMessage, fl
 				Elseif sClass == "Warrior"
 					messageToShow = _00E_FS_A3_sWarriorClassName
 				EndIf
+				
+				if SKSE.GetVersion()
 					Debug.Notification(_00E_FS_A3_sYouNeedSkillpoints.GetName() + " " + iRequiredPoints + _00E_FS_A3_sIn.GetName() + messageToShow.GetName() + _00E_FS_A3_sToUnlockThisClass.GetName())
+				else
+					Debug.Notification("You need to have at least " + iRequiredPoints + " talent points in the class.")
+				endif
 				
 			EndIf
 				

source/scripts/_00E_SympathyControl.psc

@@ -44,7 +44,7 @@ Function ModSympathyNG(Actor akSympathyActor, int iSympathyMod, bool bIsFlirt =
 		EndIf
 	EndIf
 	
-	If !bStringOverride
+	If ! bStringOverride || ! SKSE.GetVersion()
 		If (iSympathyMod > 0) && (iSympathyMod <= 5) 
 			_00E_Levelsystem_sApproves.Show()
 		ElseIf (iSympathyMod > 5) && (iSympathyMod <= 10) 
@@ -57,8 +57,10 @@ Function ModSympathyNG(Actor akSympathyActor, int iSympathyMod, bool bIsFlirt =
 			_00E_Levelsystem_sHurt.Show()
 		ElseIf (iSympathyMod < -10) && (iSympathyMod >= -20) 
 			_00E_Levelsystem_sVeryHurt.Show()
+		ElseIf iSympathyMod < -20
+			_00E_Levelsystem_sExtremelyHurt.Show()
 		EndIf
-	Else
+	ElseIf SKSE.GetVersion()
 		; TODO: Use a vanilla message
 		String sActorName = sympathyBase.GetName()
 		Debug.Notification(sActorName + sOverride)
@@ -122,4 +124,3 @@ Message Property _00E_Levelsystem_sHurt Auto
 Message Property _00E_Levelsystem_sVeryHurt Auto
 Message Property _00E_Levelsystem_sDoesNotTrust Auto
 Message Property _00E_Levelsystem_sExtremelyHurt Auto
-Message Property _00E_Levelsystem_sIsHurt Auto

source/scripts/_00e_a1_qyraistancesc.psc

@@ -17,7 +17,11 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		akCaster.RemoveSpell(_00E_A1_QyraiStanceDisplay03)
 		akCaster.RemovePerk(_00E_A1_QyranianStanceBlockPerk)
 		akCaster.RemovePerk(_00E_A1_QyranianStanceEnemyCritPerk)
+		
+		if SKSE.GetVersion()
 			Debug.Notification(_00E_Levelsystem_sAbilityStanceQyrai.GetName() + " " + _00E_Levelsystem_sAbilityStanceEnded.GetName())
+		endif
+		
 		_00E_DispelStance.Play(akCaster)
 		
 	Else
@@ -60,7 +64,11 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		
 		NPCKillSwordSpinM.Play(akCaster)
 		GhostFXShader.Play(akCaster)
+		
+		if SKSE.GetVersion()
 			Debug.Notification(_00E_Levelsystem_sAbilityStanceQyrai.GetName() + " " + _00E_Levelsystem_sAbilityStanceStarted.GetName())
+		endif
+		
 		Utility.Wait(4)
 		GhostFXShader.Stop(akCaster)
 		

source/scripts/_00e_a1_skaraggstancesc.psc

@@ -18,7 +18,10 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		akCaster.RemoveSpell(_00E_A1_SkaraggStanceDisplay02)
 		akCaster.RemoveSpell(_00E_A1_SkaraggStanceDisplay03)
 
+		if SKSE.GetVersion()
 			Debug.Notification(_00E_Levelsystem_sAbilityStanceSkaragg.GetName() + " " + _00E_Levelsystem_sAbilityStanceEnded.GetName())
+		endif
+		
 		_00E_DispelStance.Play(akCaster)
 	
 	Else
@@ -63,7 +66,11 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		
 		_00E_A1_SkaraggStanceSound.Play(akCaster)
 		GhostRedFXShader.Play(akCaster)
+		
+		if SKSE.GetVersion()
 			Debug.Notification(_00E_Levelsystem_sAbilityStanceSkaragg.GetName() + " " + _00E_Levelsystem_sAbilityStanceStarted.GetName())
+		endif
+		
 		Utility.Wait(4)
 		GhostRedFXShader.Stop(akCaster)
 		

source/scripts/_00e_fs_nqr03_functions.psc

@@ -115,7 +115,9 @@ Function RemovePages()
 		PlayerREF.RemoveItem(_00E_FS_NQR02_MissingPages, 1)
 	EndIf
 	
+	if SKSE.GetVersion()
 		FS_NQR03_RhalataTemple.SetName(_00E_sRhalataTempleName.GetName())
+	endif
 	
 EndFunction
 

source/scripts/_00e_mq02_functions.psc

@@ -352,9 +352,12 @@ Function TryToInsertStick(ObjectReference ActivatorREF)
 	
 		If CurrentValue == 0
 	
-			iDifficulty = Utility.GetINIInt("iDifficulty:GamePlay")
 			Int iUpdate = 15
 			
+			if SKSE.GetVersion()
+			
+				iDifficulty = Utility.GetINIInt("iDifficulty:GamePlay")
+				
 				If iDifficulty == 0
 					iUpdate = 19
 				ElseIf iDifficulty == 1
@@ -365,12 +368,18 @@ Function TryToInsertStick(ObjectReference ActivatorREF)
 					iUpdate = 11
 				EndIf
 			
+			endif
+		
 			RegisterForSingleUpdate(iUpdate)
 		EndIf
 			
 		QSTAstrolabeButtonPressX.Play(ActivatorREF)
 		LinkedREF.Enable()
+		
+		if SKSE.GetVersion()
 			ActivatorREF.SetDisplayName("")
+		endif
+		
 		_00E_MQ02Riddle.SetValue(CurrentValue + 1)
 
 		If _00E_MQ02Riddle.GetValue() == 5
@@ -397,13 +406,15 @@ Function ResetRiddle()
 	_00E_MQ02Riddle.SetValue(0)
 	QSTAstrolabeButtonOpenX.Play(PlayerREF)
 	
-	string _sName = MQ02_Puzzle_Lever_01.GetBaseOBject().GetName()
+	if SKSE.GetVersion()
+		string _sName = MQ02_Puzzle_Lever_01.GetBaseObject().GetName()
 		
 		MQ02_Puzzle_Lever_01.SetDisplayName(_sName)
 		MQ02_Puzzle_Lever_02.SetDisplayName(_sName)
 		MQ02_Puzzle_Lever_03.SetDisplayName(_sName)
 		MQ02_Puzzle_Lever_04.SetDisplayName(_sName)
 		MQ02_Puzzle_Lever_05.SetDisplayName(_sName)
+	endif
 	
 	MQ02_Puzzle_Lever_01.GetLinkedRef().DisableNoWait()
 	MQ02_Puzzle_Lever_02.GetLinkedRef().DisableNoWait()

source/scripts/_00e_mq11a_deaddraugrmotiontype.psc

@@ -33,7 +33,10 @@ Function Reanimate()
 	EnableAI(True)
 	_00E_MQ11a_ReanimateSelf.Cast(Self, Self)
 	_00E_MagConjureReanimate.Play(Self)
+	
+	if SKSE.GetVersion()
 		GetBaseObject().SetName(_00E_MQ11a_CorpseName.GetName())
+	endif
 	
 	; Wait for the corpse to be reanimated (or until timeout via nCountDown). Takes 5-6 secs.
 	Utility.Wait(2.0)

source/scripts/_00e_mq14_functions.psc

@@ -415,8 +415,6 @@ Function FillTraitorScene()
         
         if Utility.RandomInt(0, 1) >= 0.5
             MQ14_SC06_ArkanistFormlist.AddForm(akCurrentActor)
-    
-            ;akCurrentActor.GetActorBase().SetName(MQ14_SC04_ArcanistREF.GetActorBase().GetName())
             akCurrentActor.SetOutfit(_25E_HolyOrder_ArcanistOutfitNoHood)
         EndIf
 

source/scripts/_00e_mq16_functions.psc

@@ -71,8 +71,12 @@ Function StartVision_SC01()
     MQ16_SC01_MotherREF02.SetAlpha(0.75)
     MS04MemoryFXBody01VFX.Play(MQ16_SC01_MotherREF02)
     MS04MemoryFXBody01VFX.Play(MQ16_SC01_MotherREF02)
+	
+	if SKSE.GetVersion()
 		MQ16_SC01_ChildREF02.GetActorBase().SetName(_00E_MQ16_sFleeingChild.GetName())
 		MQ16_SC01_MotherREF02.GetActorBase().SetName(_00E_MQ16_sFleeingWoman.GetName())
+	endif
+	
     _00E_MQ16_SC01_ScreamM.Play(PlayerREF)
     _00E_MQ16_VisionIMOD.Apply()
     iVisionIntenseSound = _00E_AMB_Vision_SoundLPM.Play(PlayerREF)
@@ -196,16 +200,22 @@ Function PosessCorpse01()
     MQ16_SC05_HighOnesEyes_03.EnableNoWait()
     _00E_VisionGlimpseWhisperM.Play(PlayerREF)
     _00E_StaggerSelf.Cast(akCompanion, akCompanion)
+	
+	if SKSE.GetVersion()
 		MQ16_SC04_Corpse01REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())
 		MQ16_SC04_Corpse02REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())
 		MQ16_SC04_Corpse03REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())
 		MQ16_SC04_Corpse04REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())
+	endif
 	
 EndFunction
 
 Function PosessCorpse02()
 
+	if SKSE.GetVersion()
 		MQ16_SC04_Corpse04REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())
+	endif
+	
     MQ16_SC05_HighOnesEyes_02.EnableNoWait()
     _00E_VisionGlimpseWhisperM.Play(PlayerREF)
     
@@ -215,7 +225,10 @@ Function PosessCorpse03()
 
     MQ16_SC05_HighOnesEyes_01.EnableNoWait(False)
     _00E_VisionGlimpseWhisperM.Play(PlayerREF)
+	
+	if SKSE.GetVersion()
 		MQ16_SC04_Corpse03REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())    
+    endif
 	
 EndFunction
 
@@ -223,7 +236,10 @@ Function PosessCorpse04()
 
     MQ16_SC05_HighOnesEyes_04.EnableNoWait()
     _00E_VisionGlimpseWhisperM.Play(PlayerREF)
+	
+	if SKSE.GetVersion()
 		MQ16_SC04_Corpse02REF.GetBaseObject().SetName(_00E_MQ16_sHighOnes.GetName())
+	endif
 	
 EndFunction
 
@@ -285,10 +301,14 @@ Function StartSC06()
     MQ16_SC05_HighOnesEyes_02.DisableNoWait()
     MQ16_SC05_HighOnesEyes_03.DisableNoWait()
     MQ16_SC05_HighOnesEyes_04.DisableNoWait()
+	
+	if SKSE.GetVersion()
 		MQ16_SC04_Corpse04REF.GetBaseObject().SetName(_00E_MQ16_sCongealedCorpse.GetName())
 		MQ16_SC04_Corpse03REF.GetBaseObject().SetName(_00E_MQ16_sCongealedCorpse.GetName())
 		MQ16_SC04_Corpse02REF.GetBaseObject().SetName(_00E_MQ16_sCongealedCorpse.GetName())
 		MQ16_SC04_Corpse01REF.GetBaseObject().SetName(_00E_MQ16_sCongealedCorpse.GetName())
+	endif
+	
     _00E_PlayerFunctions.GetSoundControl().RemoveSilence()
     _00E_Music_Combat_Epic.Add()
     
@@ -816,7 +836,11 @@ Function StartSC14()
     MS04MemoryFXBody01VFX.Stop(PlayerREF)
     MQ16_SC14_YuslanDeadREF.GetActorBase().SetEssential(False)
     MQ16_SC14_YuslanDeadREF.SetGhost(False)
+	
+	if SKSE.GetVersion()
 		MQ16_SC14_YuslanDeadREF.GetActorBase().SetName(_00E_MQ16_sHighOnes.GetName())
+	endif
+	
     akTealor.MoveTo(MQ16_SC14_TealorStart)
     PlayerREF.MoveTo(MQ16_SC14_PlayerWoundedMarkerFailsave)
     _00E_ShatterSoulDarkFlamesShader.Play(MQ16_SC14_YuslanDeadREF)
@@ -868,7 +892,11 @@ Function PosessYuslan()
     
     MQ16_SC14_YuslanDeadREF.RegenerateHead()
     MQ16_SC14_YuslanDeadREF.PlaceAtMe(_00E_MQ16_HighOnesRedLight)
+	
+	if SKSE.GetVersion()
 		MQ16_SC14_YuslanDeadREF.GetActorBase().SetName(_00E_MQ16_sHighOnesThroughYuslan.GetName())
+	endif
+	
     GhostRedFXShader.Play(MQ16_SC14_YuslanDeadREF)
     MQ16_SC14_YuslanDeadREF.AddSpell(_00E_AbPosessed)
     _00E_VisionGlimpseWhisperM.Play(MQ16_SC14_YuslanDeadREF)

source/scripts/_00e_theriantrophist_chymikum.psc

@@ -26,7 +26,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		Endif
 
 		if playerWhileTransformedAlias.CalcRegisteredChymikumCount() > (_00E_FS_Theriantrophist_MaxChymikums.GetValueInt() - 1)
-			Debug.Notification(_00E_Theriantrophist_TooManyChyimkums.getName())
+			_00E_Theriantrophist_TooManyChyimkums.Show()
 			_00E_Theriantrophist_PoisonOnWerewolfPotion.Cast(akTarget)
 			self.dispel()
 			return

source/scripts/magicsoultrapfxscript.psc

@@ -173,20 +173,31 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster)
 			if(soulTrapped == true)
 				victim.SetActorValue("PerceptionCondition", 0)
 				PlayEffects(caster, victim)
+				bool bSKSE = SKSE.GetVersion() > 0
 				if soulType=="Petty"
+					if bSKSE
 						Debug.Notification(_00E_SoulPetty.GetName()+" "+_00E_SuccessfulTrapping.GetName())
+					endif
 					SoulsCaught.SetValueInt(SoulsCaught.GetValueInt()+1)
 				elseif soulType=="Lesser"
+					if bSKSE
 						Debug.Notification(_00E_SoulLesser.GetName()+" "+_00E_SuccessfulTrapping.GetName())
+					endif
 					SoulsCaught.SetValueInt(SoulsCaught.GetValueInt()+1)
 				elseif soulType=="Common"
+					if bSKSE
 						Debug.Notification(_00E_SoulCommon.GetName()+" "+_00E_SuccessfulTrapping.GetName())
+					endif
 					SoulsCaught.SetValueInt(SoulsCaught.GetValueInt()+1)
 				elseif soulType =="Greater"
+					if bSKSE
 						Debug.Notification(_00E_SoulGreater.GetName()+" "+_00E_SuccessfulTrapping.GetName())
+					endif
 					SoulsCaught.SetValueInt(SoulsCaught.GetValueInt()+1)
 				elseif soulType =="Grand"
+					if bSKSE
 						Debug.Notification(_00E_SoulGrand.GetName()+" "+_00E_SuccessfulTrapping.GetName())
+					endif
 					SoulsCaught.SetValueInt(SoulsCaught.GetValueInt()+1)
 				else
 					_00E_SoulHuman.show()

source/scripts/tif__0013cee0.psc

@@ -6,11 +6,9 @@ Scriptname TIF__0013CEE0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-_00E_PlayerFunctions.GetSympathyControl().ModSympathyNG(akSpeaker, -15, false, true, _00E_Levelsystem_sIsHurt.GetName())
+_00E_PlayerFunctions.GetSympathyControl().ModSympathyNG(akSpeaker, -15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
 
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
-
-Message Property _00E_Levelsystem_sIsHurt Auto

source/scripts/tif__0013cee9.psc

@@ -6,7 +6,11 @@ Scriptname TIF__0013CEE9 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
+if SKSE.GetVersion()
 	Debug.Notification("Jespar" + _00E_Levelsystem_sDoesNotTrust.GetName())
+else
+	Debug.Notification("Jespar does not trust you enough.")
+endif
 ;END CODE
 EndFunction
 ;END FRAGMENT

source/scripts/tif__0013fa6a.psc

@@ -15,11 +15,9 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-_00E_PlayerFunctions.GetSympathyControl().ModSympathyNG(akSpeaker, -50, false, true, _00E_Levelsystem_sExtremelyHurt.GetName())
+_00E_PlayerFunctions.GetSympathyControl().ModSympathyNG(akSpeaker, -50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
 
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment
-
-Message Property _00E_Levelsystem_sExtremelyHurt Auto