Rename allowLeftToRight attribute, add placement options

Author: maddie480

Ahorn/entities/sidewaysJumpThru.jl

@@ -3,18 +3,29 @@ module SpringCollab2020SidewaysJumpThru
 using ..Ahorn, Maple
 
 @mapdef Entity "SpringCollab2020/SidewaysJumpThru" SidewaysJumpThru(x::Integer, y::Integer, height::Integer=Maple.defaultBlockHeight, 
-	allowLeftToRight::Bool=true, texture::String="wood")
+    left::Bool=true, texture::String="wood")
 
 textures = ["wood", "dream", "temple", "templeB", "cliffside", "reflection", "core", "moon"]
-const placements = Ahorn.PlacementDict(
-    "Sideways Jump Through ($(uppercasefirst(texture))) (Spring Collab 2020)" => Ahorn.EntityPlacement(
+const placements = Ahorn.PlacementDict()
+
+for texture in textures
+	placements["Sideways Jump Through ($(uppercasefirst(texture)), Left) (Spring Collab 2020)"] = Ahorn.EntityPlacement(
         SidewaysJumpThru,
         "rectangle",
         Dict{String, Any}(
-            "texture" => texture
+            "texture" => texture,
+            "left" => true
         )
-    ) for texture in textures
-)
+    )
+    placements["Sideways Jump Through ($(uppercasefirst(texture)), Right) (Spring Collab 2020)"] = Ahorn.EntityPlacement(
+        SidewaysJumpThru,
+        "rectangle",
+        Dict{String, Any}(
+            "texture" => texture,
+            "left" => false
+        )
+    )
+end
 
 quads = Tuple{Integer, Integer, Integer, Integer}[
     (0, 0, 8, 7) (8, 0, 8, 7) (16, 0, 8, 7);
@@ -44,19 +55,19 @@ function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::SidewaysJumpThru, r
     y = Int(get(entity.data, "y", 0))
 
     height = Int(get(entity.data, "height", 8))
-	allowLeftToRight = get(entity.data, "allowLeftToRight", true)
-	
+    left = get(entity.data, "left", true)
+    
     startX = div(x, 8) + 1
     startY = div(y, 8) + 1
     stopY = startY + div(height, 8) - 1
 
     Ahorn.Cairo.save(ctx)
 
     Ahorn.rotate(ctx, pi / 2)
-	
-	if !allowLeftToRight
-		Ahorn.scale(ctx, 1, -1)
-	end
+    
+    if left
+        Ahorn.scale(ctx, 1, -1)
+    end
 
     len = stopY - startY
     for i in 0:len
@@ -72,7 +83,7 @@ function Ahorn.render(ctx::Ahorn.Cairo.CairoContext, entity::SidewaysJumpThru, r
         end
 
         quad = quads[2 - connected, qx]
-        Ahorn.drawImage(ctx, "objects/jumpthru/$(texture)", 8 * i, allowLeftToRight ? -8 : 0, quad...)
+        Ahorn.drawImage(ctx, "objects/jumpthru/$(texture)", 8 * i, left ? 0 : -8, quad...)
     end
 
     Ahorn.Cairo.restore(ctx)

Ahorn/lang/en_gb.lang

@@ -47,4 +47,4 @@ placements.entities.SpringCollab2020/UpsideDownJumpThru.tooltips.texture=Changes
 
 # Sideways Jump Thru
 placements.entities.SpringCollab2020/SidewaysJumpThru.tooltips.texture=Changes the appearance of the platform.
-placements.entities.SpringCollab2020/SidewaysJumpThru.tooltips.allowLeftToRight=Changes the orientation of the platform. If checked, it will allow the player to go from left to right.
+placements.entities.SpringCollab2020/SidewaysJumpThru.tooltips.left=Whether the solid side of the jumpthru is the left side.

Entities/SidewaysJumpThru.cs

@@ -220,8 +220,7 @@ private static int onPlayerNormalUpdate(On.Celeste.Player.orig_NormalUpdate orig
             return result;
         }
 
-
-
+        // ======== Begin of entity code ========
 
         private int lines;
         private string overrideTexture;
@@ -244,7 +243,7 @@ public SidewaysJumpThru(Vector2 position, int height, bool allowLeftToRight, str
         }
 
         public SidewaysJumpThru(EntityData data, Vector2 offset)
-            : this(data.Position + offset, data.Height, data.Bool("allowLeftToRight"), data.Attr("texture", "default")) {
+            : this(data.Position + offset, data.Height, !data.Bool("left"), data.Attr("texture", "default")) {
         }
 
         public override void Awake(Scene scene) {