From 40e6051352991e49660d3ff02a8c58cbe67a6519 Mon Sep 17 00:00:00 2001 From: monsterkodi Date: Wed, 10 Aug 2016 18:25:23 +0200 Subject: [PATCH] levels --- coffee/levels/captured.coffee | 12 +++---- coffee/levels/chain.coffee | 17 ++++----- coffee/levels/cheese.coffee | 64 +++++++++++++++++----------------- coffee/levels/circuit.coffee | 16 ++++----- coffee/levels/conductor.coffee | 12 +++---- coffee/levels/energy.coffee | 56 ++++++++++++++--------------- 6 files changed, 89 insertions(+), 88 deletions(-) diff --git a/coffee/levels/captured.coffee b/coffee/levels/captured.coffee index 658d757..d21bc0d 100644 --- a/coffee/levels/captured.coffee +++ b/coffee/levels/captured.coffee @@ -23,11 +23,11 @@ module.exports = s = world.size for i in [-2, 2] - world.addObjectPoly(KikiStone, [world.decenter(1, 1, i), world.decenter(1, -1, i), world.decenter(-1, -1, i), world.decenter(-1, 1, i)]) - world.addObjectPoly(KikiStone, [world.decenter(1, i, 1), world.decenter(1, i, -1), world.decenter(-1, i, -1), world.decenter(-1, i, 1)]) - world.addObjectPoly(KikiStone, [world.decenter(i, 1, 1), world.decenter(i, 1, -1), world.decenter(i, -1, -1), world.decenter(i, -1, 1)]) + world.addObjectPoly('KikiStone', [world.decenter(1, 1, i), world.decenter(1, -1, i), world.decenter(-1, -1, i), world.decenter(-1, 1, i)]) + world.addObjectPoly('KikiStone', [world.decenter(1, i, 1), world.decenter(1, i, -1), world.decenter(-1, i, -1), world.decenter(-1, i, 1)]) + world.addObjectPoly('KikiStone', [world.decenter(i, 1, 1), world.decenter(i, 1, -1), world.decenter(i, -1, -1), world.decenter(i, -1, 1)]) for i in [-4, -2, 2, 4] - world.addObjectAtPos(KikiStone(), world.decenter(i, 0, 0)) - world.addObjectAtPos(KikiStone(), world.decenter(0, i, 0)) - world.addObjectAtPos(KikiStone(), world.decenter(0, 0, i)) + world.addObjectAtPos('KikiStone', world.decenter(i, 0, 0)) + world.addObjectAtPos('KikiStone', world.decenter(0, i, 0)) + world.addObjectAtPos('KikiStone', world.decenter(0, 0, i)) diff --git a/coffee/levels/chain.coffee b/coffee/levels/chain.coffee index 01c9865..6ea6385 100644 --- a/coffee/levels/chain.coffee +++ b/coffee/levels/chain.coffee @@ -27,11 +27,12 @@ module.exports = s = world.size d = s.z/2 - world.addObjectAtPos(KikiWall(), KikiPos(0, 0, d)) - world.addObjectAtPos(KikiBomb(), KikiPos(0, 1, d)) - world.addObjectAtPos(KikiBomb(), KikiPos(1, 0, d)) - world.addObjectAtPos(KikiBomb(), KikiPos(0, 7, d)) - world.addObjectAtPos(KikiBomb(), KikiPos(5, 7, d)) - world.addObjectAtPos(KikiBomb(), KikiPos(1, 3, d)) - world.addObjectAtPos(KikiBomb(), KikiPos(5, 3, d)) - world.addObjectAtPos(KikiWireStone(), KikiPos(1,5,d)) \ No newline at end of file + world.addObjectAtPos 'KikiWall', 0, 0, d + world.addObjectAtPos 'KikiBomb', 0, 1, d + world.addObjectAtPos 'KikiBomb', 1, 0, d + world.addObjectAtPos 'KikiBomb', 0, 7, d + world.addObjectAtPos 'KikiBomb', 5, 7, d + world.addObjectAtPos 'KikiBomb', 1, 3, d + world.addObjectAtPos 'KikiBomb', 5, 3, d + world.addObjectAtPos 'KikiWireStone', 1, 5, d + \ No newline at end of file diff --git a/coffee/levels/cheese.coffee b/coffee/levels/cheese.coffee index b43875a..8971306 100644 --- a/coffee/levels/cheese.coffee +++ b/coffee/levels/cheese.coffee @@ -32,35 +32,35 @@ module.exports = h = 0 # bomb and stones for i in [1, 2] - world.addObjectAtPos(KikiWall(), KikiPos(1, i, 1)) - world.addObjectAtPos(KikiWall(), KikiPos(1, i, 3)) - world.addObjectAtPos(KikiWall(), KikiPos(2, i, 1)) - world.addObjectAtPos(KikiWall(), KikiPos(2, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(2, i, 5)) - world.addObjectAtPos(KikiWall(), KikiPos(3, i, 1)) - world.addObjectAtPos(KikiWall(), KikiPos(3, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(3, i, 4)) - world.addObjectAtPos(KikiWall(), KikiPos(3, i, 5)) - world.addObjectAtPos(KikiWall(), KikiPos(5, i, 0)) - world.addObjectAtPos(KikiWall(), KikiPos(5, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(5, i, 3)) - world.addObjectAtPos(KikiWall(), KikiPos(5, i, 4)) - world.addObjectAtPos(KikiWall(), KikiPos(6, i, 1)) - world.addObjectAtPos(KikiWall(), KikiPos(6, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(7, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(7, i, 4)) - world.addObjectAtPos(KikiWall(), KikiPos(7, i, 5)) - world.addObjectAtPos(KikiWall(), KikiPos(8, i, 0)) - world.addObjectAtPos(KikiWall(), KikiPos(8, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(8, i, 4)) - world.addObjectAtPos(KikiWall(), KikiPos(8, i, 5)) - world.addObjectAtPos(KikiWall(), KikiPos(9, i, 2)) - world.addObjectAtPos(KikiWall(), KikiPos(9, i, 4)) - world.addObjectAtPos(KikiWall(), KikiPos(10, i, 3)) + world.addObjectAtPos 'KikiWall', 1, i, 1 + world.addObjectAtPos 'KikiWall', 1, i, 3 + world.addObjectAtPos 'KikiWall', 2, i, 1 + world.addObjectAtPos 'KikiWall', 2, i, 2 + world.addObjectAtPos 'KikiWall', 2, i, 5 + world.addObjectAtPos 'KikiWall', 3, i, 1 + world.addObjectAtPos 'KikiWall', 3, i, 2 + world.addObjectAtPos 'KikiWall', 3, i, 4 + world.addObjectAtPos 'KikiWall', 3, i, 5 + world.addObjectAtPos 'KikiWall', 5, i, 0 + world.addObjectAtPos 'KikiWall', 5, i, 2 + world.addObjectAtPos 'KikiWall', 5, i, 3 + world.addObjectAtPos 'KikiWall', 5, i, 4 + world.addObjectAtPos 'KikiWall', 6, i, 1 + world.addObjectAtPos 'KikiWall', 6, i, 2 + world.addObjectAtPos 'KikiWall', 7, i, 2 + world.addObjectAtPos 'KikiWall', 7, i, 4 + world.addObjectAtPos 'KikiWall', 7, i, 5 + world.addObjectAtPos 'KikiWall', 8, i, 0 + world.addObjectAtPos 'KikiWall', 8, i, 2 + world.addObjectAtPos 'KikiWall', 8, i, 4 + world.addObjectAtPos 'KikiWall', 8, i, 5 + world.addObjectAtPos 'KikiWall', 9, i, 2 + world.addObjectAtPos 'KikiWall', 9, i, 4 + world.addObjectAtPos 'KikiWall', 10, i, 3 - for i in range(0,s.x) - for j in range(0, s.z) - world.addObjectAtPos(KikiStone(), KikiPos(i,2,j)) + for i in [0...s.x] + for j in [0...s.z] + world.addObjectAtPos 'KikiStone', i,2,j world.switch_counter = 0 @@ -78,8 +78,8 @@ module.exports = switch4 = KikiSwitch() # switch4.getEventWithName("switched").addAction(continuous(() -> s=switch4: switched(s))) - world.addObjectAtPos(switch1, KikiPos(1, 0 ,2)) - world.addObjectAtPos(switch2, KikiPos(7, 1, 0)) - world.addObjectAtPos(switch3, KikiPos(9, 0, 0)) - world.addObjectAtPos(switch4, KikiPos(9, 1, 5)) + world.addObjectAtPos switch1, 1, 0 ,2 + world.addObjectAtPos switch2, 7, 1, 0 + world.addObjectAtPos switch3, 9, 0, 0 + world.addObjectAtPos switch4, 9, 1, 5 \ No newline at end of file diff --git a/coffee/levels/circuit.coffee b/coffee/levels/circuit.coffee index 2656e77..0aa0e51 100644 --- a/coffee/levels/circuit.coffee +++ b/coffee/levels/circuit.coffee @@ -47,14 +47,14 @@ module.exports = stone= () ->KikiWire(k[4], 15) world.addObjectLine(stone,k[1],k[2]) - world.addObjectAtPos(KikiWireStone(), world.decenter(1,0,0)) - world.addObjectAtPos(KikiWireStone(), world.decenter(-1,0,0)) - world.addObjectAtPos(KikiWireStone(), world.decenter(0,1,0)) - world.addObjectAtPos(KikiWireStone(), world.decenter(0,-1,0)) - world.addObjectAtPos(KikiWireStone(), world.decenter(0,0,1)) - world.addObjectAtPos(KikiWireStone(), world.decenter(0,0,-1)) - world.addObjectAtPos(KikiWireStone(), world.decenter(0,0,2)) - world.addObjectAtPos(KikiWireStone(), world.decenter(0,0,-2)) + world.addObjectAtPos 'KikiWireStone', world.decenter(1,0,0) + world.addObjectAtPos 'KikiWireStone', world.decenter(-1,0,0) + world.addObjectAtPos 'KikiWireStone', world.decenter(0,1,0) + world.addObjectAtPos 'KikiWireStone', world.decenter(0,-1,0) + world.addObjectAtPos 'KikiWireStone', world.decenter(0,0,1) + world.addObjectAtPos 'KikiWireStone', world.decenter(0,0,-1) + world.addObjectAtPos 'KikiWireStone', world.decenter(0,0,2) + world.addObjectAtPos 'KikiWireStone', world.decenter(0,0,-2) world.addObjectAtPos(KikiWire(KikiFace.X), KikiPos(0,0,0)) world.addObjectAtPos(KikiWire(KikiFace.Z), KikiPos(0,0,0)) diff --git a/coffee/levels/conductor.coffee b/coffee/levels/conductor.coffee index 34dd62e..3441466 100644 --- a/coffee/levels/conductor.coffee +++ b/coffee/levels/conductor.coffee @@ -40,8 +40,8 @@ module.exports = for h in [2,4,6] world.addObjectLine(KikiWall, KikiPos(5,2,h), KikiPos(5,6,h) ) - world.addObjectAtPos(KikiWireStone(), KikiPos(5,1,h)) - world.addObjectAtPos(KikiWireStone(), KikiPos(5,6,h)) + world.addObjectAtPos('KikiWireStone', KikiPos(5,1,h)) + world.addObjectAtPos('KikiWireStone', KikiPos(5,6,h)) wire_u= -> KikiWire(KikiFace.Z, 4+1 ) wire_d= -> KikiWire(KikiFace.NZ, 4+1 ) @@ -61,11 +61,11 @@ module.exports = g = KikiGenerator(KikiFace.Z) #set to Active as last command in LevelS world.addObjectAtPos(g, KikiPos(5,1,0)) - world.addObjectAtPos(KikiWireStone(), KikiPos(5,2,0)) - world.addObjectAtPos(KikiWireStone(), KikiPos(5,2,1)) + world.addObjectAtPos('KikiWireStone', KikiPos(5,2,0)) + world.addObjectAtPos('KikiWireStone', KikiPos(5,2,1)) - world.addObjectAtPos(KikiWireStone(), KikiPos(5,5,3)) - world.addObjectAtPos(KikiWireStone(), KikiPos(5,5,5)) + world.addObjectAtPos('KikiWireStone', KikiPos(5,5,3)) + world.addObjectAtPos('KikiWireStone', KikiPos(5,5,5)) KikiWireWall(15, KikiPos(5,4,8)) diff --git a/coffee/levels/energy.coffee b/coffee/levels/energy.coffee index 02687c5..5873526 100644 --- a/coffee/levels/energy.coffee +++ b/coffee/levels/energy.coffee @@ -35,34 +35,34 @@ module.exports = world.addObjectAtPos('KikiWall', world.decenter(-2,-5,-1)) world.addObjectAtPos('KikiWall', world.decenter( 1,-5,-2)) - world.addObjectAtPos(KikiMutant(), world.decenter( 2,-5, 2)) - world.addObjectAtPos(KikiMutant(), world.decenter(-2,-5,-2)) - world.addObjectAtPos(KikiMutant(), world.decenter( 1,-5, 1)) - world.addObjectAtPos(KikiMutant(), world.decenter(-1,-5,-1)) - world.addObjectAtPos(KikiMutant(), world.decenter( 2,-5,-2)) - world.addObjectAtPos(KikiMutant(), world.decenter(-2,-5, 2)) - world.addObjectAtPos(KikiMutant(), world.decenter( 1,-5,-1)) - world.addObjectAtPos(KikiMutant(), world.decenter(-1,-5, 1)) - - world.addObjectAtPos(KikiWall(), world.decenter( 0, 3, s.z/2)) - world.addObjectAtPos(KikiWall(), world.decenter( 0, 5, s.z/2)) - world.addObjectAtPos(KikiWall(), world.decenter( 1, 4, s.z/2)) - world.addObjectAtPos(KikiWall(), world.decenter(-1, 4, s.z/2)) - - world.addObjectAtPos(KikiWall(), world.decenter(s.x/2, 3, 0)) - world.addObjectAtPos(KikiWall(), world.decenter(s.x/2, 5, 0)) - world.addObjectAtPos(KikiWall(), world.decenter(s.x/2, 4, 1)) - world.addObjectAtPos(KikiWall(), world.decenter(s.x/2, 4, -1)) - - world.addObjectAtPos(KikiWall(), world.decenter( 0, 3, -s.z/2+1)) - world.addObjectAtPos(KikiWall(), world.decenter( 0, 5, -s.z/2+1)) - world.addObjectAtPos(KikiWall(), world.decenter( 1, 4, -s.z/2+1)) - world.addObjectAtPos(KikiWall(), world.decenter(-1, 4, -s.z/2+1)) - - world.addObjectAtPos(KikiWall(), world.decenter(-s.x/2+1, 3, 0)) - world.addObjectAtPos(KikiWall(), world.decenter(-s.x/2+1, 5, 0)) - world.addObjectAtPos(KikiWall(), world.decenter(-s.x/2+1, 4, 1)) - world.addObjectAtPos(KikiWall(), world.decenter(-s.x/2+1, 4, -1)) + world.addObjectAtPos('KikiMutant', world.decenter( 2,-5, 2)) + world.addObjectAtPos('KikiMutant', world.decenter(-2,-5,-2)) + world.addObjectAtPos('KikiMutant', world.decenter( 1,-5, 1)) + world.addObjectAtPos('KikiMutant', world.decenter(-1,-5,-1)) + world.addObjectAtPos('KikiMutant', world.decenter( 2,-5,-2)) + world.addObjectAtPos('KikiMutant', world.decenter(-2,-5, 2)) + world.addObjectAtPos('KikiMutant', world.decenter( 1,-5,-1)) + world.addObjectAtPos('KikiMutant', world.decenter(-1,-5, 1)) + + world.addObjectAtPos('KikiWall', world.decenter( 0, 3, s.z/2)) + world.addObjectAtPos('KikiWall', world.decenter( 0, 5, s.z/2)) + world.addObjectAtPos('KikiWall', world.decenter( 1, 4, s.z/2)) + world.addObjectAtPos('KikiWall', world.decenter(-1, 4, s.z/2)) + + world.addObjectAtPos('KikiWall', world.decenter(s.x/2, 3, 0)) + world.addObjectAtPos('KikiWall', world.decenter(s.x/2, 5, 0)) + world.addObjectAtPos('KikiWall', world.decenter(s.x/2, 4, 1)) + world.addObjectAtPos('KikiWall', world.decenter(s.x/2, 4, -1)) + + world.addObjectAtPos('KikiWall', world.decenter( 0, 3, -s.z/2+1)) + world.addObjectAtPos('KikiWall', world.decenter( 0, 5, -s.z/2+1)) + world.addObjectAtPos('KikiWall', world.decenter( 1, 4, -s.z/2+1)) + world.addObjectAtPos('KikiWall', world.decenter(-1, 4, -s.z/2+1)) + + world.addObjectAtPos('KikiWall', world.decenter(-s.x/2+1, 3, 0)) + world.addObjectAtPos('KikiWall', world.decenter(-s.x/2+1, 5, 0)) + world.addObjectAtPos('KikiWall', world.decenter(-s.x/2+1, 4, 1)) + world.addObjectAtPos('KikiWall', world.decenter(-s.x/2+1, 4, -1)) world.switch_counter = 0