v0.3 release

kaosnyrb · May 1, 2020 · 752a0da · 752a0da
1 parent be2a875
commit 752a0da
Show file tree

Hide file tree

Showing 24 changed files with 5 additions and 18 deletions.
diff --git a/Undaunted/RewardUtils.cpp b/Undaunted/RewardUtils.cpp
@@ -26,22 +26,13 @@ namespace Undaunted
 		bool found = false;
 		while (!found)
 		{
-			ModInfo* mod;
-			dataHandler->modList.loadedMods.GetNthItem(rand() % dataHandler->modList.loadedMods.count, mod);
-			_MESSAGE("Loading Reward from: %s ", mod->name);
-			const ModInfo* modInfo = dataHandler->LookupModByName(mod->name);
 			int type = rand() % 2;
 			TESObjectWEAP* weapon = NULL;
 			TESObjectARMO* armour = NULL;
 			//type = 0;
 			switch (type)
 			{
 			case 0:
-				if (dataHandler->weapons.count == 0)
-				{
-					_MESSAGE("No weapons found in: %s ", mod->name);
-					break;
-				}
 				dataHandler->weapons.GetNthItem(rand() % dataHandler->weapons.count, weapon);
 				if (!weapon->IsPlayable()) continue;
 				if (!weapon->Has3D()) continue;
@@ -50,11 +41,6 @@ namespace Undaunted
 				if (!IsWeaponLevelOk(weapon, playerlevel)) continue;
 				return weapon->formID;
 			case 1:
-				if (dataHandler->armors.count == 0)
-				{
-					_MESSAGE("No armors found in: %s ", mod->name);
-					break;
-				}		
 				dataHandler->armors.GetNthItem(rand() % dataHandler->armors.count, armour);
 				if(exclude.find(armour) != exclude.end())
 				if (armour->IsPlayable()) continue;

diff --git a/datafiles/SKSE/Plugins/Undaunted.dll b/datafiles/SKSE/Plugins/Undaunted.dll
diff --git a/datafiles/Scripts/Undaunted_Activator.pex b/datafiles/Scripts/Undaunted_Activator.pex
diff --git a/datafiles/Scripts/Undaunted_RewardActivator.pex b/datafiles/Scripts/Undaunted_RewardActivator.pex
diff --git a/datafiles/Scripts/Undaunted_SetScale.pex b/datafiles/Scripts/Undaunted_SetScale.pex
diff --git a/datafiles/Scripts/Undaunted_SystemScript.pex b/datafiles/Scripts/Undaunted_SystemScript.pex
diff --git a/datafiles/Scripts/Undaunted_TestQuest01.pex b/datafiles/Scripts/Undaunted_TestQuest01.pex
diff --git a/datafiles/Source/Scripts/Undaunted_Activator.psc b/datafiles/Source/Scripts/Undaunted_Activator.psc
@@ -19,6 +19,7 @@ EndEvent
 
 int Function StartEvent()
 	if (!isSystemReady())
+		Debug.Notification("Undaunted initialising...")
 		int BadRegionList = JValue.readFromFile("Data/Undaunted/BadRegion.json")
 		int bri = JValue.count(BadRegionList)
 		while bri > 0
@@ -81,7 +82,7 @@ Event OnUpdate()
 		UnregisterForUpdate()
 		return
 	EndIf
-	Debug.Notification("questProperty Stage: " + QuestStage.GetValue())
+	;Debug.Notification("questProperty Stage: " + QuestStage.GetValue())
 	if (!isSystemReady())
 		;If we've got here something has gone wrong. Force a refresh.
 		StartEvent()

diff --git a/datafiles/Source/Scripts/Undaunted_RewardActivator.psc b/datafiles/Source/Scripts/Undaunted_RewardActivator.psc
@@ -7,9 +7,9 @@ Quest Property questProperty  Auto
 GlobalVariable Property QuestStage  auto
 
 event onActivate(objectReference akActivator)
-    Debug.Notification("questProperty Stage: " + questProperty.GetCurrentStageID())
+    ;Debug.Notification("questProperty Stage: " + questProperty.GetCurrentStageID())
     if (QuestStage.GetValue() == 20)
-        SpawnRandomReward(RewardMarker)
+        SpawnRandomReward(RewardMarker,Game.GetPlayer().GetLevel())
         questProperty.SetCurrentStageID(30)
         QuestStage.SetValue(30)
     endif

diff --git a/datafiles/Source/Scripts/Undaunted_SystemScript.psc b/datafiles/Source/Scripts/Undaunted_SystemScript.psc
@@ -20,4 +20,4 @@ bool Function SetXMarker(objectReference markerref) global native
 
 float Function StartBounty(String WorldspaceName) global native
 
-Function SpawnRandomReward(objectReference markerref) global native
+Function SpawnRandomReward(objectReference markerref,int playerlevel) global native
diff --git a/datafiles/meshes/undaunted/platform.nif b/datafiles/meshes/undaunted/platform.nif
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/door.dds b/datafiles/textures/daedra returns/architecture/sigiltower/door.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/door_em.dds b/datafiles/textures/daedra returns/architecture/sigiltower/door_em.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/flesh.dds b/datafiles/textures/daedra returns/architecture/sigiltower/flesh.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/membrane.dds b/datafiles/textures/daedra returns/architecture/sigiltower/membrane.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/membrane_n.dds b/datafiles/textures/daedra returns/architecture/sigiltower/membrane_n.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/rhtrim.dds b/datafiles/textures/daedra returns/architecture/sigiltower/rhtrim.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/rhwall.dds b/datafiles/textures/daedra returns/architecture/sigiltower/rhwall.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/rhwall_n.dds b/datafiles/textures/daedra returns/architecture/sigiltower/rhwall_n.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/seruinsdoor01.psd b/datafiles/textures/daedra returns/architecture/sigiltower/seruinsdoor01.psd
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/sigilfloor01.dds b/datafiles/textures/daedra returns/architecture/sigiltower/sigilfloor01.dds
diff --git a/datafiles/textures/daedra returns/architecture/sigiltower/sigilfloor01test.dds b/datafiles/textures/daedra returns/architecture/sigiltower/sigilfloor01test.dds
diff --git a/x64/Debug/Undaunted.ilk b/x64/Debug/Undaunted.ilk
diff --git a/x64/Debug/Undaunted.pdb b/x64/Debug/Undaunted.pdb
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ bool Function SetXMarker(objectReference markerref) global native

		float Function StartBounty(String WorldspaceName) global native

		Function SpawnRandomReward(objectReference markerref) global native
		Function SpawnRandomReward(objectReference markerref,int playerlevel) global native