Skip to content

Commit

Permalink
1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ultrinik
Ultrinik committed Nov 15, 2023
1 parent 896220a commit 4d3049f
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 20 deletions.
2 changes: 1 addition & 1 deletion heaven's call/content/items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<trinket name=" Red key? " id="32" description="..." gfx="trinket_redkey.png" achievement="700"/>
<trinket name=" Plunger " id="33" description="..." gfx="trinket_plunger.png" achievement="700"/>
<trinket name=" Bible " id="34" description="..." gfx="trinket_bible.png" achievement="700"/>
<familiar name="CATCATCATCATCATCAT" id="40" description="..." quality="0" craftquality="-1" gfx="collectibles_109_luna.png" tags="uniquefamiliar noeden quest" special="true" hidden="true" achievement="700"/>
<familiar name="CATCATCATCATCATCAT" id="40" description="..." quality="0" craftquality="-1" cache="familiars" gfx="collectibles_109_luna.png" tags="uniquefamiliar noeden quest" special="true" hidden="true" achievement="700"/>

<familiar name="Lil Jupiter" id="9" description="Gas dwarf" quality="0" craftquality="-1" gfx="collectibles_109_lilJupiter.png" tags="uniquefamiliar noeden quest cansacrifice" special="true" hidden="true" />
<familiar name="Lil Saturn" id="10" description="Back to the future" quality="0" craftquality="-1" gfx="collectibles_109_lilSaturn.png" tags="uniquefamiliar noeden quest cansacrifice" special="true" hidden="true" />
Expand Down
Binary file modified heaven's call/content/rooms/00.special rooms.stb
View file
Binary file not shown.
77 changes: 67 additions & 10 deletions heaven's call/content/rooms/00.special rooms.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2944,6 +2944,12 @@
<spawn x="3" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="4" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="8" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -3031,6 +3037,12 @@
<spawn x="3" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="4" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="8" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -3142,9 +3154,6 @@
<spawn x="8" y="2">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="4" y="3">
<entity type="1930" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="3" y="4">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -3382,6 +3391,9 @@
<spawn x="3" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="4" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="0">
<entity type="203" variant="0" subtype="3" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -3463,6 +3475,9 @@
<spawn x="3" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="4" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="6">
<entity type="5" variant="20" subtype="1" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -3733,6 +3748,9 @@
<door exists="True" x="6" y="-1"/>
<door exists="True" x="6" y="7"/>
<door exists="False" x="13" y="3"/>
<spawn x="10" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="11" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand All @@ -3746,7 +3764,7 @@
<entity type="5" variant="40" subtype="6" weight="1.0"/>
</spawn>
<spawn x="9" y="1">
<entity type="1000" variant="0" subtype="1" weight="1.0"/>
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="1">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
Expand All @@ -3758,7 +3776,7 @@
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="2">
<entity type="1000" variant="0" subtype="1" weight="1.0"/>
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="2">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
Expand All @@ -3770,19 +3788,19 @@
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="3">
<entity type="1000" variant="0" subtype="1" weight="1.0"/>
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="3">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
<entity type="33" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="11" y="3">
<entity type="33" variant="0" subtype="0" weight="1.0"/>
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="12" y="3">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="4">
<entity type="1000" variant="0" subtype="1" weight="1.0"/>
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="4">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
Expand All @@ -3797,7 +3815,7 @@
<entity type="5" variant="20" subtype="6" weight="1.0"/>
</spawn>
<spawn x="9" y="5">
<entity type="1000" variant="0" subtype="1" weight="1.0"/>
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="5">
<entity type="1901" variant="0" subtype="0" weight="1.0"/>
Expand All @@ -3808,6 +3826,9 @@
<spawn x="12" y="5">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="11" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -5158,12 +5179,18 @@
<spawn x="1" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="2" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="3" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="11" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -5272,12 +5299,18 @@
<spawn x="1" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="2" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="3" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="10" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="11" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -5332,6 +5365,9 @@
<door exists="True" x="6" y="-1"/>
<door exists="True" x="6" y="7"/>
<door exists="True" x="13" y="3"/>
<spawn x="8" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -5389,6 +5425,9 @@
<spawn x="12" y="5">
<entity type="1940" variant="0" subtype="0" weight="1.0"/>
</spawn>
<spawn x="8" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="9" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -5800,6 +5839,9 @@
<door exists="False" x="19" y="-1"/>
<door exists="False" x="19" y="7"/>
<door exists="False" x="26" y="3"/>
<spawn x="0" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="1" y="0">
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand All @@ -5812,6 +5854,9 @@
<spawn x="25" y="0">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="0" y="1">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="1" y="1">
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand All @@ -5827,6 +5872,9 @@
<spawn x="25" y="1">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="0" y="2">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="1" y="2">
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand Down Expand Up @@ -5854,6 +5902,9 @@
<spawn x="25" y="3">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="0" y="4">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="1" y="4">
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand All @@ -5866,6 +5917,9 @@
<spawn x="25" y="4">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="0" y="5">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="1" y="5">
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand All @@ -5881,6 +5935,9 @@
<spawn x="25" y="5">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="0" y="6">
<entity type="999" variant="116" subtype="0" weight="1.0"/>
</spawn>
<spawn x="1" y="6">
<entity type="1900" variant="0" subtype="0" weight="1.0"/>
</spawn>
Expand Down
3 changes: 2 additions & 1 deletion heaven's call/metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,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.2</version>
<version>1.5.4</version>
<visibility>Public</visibility>
<tag id="Lua"/>
<tag id="Items"/>
Expand All @@ -78,6 +78,7 @@ A once cheerful and expresfull rabbit, not tainted by the penance of the light.
<tag id="Pickups"/>
<tag id="Familiars"/>
<tag id="Rooms"/>
<tag id="Floors"/>
<tag id="Enemies"/>
<tag id="Bosses"/>
<tag id="Challenges"/>
Expand Down
5 changes: 5 additions & 0 deletions heaven's call/scripts/errantchallenge/entities.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1231,3 +1231,8 @@ function mod:SolLightUpdate(entity)
end
end
mod:AddCallback(ModCallbacks.MC_POST_EFFECT_UPDATE, mod.SolLightUpdate, mod.EntityCircleData.VAR)

