Skip to content

Commit

Permalink
Commented debug.trace lines. Again.
Browse files Browse the repository at this point in the history
  • Loading branch information
Verteiron committed Jul 4, 2014
1 parent a0ce84b commit 8cf6878
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
28 changes: 14 additions & 14 deletions dist/Data/scripts/Source/vMYC_CharacterDummyActorScript.psc
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Event OnUpdate()
SendModEvent("vMYC_CharacterReady",CharacterName)
EndIf
If !CharacterManager.GetLocalInt(CharacterName,"InAlcove") && !IsAIEnabled()
Debug.Trace("MYC: (" + CharacterName + "/Actor) AI disabled while InAlcove is false, enabling AI!")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) AI disabled while InAlcove is false, enabling AI!")
EnableAI(True)
EndIf
RegisterForSingleUpdate(5.0)
Expand All @@ -175,7 +175,7 @@ Event OnActivate(ObjectReference akActionRef)
EndIf
If !_bWarnedVoiceTypeNoFollower
If GetFactionRank(CurrentFollowerFaction) == -1 && CharacterManager.vMYC_VoiceTypesFollowerList.Find(kVoiceType) == -1
Debug.Trace("MYC: (" + CharacterName + "/Actor) Warning player about missing Follower VoiceType!")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) Warning player about missing Follower VoiceType!")
Message.ResetHelpMessage("VoiceTypeNoFollower")
vMYC_VoiceTypeNoFollower.ShowAsHelpMessage("VoiceTypeNoFollower",8,240,1)
_bWarnedVoiceTypeNoFollower = True
Expand All @@ -185,7 +185,7 @@ Event OnActivate(ObjectReference akActionRef)
If GetFactionRank(PotentialMarriageFaction) > -2 && CharacterManager.vMYC_VoiceTypesSpouseList.Find(kVoiceType) == -1
Armor kAmuletOfMara = GetFormFromFile(0x000C891B,"Skyrim.esm") as Armor
If PlayerREF.IsEquipped(kAmuletOfMara)
Debug.Trace("MYC: (" + CharacterName + "/Actor) Warning player about missing Spouse VoiceType!")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) Warning player about missing Spouse VoiceType!")
Message.ResetHelpMessage("VoiceTypeNoSpouse")
vMYC_VoiceTypeNoSpouse.ShowAsHelpMessage("VoiceTypeNoSpouse",8,240,1)
_bWarnedVoiceTypeNoSpouse = True
Expand Down Expand Up @@ -285,7 +285,7 @@ Event OnUpdateCharacterSpellList(string eventName, string strArg, float numArg,
EndIf
EndWhile
If iAdded || iRemoved
Debug.Trace("MYC: (" + CharacterName + "/Actor): Added " + iAdded + " spells, removed " + iRemoved)
;Debug.Trace("MYC: (" + CharacterName + "/Actor): Added " + iAdded + " spells, removed " + iRemoved)
EndIf
EndEvent

Expand Down Expand Up @@ -380,7 +380,7 @@ EndFunction

Function SyncCharacterData()
If CharacterManager.GetLocalFlt(CharacterName,"PlayTime") != CharacterManager.GetCharacterFlt(CharacterName,"_MYC.PlayTime")
Debug.Trace("MYC: (" + CharacterName + "/Actor) Our source data has changed!")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) Our source data has changed!")
;RemoveAllItems(PlayerREF)
Int iResult
CharacterManager.SetLocalFlt(CharacterName,"PlayTime",CharacterManager.GetCharacterFlt(CharacterName,"_MYC.PlayTime"))
Expand Down Expand Up @@ -516,16 +516,16 @@ EndFunction

