Merge branch 'master' into flag_touch_switches

Author: maddie480

Ahorn/entities/customSandwichLava.jl

@@ -0,0 +1,38 @@
+module SpringCollab2020CustomSandwichLava
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/CustomSandwichLava" CustomSandwichLava(x::Integer, y::Integer, 
+    direction::String="CoreModeBased", speed::Number=20, sandwichGap::Number=160)
+
+const directions = String["AlwaysUp", "AlwaysDown", "CoreModeBased"]
+
+const placements = Ahorn.PlacementDict(
+    "Custom Sandwich Lava (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        CustomSandwichLava
+    )
+)
+
+Ahorn.editingOptions(entity::CustomSandwichLava) = Dict{String, Any}(
+    "direction" => directions
+)
+
+function Ahorn.selection(entity::CustomSandwichLava)
+    x, y = Ahorn.position(entity)
+
+    return Ahorn.Rectangle(x - 12, y - 12, 24, 24)
+end
+
+function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::CustomSandwichLava, room::Maple.Room)    
+    direction = get(entity.data, "direction", "CoreModeBased")
+
+    if direction == "AlwaysUp"
+        Ahorn.drawSprite(ctx, "ahorn/SpringCollab2020/lava_sandwich_up", 0, 0)
+    elseif direction == "AlwaysDown"
+        Ahorn.drawSprite(ctx, "ahorn/SpringCollab2020/lava_sandwich_down", 0, 0)
+    else
+        Ahorn.drawImage(ctx, Ahorn.Assets.lavaSanwitch, -12, -12)
+    end
+end
+
+end

Ahorn/entities/sidewaysLava.jl

@@ -0,0 +1,36 @@
+module SpringCollab2020SidewaysLava
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/SidewaysLava" SidewaysLava(x::Integer, y::Integer, intro::Bool=false, lavaMode::String="LeftToRight", speedMultiplier::Number=1)
+
+const lavaModes = String["LeftToRight", "RightToLeft", "Sandwich"]
+
+const placements = Ahorn.PlacementDict(
+    "Sideways Lava (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        SidewaysLava
+    )
+)
+
+Ahorn.editingOptions(entity::SidewaysLava) = Dict{String, Any}(
+    "lavaMode" => lavaModes
+)
+
+function Ahorn.selection(entity::SidewaysLava)
+    x, y = Ahorn.position(entity)
+
+    return Ahorn.Rectangle(x - 12, y - 12, 24, 24)
+end
+
+function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::SidewaysLava, room::Maple.Room)
+    Ahorn.Cairo.save(ctx)
+    
+    lavaMode = get(entity.data, "lavaMode", "LeftToRight")
+    
+    Ahorn.rotate(ctx, (lavaMode == "RightToLeft" ? -1 : 1) * pi / 2)
+    Ahorn.drawImage(ctx, (lavaMode == "Sandwich" ? Ahorn.Assets.lavaSanwitch : Ahorn.Assets.risingLava), -12, -12)
+    
+    Ahorn.Cairo.restore(ctx);
+end
+
+end

Ahorn/lang/en_gb.lang

@@ -55,6 +55,21 @@ placements.entities.SpringCollab2020/UpsideDownJumpThru.tooltips.texture=Changes
 placements.entities.SpringCollab2020/SidewaysJumpThru.tooltips.texture=Changes the appearance of the platform.
 placements.entities.SpringCollab2020/SidewaysJumpThru.tooltips.left=Whether the solid side of the jumpthru is the left side.
 
+# Custom Sandwich Lava
+placements.entities.SpringCollab2020/CustomSandwichLava.tooltips.direction=Changes the sandwich lava direction. CoreModeBased is the same behaviour as vanilla, depending on core mode.
+placements.entities.SpringCollab2020/CustomSandwichLava.tooltips.speed=Changes the speed the lava is moving at, in pixels per second. Vanilla value is 20.
+placements.entities.SpringCollab2020/CustomSandwichLava.tooltips.sandwichGap=The gap in pixels between both sides of the lava. Vanilla value is 160.
+
+# Custom Sandwich Lava Settings Trigger
+placements.triggers.SpringCollab2020/CustomSandwichLavaSettingsTrigger.tooltips.onlyOnce=If enabled, the settings will change only on the first time the player enters the trigger.
+placements.triggers.SpringCollab2020/CustomSandwichLavaSettingsTrigger.tooltips.direction=Changes the sandwich lava direction. CoreModeBased is the same behaviour as vanilla, depending on core mode.
+placements.triggers.SpringCollab2020/CustomSandwichLavaSettingsTrigger.tooltips.speed=Changes the speed the lava is moving at, in pixels per second. Vanilla value is 20.
+
+# Sideways Lava
+placements.entities.SpringCollab2020/SidewaysLava.tooltips.intro=Determines whether the lava moves into the screen or starts already present on the screen. Not suitable for sandwich lava.
+placements.entities.SpringCollab2020/SidewaysLava.tooltips.lavaMode=Determines which side(s) of the screen the lava comes from.
+placements.entities.SpringCollab2020/SidewaysLava.tooltips.speedMultiplier=Modifies the lava speed. 1 is vanilla lava speed, 2 is twice as fast.
+
 # Flag Touch Switch
 placements.entities.SpringCollab2020/FlagTouchSwitch.tooltips.flag=The session flag this touch switch sets. Give the same to multiple touch switches and switch gates to group them.
 placements.entities.SpringCollab2020/FlagTouchSwitch.tooltips.icon=The name of the icon for the touch switch (relative to objects/SpringCollab2020/flagTouchSwitch), or "vanilla" for the default one.

Ahorn/triggers/customSandwichLavaSettings.jl

@@ -0,0 +1,21 @@
+module SpringCollab2020CustomSandwichLavaSettingsTrigger
+
+using ..Ahorn, Maple
+
+@mapdef Trigger "SpringCollab2020/CustomSandwichLavaSettingsTrigger" CustomSandwichLavaSettingsTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight,
+    onlyOnce::Bool=false, direction::String="CoreModeBased", speed::Number=20)
+
+const directions = String["AlwaysUp", "AlwaysDown", "CoreModeBased"]
+
+const placements = Ahorn.PlacementDict(
+    "Custom Sandwich Lava Settings (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        CustomSandwichLavaSettingsTrigger,
+        "rectangle",
+    ),
+)
+
+Ahorn.editingOptions(entity::CustomSandwichLavaSettingsTrigger) = Dict{String, Any}(
+    "direction" => directions
+)
+
+end