--PICKUPS
function mod:EverchangerPickupInit(entity)
entity:GetSprite():Play("Appear", true)
end
9 changes: 8 additions & 1 deletion heaven's call/scripts/errantchallenge/everchanger.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function mod:EverchangerUpdate(entity)
data.HasSawPlayer = false
data.Direction = (target.Position - entity.Position):Normalized()
data.BattleSpeed = data.BattleSpeed or 1
data.CatchSpeed = data.CatchSpeed or 0

entity:AddEntityFlags(EntityFlag.FLAG_NO_TARGET)
entity:AddEntityFlags(EntityFlag.FLAG_NO_FLASH_ON_DAMAGE)
Expand Down Expand Up @@ -97,14 +98,20 @@ end
mod:AddCallback(ModCallbacks.MC_NPC_UPDATE, mod.EverchangerUpdate, ID)

function mod:EverchangerCatch(entity, sprite, data, target)
local speed = data.CatchSpeed
data.CatchSpeed = math.max(data.CatchSpeed+0.05, 5)

local direction = target.Position - entity.Position
direction = direction:Normalized()

entity.Velocity = entity.Velocity*0.5 + direction*5
entity.Velocity = entity.Velocity:Normalized()*speed

if entity.Position:Distance(target.Position) < (target.Size + entity.Size + 10) then
entity:Remove()
mod:TriggerEverchangerBattle()
mod:scheduleForUpdate(function()
mod:TriggerEverchangerBattle()
end, 2)
end
end
function mod:EverchangerBattle(entity, sprite, data, target)
Expand Down
14 changes: 7 additions & 7 deletions heaven's call/scripts/errantchallenge/everchangermain.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ function mod:EverchangerCallbacks(init)
mod:RemoveCallback(ModCallbacks.MC_NPC_UPDATE, mod.ShopkeeperUpdate, EntityType.ENTITY_SHOPKEEPER)
mod:RemoveCallback(ModCallbacks.MC_POST_PICKUP_INIT, mod.AntiGoldBomb, PickupVariant.PICKUP_BOMB)
mod:RemoveCallback(ModCallbacks.MC_POST_BOMB_UPDATE, mod.EverchangerBombUpdate, BombVariant.BOMB_NORMAL)
mod:RemoveCallback(ModCallbacks.MC_POST_PICKUP_INIT, mod.EverchangerPickupInit)