Function RefreshMeshNewCG()
GotoState("Busy")
Debug.Trace("MYC: (" + CharacterName + "/Actor) is loading CharGen(3) data for " + CharacterName + ". Race is " + CharacterRace)
;Debug.Trace("MYC: (" + CharacterName + "/Actor) is loading CharGen(3) data for " + CharacterName + ". Race is " + CharacterRace)
While vMYC_CharGenLoading.GetValue()
Debug.Trace("MYC: (" + CharacterName + "/Actor) Waiting for LoadCharacter to become available...")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) Waiting for LoadCharacter to become available...")
Wait(0.5)
EndWhile
;vMYC_CharGenLoading.Mod(1)
; Race kDummyRace = GetFormFromFile(0x00067CD8,"Skyrim.esm") as Race ; ElderRace
; SetRace(kDummyRace)
; Wait(5)
; Debug.Trace("MYC: (" + CharacterName + "/Actor) regeneratehead")
; ;Debug.Trace("MYC: (" + CharacterName + "/Actor) regeneratehead")
; RegenerateHead()
; Wait(5)
;CharGen.LoadCharacter(Self, kDummyRace, CharacterName)
Expand All @@ -540,23 +540,23 @@ Function RefreshMeshNewCG()
Bool bLCSuccess = CharGen.LoadCharacter(Self, CharacterRace, CharacterName)
Int iSafetyTimer = 30
While !bLCSuccess && iSafetyTimer > 0
Debug.Trace("MYC: (" + CharacterName + "/Actor) LoadCharacter failed, retrying...")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) LoadCharacter failed, retrying...")
iSafetyTimer -= 1
Wait(RandomFloat(0.5,2))
bLCSuccess = CharGen.LoadCharacter(Self, CharacterRace, CharacterName)
EndWhile
If bLCSuccess
Debug.Trace("MYC: (" + CharacterName + "/Actor) LoadCharacter succeeded with " + iSafetyTimer + "tries remaining!")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) LoadCharacter succeeded with " + iSafetyTimer + "tries remaining!")
EndIf
Else
Debug.MessageBox("Familiar Faces\nThe slot file for " + CharacterName + " is missing. This means either RaceMenu/CharGen is out of date, or the file has been removed since it was saved. Either way, appearance data cannot be loaded for " + CharacterName)
EndIf
SetNameIfNeeded()
; Wait(5)
; Debug.Trace("MYC: (" + CharacterName + "/Actor) regeneratehead")
; ;Debug.Trace("MYC: (" + CharacterName + "/Actor) regeneratehead")
; RegenerateHead()
; Wait(5)
; Debug.Trace("MYC: (" + CharacterName + "/Actor) queueninodeupdate")
; ;Debug.Trace("MYC: (" + CharacterName + "/Actor) queueninodeupdate")
; QueueNiNodeUpdate()
_kActorBase.SetInvulnerable(False)
;vMYC_CharGenLoading.Mod(-1)
Expand All @@ -571,7 +571,7 @@ Function RefreshMesh()

_kActorBase.SetInvulnerable(True)

Debug.Trace("MYC: (" + CharacterName + "/Actor) is loading CharGen(2) data for " + CharacterName + ". Race is " + CharacterRace)
;Debug.Trace("MYC: (" + CharacterName + "/Actor) is loading CharGen(2) data for " + CharacterName + ". Race is " + CharacterRace)

Int iMyTurn = vMYC_CharGenLoading.GetValue() as Int
vMYC_CharGenLoading.Mod(1)
Expand Down Expand Up @@ -636,7 +636,7 @@ Function RefreshMesh()
EndWhile

If bSuccess
Debug.Trace("MYC: (" + CharacterName + "/Actor) loaded successfully!")
;Debug.Trace("MYC: (" + CharacterName + "/Actor) loaded successfully!")
Else
Debug.Trace("MYC: (" + CharacterName + "/Actor) FAILED! :(",1)
EndIf
Expand Down
14 changes: 7 additions & 7 deletions dist/Data/scripts/Source/vMYC_ShrineAlcoveController.psc
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,11 @@ Event OnAlcoveValidateState(string eventName, string strArg, float numArg, Form
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": OnAlcoveValidateState!")
If AlcoveLightState == 1 && !_bPlayerIsSaving
If AlcoveState == 0
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": ValidateState: Lighting state was 1, should be 0!")
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": ValidateState: Lighting state was 1, should be 0!")
AlcoveLightState = 0
HideTrophies()
ElseIf AlcoveState == 2 || AlcoveState == 3
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": ValidateState: Lighting state was 1, should be 2!")
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": ValidateState: Lighting state was 1, should be 2!")
AlcoveLightState = 2
ShowTrophies()
EndIf
Expand All @@ -365,7 +365,7 @@ Event OnAlcoveLightStateChange(string eventName, string strArg, float numArg, Fo
If !Is3DLoaded()
bUseTranslation = False
EndIf
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Setting light state to " + numArg as Int + ", current state is " + _iAlcoveLightState)
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Setting light state to " + numArg as Int + ", current state is " + _iAlcoveLightState)
Int iOldLightState = _iAlcoveLightState
Int iLightState = numArg as Int
_LightAmbientTarget = _Light.GetLinkedRef()
Expand Down Expand Up @@ -436,7 +436,7 @@ Event OnAlcoveLightStateChange(string eventName, string strArg, float numArg, Fo
OnAlcoveLightStateChange(eventName, strArg, numArg, sender)
EndIf
_iAlcoveLightState = iLightState ; Set internal property value
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Set light state to " + _iAlcoveLightState + "!")
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Set light state to " + _iAlcoveLightState + "!")
RegisterForModEvent("vMYC_AlcoveLightStateComplete","OnAlcoveLightStateComplete")
SendModEvent("vMYC_AlcoveLightStateComplete","",_iAlcoveLightState)
EndEvent
Expand Down Expand Up @@ -492,7 +492,7 @@ Function ActivateAlcove(Bool abAutoLights = True, Bool abBackground = True)
HideTrophies()
Return
EndIf
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Activating. Auto lights:" + abAutoLights)
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Activating. Auto lights:" + abAutoLights)
If abAutoLights
AlcoveLightState = 1
EndIf
Expand Down Expand Up @@ -548,7 +548,7 @@ Function DeactivateAlcove(Bool abAutoLights = True, Bool abBackground = True)
SendModEvent("vMYC_AlcoveBackground","Deactivate",abAutoLights as Int)
Return
EndIf
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Deactivating. Auto lights:" + abAutoLights)
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Deactivating. Auto lights:" + abAutoLights)
If _kCharacter && !_bCharacterSummoned ; make sure we don't yank the character back if they're summoned
ObjectReference kNowhere = GetFormFromFile(0x02004e4d,"vMYC_MeetYourCharacters.esp") as ObjectReference ; Marker in vMYC_StagingCell
_kCharacter.MoveTo(kNowhere)
Expand Down Expand Up @@ -917,7 +917,7 @@ Function SummonCharacter()
sCellName = _kCharacter.GetParentCell().GetName()
EndIf
If sCellName == "vMYC_Staging"
Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Character got lost, sending them on...")
;Debug.Trace("MYC/Shrine/Alcove" + _iAlcoveIndex + ": Character got lost, sending them on...")
ObjectReference kMarkerObject = CharacterManager.CustomMapMarkers[CharacterManager.GetLocalInt(CharacterName, "HangoutIndex")]
_kCharacter.MoveTo(kMarkerObject)
EndIf
Expand Down
14 changes: 7 additions & 7 deletions dist/Data/scripts/Source/vMYC_ShrineOfHeroesQuestScript.psc
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ Function UpdateShrineNames()
i += 1
EndWhile

Debug.Trace("MYC/Shrine: Alcoves changing: " + iAlcoveChangeCount)
;Debug.Trace("MYC/Shrine: Alcoves changing: " + iAlcoveChangeCount)

Debug.Trace("MYC/Shrine: Waiting for changed alcoves to empty...")
;Debug.Trace("MYC/Shrine: Waiting for changed alcoves to empty...")
Int iAlcoveStateSum = 100
Int iSafetyTimer = 10
While iAlcoveStateSum && iSafetyTimer
Expand All @@ -181,7 +181,7 @@ Function UpdateShrineNames()
EndIf
i += 1
EndWhile
Debug.Trace("MYC/Shrine: iAlcoveStateSum: " + iAlcoveStateSum)
;Debug.Trace("MYC/Shrine: iAlcoveStateSum: " + iAlcoveStateSum)
EndWhile

i = 0
Expand All @@ -191,7 +191,7 @@ Function UpdateShrineNames()
;Debug.Trace("MYC/Shrine: Alcove" + i + ".Controller is " + JValue.solveForm(_jShrineData,".Alcove" + i + ".Controller") + "!")
vMYC_ShrineAlcoveController kAlcove = JArray.getForm(jShrineArray,i) as vMYC_ShrineAlcoveController
If sCharacterName != kAlcove.CharacterName
Debug.Trace("MYC/Shrine: Alcove" + i + " CharacterName (from alcove) is " + kAlcove.CharacterName + " and should be " + sCharacterName + "!")
;Debug.Trace("MYC/Shrine: Alcove" + i + " CharacterName (from alcove) is " + kAlcove.CharacterName + " and should be " + sCharacterName + "!")
If kAlcove.CharacterName && !sCharacterName
kAlcove.CharacterName = sCharacterName
kAlcove.AlcoveLightState = 0
Expand Down Expand Up @@ -238,7 +238,7 @@ Bool Function SyncShrineData(Bool abForceLoadFile = False, Bool abRewriteFile =
If JMap.hasKey(jSavedShrineData,"DataSerial")
iSavedDataSerial = JMap.getInt(jSavedShrineData,"DataSerial")
Else
Debug.Trace("MYC/Shrine: Shrine data is from an older version, forcing an update...")
;Debug.Trace("MYC/Shrine: Shrine data is from an older version, forcing an update...")
abForceLoadFile = True
abRewriteFile = True
EndIf
Expand All @@ -248,11 +248,11 @@ Bool Function SyncShrineData(Bool abForceLoadFile = False, Bool abRewriteFile =
iSavedDataSerial = ShrineDataSerial + 1
EndIf
If iSavedDataSerial > ShrineDataSerial
Debug.Trace("MYC/Shrine: Our data is old, updating it to saved version!")
;Debug.Trace("MYC/Shrine: Our data is old, updating it to saved version!")
JMap.setObj(_jMYC,"ShrineOfHeroes",jSavedShrineData)
_jShrineData = JMap.getObj(_jMYC,"ShrineOfHeroes")
ElseIf iSavedDataSerial < ShrineDataSerial
Debug.Trace("MYC/Shrine: Our data is newer than the saved data, so we'll save it to the file.")
;Debug.Trace("MYC/Shrine: Our data is newer than the saved data, so we'll save it to the file.")
JValue.WriteToFile(_jShrineData,"Data/vMYC/_ShrineOfHeroes.json")
iSavedDataSerial = ShrineDataSerial
Else
Expand Down

0 comments on commit 8cf6878

Please sign in to comment.