some more updates

wurst.build

@@ -4,8 +4,8 @@ dependencies:
 - https://github.com/wurstscript/wurstStdlib2
 - https://github.com/frotty/frentity
 buildMapData:
-  name: '|cff217199Escape Builder |r[R] 0.92l'
-  fileName: Escape Builder[R] 0.92l
+  name: '|cff217199Escape Builder |r[R] 0.92m'
+  fileName: Escape Builder[R] 0.92m
   author: Frotty
   players:
   - race: HUMAN

wurst/init/startmazes/FourthCitadelle.wurst

@@ -65,7 +65,7 @@ public class FourthCitadelleMaze extends Startmaze
 		gg_unit_scik_0213.issuePointOrder("patrol", vec2(-2728, -5100))
 		gg_unit_scik_0221.issuePointOrder("patrol", vec2(-4576, -4748))
 		gg_unit_scik_0222.issuePointOrder("patrol", vec2(-4320, -5164))
-		gg_unit_bcik_0266.issuePointOrder("patrol", vec2(-2933, -7195))
+		gg_unit_bcik_0266.issuePointOrder("patrol", vec2(-3312, -6793))
 		gg_unit_bcik_0262.issuePointOrder("patrol", vec2(-3502, -6077))
 		gg_unit_bcik_0280.issuePointOrder("patrol", vec2(-3953, -5678))
 		gg_unit_bcik_0225.issuePointOrder("patrol", vec2(-4648, -3995))

wurst/init/startmazes/SecondDesert.wurst

@@ -8,17 +8,17 @@ public class SecondDesertMaze extends Startmaze
 	construct(RegionData rd)
 		rdata = rd
 		rdata.setType(RegionType.SAND, false)
-	
+
 	override function initMaze()
 		inited = true
 		forUnitsOfPlayer(STAFF_PLAYER) u ->
 			if u.getTypeId() == BIG_SAND_KILLER_ID
 				new BigKiller(u)
-			
-		forUnitsOfPlayer(STAFF_PLAYER) u -> 
+
+		forUnitsOfPlayer(STAFF_PLAYER) u ->
 			if u.getTypeId() == SMALL_SAND_KILLER_ID
-				new SmallKiller(u) 
-			
+				new SmallKiller(u)
+
 		IssuePointOrder(gg_unit_ssak_0121, "patrol", 3612.01, -4650)
 		IssuePointOrder(gg_unit_ssak_0122, "patrol", 3574.01, -5253)
 		IssuePointOrder(gg_unit_ssak_0120, "patrol", 3834.01, -5380)
@@ -30,7 +30,7 @@ public class SecondDesertMaze extends Startmaze
 		IssuePointOrder(gg_unit_bsak_0081, "patrol", 1840.01, -6537)
 		IssuePointOrder(gg_unit_bsak_0080, "patrol", 1293.01, -6286)
 		IssuePointOrder(gg_unit_bsak_0104, "patrol", 1293.01, -6286)
-		
+
 		var t = new Teleporter(gg_unit_tele_0141)
 		t.setRallyPoint(LOUNGE)
 
@@ -39,13 +39,13 @@ public class SecondDesertMaze extends Startmaze
 		j.jumpForce.setVal(5)
 
 		j = new Jumper(gg_unit_jump_0152)
-		j.setRallyPoint(vec2(3834, -6645))
+		j.setRallyPoint(vec2(3434, -6245))
 		j.jumpForce.setVal(6)
-		
+
 		new Fountain(gg_unit_fnt2_0065)
 		new Fountain(gg_unit_fnt2_0067)
 		new Fountain(gg_unit_fnt2_0074)
-	
+
 	override function getStart() returns vec2
 		return vec2(3450, -4150)
 

wurst/init/startmazes/Startmazes.wurst

@@ -13,6 +13,7 @@ import Ball
 import LobbyTeleporter
 import MinigameTeleporter
 import Execute
+import Arcanery
 
 public Startmaze array startmazes
 public int currentMaze = -1
@@ -101,6 +102,8 @@ function checkStaffUnit(unit u)
 			new BigObstacle(u)
 		case HOBS_GRASS_ID
 			new HighObstacle(u)
+		case ARCANERY_ID
+			new Arcanery(u)
 
 
 public function correctKeys()

wurst/init/startmazes/ThirdForest.wurst

@@ -23,8 +23,6 @@ public class ThirdForestMaze extends Startmaze
 		RegionData data = getRegionData(vec2(368, -6647))
 		data.setOwner(STAFF_PLAYER)
 
-		new Arcanery(gg_unit_arca_0050)
-
 		let t = new Teleporter(gg_unit_tele_0044)
 		t.setRallyPoint(LOUNGE)
 		gg_unit_sgrk_0038.issuePointOrder("patrol", vec2(-122.01,-5897))

wurst/minigames/MGRandKill.wurst

@@ -4,6 +4,7 @@ import EscaperKillers
 import Assets
 import Fx
 import Coin
+import Obstacle
 
 constant ARENA_POS = vec2(-4200, 7500)
 
@@ -26,6 +27,8 @@ public class MGRandKill extends Minigame
 			spawn = getGameRect().randomPoint()
 		fx = new Fx(spawn, GetRandomInt(0, 360).toReal().fromDeg(), Doodads.shimmeringPortal)
 		fx.setScale(0.5)
+		for i = 0 to GetRandomInt(3, 5)
+			new SmallObstacle(getGameRect().randomPoint(), STAFF_PLAYER)
 		doAfter(6.5) ->
 			if fx != null
 				new SmallRandomKiller(spawn, STAFF_PLAYER)

wurst/minigames/MGSlide.wurst

@@ -7,6 +7,7 @@ import Orders
 import Builder
 import Assets
 import Coin
+import Tree
 
 constant LEFT_SPOT = vec2(-1540, 7550)
 constant RIGHT_SPOT = vec2(640, 7550)
@@ -63,13 +64,19 @@ public class MGSlide extends Minigame
 				data.terminate()
 		bcount++
 		let spawn = gg_rct_slidegamespawn
-		gg_rct_slidegamespawn.randomPoint().setTerrainType(UNCONTROLLABLEICE, -1, 1, 0)
+
+		for i = 0 to bcount div 2
+			gg_rct_slidegamespawn.randomPoint().setTerrainType(UNCONTROLLABLEICE, -1, 1, 0)
+
 		for i = 0 to bcount * 2
 			new SmallObstacle(spawn.randomPoint(), STAFF_PLAYER)
 
 		for i = 0 to bcount
 			new BigObstacle(spawn.randomPoint(), STAFF_PLAYER)
 
+		for i = 0 to bcount div 2
+			new Tree(spawn.randomPoint(), STAFF_PLAYER)
+
 		for i = 0 to bcount
 			new SmallKiller(spawn.randomPoint(), STAFF_PLAYER)
 			.actor.issuePointOrderById(Orders.patrol, spawn.randomPoint())

wurst/minigames/MGSpacey.wurst

@@ -82,7 +82,7 @@ class ShipProjectile extends Projectile
 	construct(Spaceship ship)
 		super(ship.getPos().toVec2().polarOffset(ship.actor.getFacingAngle(), 16).withZ(64), 16., ship.owner, ship.actor.getFacingAngle(), Abilities.faerieDragonMissile)
 		fx.setColor((owner.getColor().toColor()).withAlpha(255))
-		setSpeed(10)
+		setSpeed(8)
 		fx.setScale(0.75)
 		vel += ship.vel
 		this.ship = ship
@@ -108,7 +108,7 @@ class ShipProjectile extends Projectile
 		ship.projectiles.remove(this)
 
 public class Spaceship extends UnitEntity
-	real maxSpeed = 9
+	real maxSpeed = 8
 	real acc = 0
 	angle xyAngle = (90).fromDeg()
 	var projectiles = new LinkedList<ShipProjectile>
@@ -125,7 +125,7 @@ public class Spaceship extends UnitEntity
 		sleeps = false
 
 	function shoot()
-		if active and projectiles.size() < 5
+		if active and projectiles.size() < 4
 			actor.setAnimation("attack")
 			projectiles.add(new ShipProjectile(this))
 
@@ -142,9 +142,9 @@ public class Spaceship extends UnitEntity
 		if localPlayer == owner
 			CameraSetupApplyForceDuration(gg_cam_spaceycam, true, 0.)
 		if downKeys.up
-			acc = acc.lerp(0.85, 0.175)
+			acc = acc.lerp(0.85, 0.145)
 		if downKeys.down
-			acc = acc.lerp(-0.2, 0.175)
+			acc = acc.lerp(-0.2, 0.125)
 
 	override function update()
 		foo()
@@ -213,7 +213,7 @@ public class SpaceRock extends FxEntity
 		super(STAFF_PLAYER, position.withZ(48), velocity.getAngle(), getRockAsset(level))
 		fx..setScale(1+level*0.25)
 		radiusSq = (26 + level*6.).squared()
-		this.vel = (velocity * ((5-level)*0.95)).toVec3()
+		this.vel = (velocity * ((5-level)*0.85)).toVec3()
 		this.level = level
 		hp = level
 		sleeps = false