1.5.16

Ultrinik · Oct 6, 2024 · ccfb867 · ccfb867
1 parent b896bc2
commit ccfb867
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/heaven's call/metadata.xml b/heaven's call/metadata.xml
@@ -74,7 +74,7 @@ A once cheerful and expresfull rabbit, not tainted by the penance of the light.
 [*] [url=https://twitter.com/Aladar_C137] Aladar[/url]: Creator of the original concept for Venus. 
 [/list] 
 [h1][b] If you are going to report a bug or post a suggestion, please do so in the appropriate discussion. [/b][/h1]</description>
-    <version>1.5.15</version>
+    <version>1.5.17</version>
     <visibility>Public</visibility>
     <tag id="Lua"/>
     <tag id="Items"/>

diff --git a/heaven's call/scripts/newrooms.lua b/heaven's call/scripts/newrooms.lua
@@ -216,7 +216,7 @@ function mod:AstralRoomGenerator()
 
 	local corpseFlag = ( (level:GetStage() == LevelStage.STAGE4_1 or level:GetStage() == LevelStage.STAGE4_2) and ( level:GetStageType() == StageType.STAGETYPE_REPENTANCE or level:GetStageType() == StageType.STAGETYPE_REPENTANCE_B ))
 
-	if (level:GetStage() < LevelStage.STAGE5 and not corpseFlag) and not mod.savedata.planetAlive and not mod.savedata.planetKilled1 then
+	if (level:GetStage() < LevelStage.STAGE5 and not (corpseFlag or (LastJudgement and LastJudgement.STAGE.Mortis:IsStage()) ) ) and not mod.savedata.planetAlive and not mod.savedata.planetKilled1 then
 		--If the room can spawn, the chance is 0.2
 		if level:GetStage() >= stageMin and level:GetStage() <= stageLimit and not game:IsGreedMode() and not level:IsAscent() then
 			if mod.ModConfigs.roomSpawnChance == nil then mod.ModConfigs.roomSpawnChance = 9 end
@@ -227,7 +227,7 @@ function mod:AstralRoomGenerator()
 			end
 		end
 
-	elseif (level:GetStage() == LevelStage.STAGE5 or corpseFlag) and not mod.savedata.planetAlive and not mod.savedata.planetKilled2 then
+	elseif (level:GetStage() == LevelStage.STAGE5 or corpseFlag or (LastJudgement and LastJudgement.STAGE.Mortis:IsStage()) ) and not mod.savedata.planetAlive and not mod.savedata.planetKilled2 then
 		if mod.ModConfigs.roomSpawnChance2 == nil then mod.ModConfigs.roomSpawnChance2 = 30 end
 		spawnChance = mod.ModConfigs.roomSpawnChance2/100
 		if corpseFlag then

diff --git a/heaven's call/scripts/roomgen.lua b/heaven's call/scripts/roomgen.lua
@@ -117,7 +117,7 @@ function mod:GenerateRoomFromDataset(dataset, onnewlevel)
 	local level = game:GetLevel()
 	local data = nil
 
-	if (level:GetStage() == LevelStage.STAGE5 or ( (level:GetStage() == LevelStage.STAGE4_1 or level:GetStage() == LevelStage.STAGE4_2) and ( level:GetStageType() == StageType.STAGETYPE_REPENTANCE or level:GetStageType() == StageType.STAGETYPE_REPENTANCE_B ))) then
+	if (level:GetStage() == LevelStage.STAGE5 or ( (level:GetStage() == LevelStage.STAGE4_1 or level:GetStage() == LevelStage.STAGE4_2) and ( level:GetStageType() == StageType.STAGETYPE_REPENTANCE or level:GetStageType() == StageType.STAGETYPE_REPENTANCE_B ))) or (LastJudgement and LastJudgement.STAGE.Mortis:IsStage()) then
 		data = dataset[mod:RandomInt(mod.minvariant2,mod.maxvariant2)]
 	else
 		data = dataset[mod:RandomInt(mod.minvariant1,mod.maxvariant1)]