if init then
mod:AddCallback(ModCallbacks.MC_POST_RENDER, mod.KeepMusicGoing)
Expand All @@ -108,6 +109,7 @@ function mod:EverchangerCallbacks(init)
mod:AddCallback(ModCallbacks.MC_NPC_UPDATE, mod.ShopkeeperUpdate, EntityType.ENTITY_SHOPKEEPER)
mod:AddCallback(ModCallbacks.MC_POST_PICKUP_INIT, mod.AntiGoldBomb, PickupVariant.PICKUP_BOMB)
mod:AddCallback(ModCallbacks.MC_POST_BOMB_UPDATE, mod.EverchangerBombUpdate, BombVariant.BOMB_NORMAL)
mod:AddCallback(ModCallbacks.MC_POST_PICKUP_INIT, mod.EverchangerPickupInit)
end
end

Expand Down Expand Up @@ -494,10 +496,10 @@ function mod:StartEverchangerEntity()
sfx:Play(Isaac.GetSoundIdByName("QuantumThunder"),1.3)
end
end
function mod:ResetEverchangerEntity()
function mod:ResetEverchangerEntity(currentIdx)
if flags.enabledErrant then

local currentIdx = game:GetLevel():GetCurrentRoomIndex()
currentIdx = currentIdx or game:GetLevel():GetCurrentRoomIndex()
local x = currentIdx % 13
local respawnIdx = 63
if x > 5 then
Expand Down Expand Up @@ -954,6 +956,8 @@ function mod:OnEverchangerNewRoom()

if not player:HasCollectible(mod.EverchangerTrinkets.guppy) then
player:AddCollectible(mod.EverchangerTrinkets.guppy)
player:CheckFamiliar(FamiliarVariant.LEECH, 1, player:GetCollectibleRNG(mod.EverchangerTrinkets.guppy), Isaac.GetItemConfig():GetCollectible(mod.EverchangerTrinkets.guppy), 160)

end

end
Expand Down Expand Up @@ -1200,7 +1204,7 @@ function mod:FinishEverchangerBattle(forceStart, lost)
player.Position = game:GetRoom():GetCenterPos()+Vector(0,60)
end, 2)
end
mod:ResetEverchangerEntity()
mod:ResetEverchangerEntity(flags.lastRoom)

local t1 = player:GetTrinket(0)
local t2 = player:GetTrinket(1)
Expand Down Expand Up @@ -1245,10 +1249,6 @@ function mod:EverchagerCache(player, cacheFlag)
local numFamiliars = player:GetCollectibleNum(mod.EverchangerTrinkets.guppy)
player:CheckFamiliar(FamiliarVariant.LEECH, numFamiliars, player:GetCollectibleRNG(mod.EverchangerTrinkets.guppy), Isaac.GetItemConfig():GetCollectible(mod.EverchangerTrinkets.guppy), 160)

mod:scheduleForUpdate(function()
if not player then return end
player:CheckFamiliar(FamiliarVariant.LEECH, numFamiliars, player:GetCollectibleRNG(mod.EverchangerTrinkets.guppy), Isaac.GetItemConfig():GetCollectible(mod.EverchangerTrinkets.guppy), 160)
end, 5)
end
end
mod:AddCallback(ModCallbacks.MC_EVALUATE_CACHE, mod.EverchagerCache)
Expand Down

0 comments on commit 4d3049f

Please sign in to comment.