From 70878aac4aae84223a54c48f7a12247845582f7c Mon Sep 17 00:00:00 2001 From: UndeadMaelys Date: Sat, 23 Jan 2021 23:07:28 +0100 Subject: [PATCH] stuff weorks --- content/costumes2.xml | 21 ++++--- content/items.xml | 9 ++- main.lua | 71 +++++++++++----------- resources/gfx/characters/XX_YaleHorns.anm2 | 67 ++++++++++++++++++++ 4 files changed, 122 insertions(+), 46 deletions(-) create mode 100644 resources/gfx/characters/XX_YaleHorns.anm2 diff --git a/content/costumes2.xml b/content/costumes2.xml index 6de95b3..65c57a5 100644 --- a/content/costumes2.xml +++ b/content/costumes2.xml @@ -7,16 +7,23 @@ priority="99" would put the costum in front of all other costums --> - + - - diff --git a/content/items.xml b/content/items.xml index 8af260b..0f899c2 100644 --- a/content/items.xml +++ b/content/items.xml @@ -53,13 +53,16 @@ --> - - Costume: ARIEL_HEAD") - - print("> Items:") + player:AddNullCostume( COSTUME_ARIEL_HEAD ); player:AddCollectible( CollectibleType.COLLECTIBLE_SUCCUBUS_CHARM, 0, 0); - print(" - Succubus Charm") end + if player:GetPlayerType() == NERIELLE_TYPE then - print("Initializing player: Nerielle") - - print("> Costume: ARIEL_HEAD") - player:AddNullCostume( NERIELLE_HEAD ); - + player:AddNullCostume( COSTUME_NERIELLE_HEAD ); end + if player:GetPlayerType() == SIVE_TYPE then - print("Initializing player: Sive") - - print("> Costume: SIVE_HEAD") - player:AddNullCostume( SIVE_HEAD ); - - print("> Scale: (1.5, 1.5)") player.SpriteScale = Vector(1.5,1.5); - - print("> Items:") player:AddCollectible( CollectibleType.COLLECTIBLE_YALE_HORNS, 0, 0); - print(" - Yale Horns") player:AddCollectible( CollectibleType.COLLECTIBLE_MOMMY_OF_TWO_YARI, 0, 0); player:AddCollectible( CollectibleType.COLLECTIBLE_MOMMY_OF_TWO_ARIEL, 0, 0); - print(" - Mommy of Two") + player:AddNullCostume( COSTUME_SIVE_HEAD ); end end end Lore:AddCallback( ModCallbacks.MC_POST_GAME_STARTED, Lore.PlayerTypesProperties ); -- STUFF FOR ENTITIES - -- BABY ARIEL! + -- bAriel INIT function Lore:GetBabyAriel(Ariel) - -- mommy:be_kissed() + end Lore:AddCallback(ModCallbacks.MC_FAMILIAR_INIT, Lore.GetBabyAriel, FamiliarVariant.BABY_ARIEL) - -- do ur thing baby succubus gal + function Lore:UpdateBabyAriel(Ariel) Ariel:FollowParent() end @@ -251,7 +234,6 @@ Lore:AddCallback( ModCallbacks.MC_POST_GAME_STARTED, Lore.PlayerTypesProperties -- BABY YARI function Lore:GetBabyYari(Yari) - -- ariel:copy() Yari.FireCooldown = 1 end Lore:AddCallback(ModCallbacks.MC_FAMILIAR_INIT,Lore.GetBabyYari, FamiliarVariant.BABY_YARI) @@ -281,18 +263,15 @@ Lore:AddCallback( ModCallbacks.MC_POST_GAME_STARTED, Lore.PlayerTypesProperties yaleTearCount = 0 end yaleTearCount = yaleTearCount + 1 + print(yaleTearCount) if yaleTearCount == 3 then yaleTearCount = 0; local lookout = Vector(1,0) local at = math.random(1,180) local finalTear = lookout:Rotated(at):Resized(player.ShotSpeed*10) - local tearCopy = tear.Variant - local newTear = Isaac.Spawn(EntityType.ENTITY_TEAR, tearCopy, 0, player.Position, finalTear, player):ToTear() - newTear:SetColor(player.TearColor, 0, 200, 0, 0) + player:FireTear(player.Position, finalTear, 1, 1, 0) local finalTear = lookout:Rotated(at+180):Resized(player.ShotSpeed*10) - local tearCopy = tear.Variant - local newTear = Isaac.Spawn(EntityType.ENTITY_TEAR, tearCopy, 0, player.Position, finalTear, player):ToTear() - newTear:SetColor(player.TearColor, 0, 200, 0, 0) + player:FireTear(player.Position, finalTear, 1, 1, 0) end end end @@ -378,3 +357,23 @@ function Lore:EvaluateCache( player, cacheFlag ) end end Lore:AddCallback(ModCallbacks.MC_EVALUATE_CACHE, Lore.EvaluateCache ); + +function Lore:manageItems(player) + if game:GetFrameCount() == 1 then + end + if player:GetActiveItem() == CollectibleType.COLLECTIBLE_SUCCUBUS_CHARM then + local itemCharge = player:GetActiveCharge() +print("Pre:",itemCharge) + if itemCharge < 110 then + itemCharge = itemCharge + 1 + end + print("Post",ItemCharge) + player:SetActiveCharge(itemCharge) + end + if player:HasCollectible(CollectibleType.COLLECTIBLE_MOMMY_OF_TWO) then + player:AddCollectible(CollectibleType.COLLECTIBLE_MOMMY_OF_TWO_YARI,0,0) + player:AddCollectible(CollectibleType.COLLECTIBLE_MOMMY_OF_TWO_ARIEL,0,0) + player:RemoveCollectible(CollectibleType.COLLECTIBLE_MOMMY_OF_TWO) + end +end +Lore:AddCallback(ModCallbacks.MC_POST_PEFFECT_UPDATE, Lore.manageItems) diff --git a/resources/gfx/characters/XX_YaleHorns.anm2 b/resources/gfx/characters/XX_YaleHorns.anm2 new file mode 100644 index 0000000..474fd25 --- /dev/null +++ b/resources/gfx/characters/XX_YaleHorns.anm2 @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +