From 85f3624b376370bdbade66d3c765423208b2edd3 Mon Sep 17 00:00:00 2001 From: Piotr Bar Date: Tue, 19 Jun 2012 21:53:04 +0100 Subject: [PATCH 1/2] fog further changes (not visible middle field) --- dev/client/renderer/Board.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/client/renderer/Board.coffee b/dev/client/renderer/Board.coffee index 7ac1078..45c94c6 100644 --- a/dev/client/renderer/Board.coffee +++ b/dev/client/renderer/Board.coffee @@ -265,11 +265,11 @@ class BoardDrawer extends Drawer @ownership = @without @ownership, [x,y] @setVisibility [x, y], false, ownerid when 2 - @owner[x][y].visibility = false if ownerid is @myPlayer.id @setVisibility [x, y], false, ownerid else @ownership = @without @ownership, point + @owner[x][y].visible = false @updateAll() changeOwnership: (x, y, ownerid) -> @@ -574,7 +574,7 @@ class SignalsDrawer extends Drawer @stage.update() tick: () -> - ### + for signal in @stage.children if signal.isSignal and signal.isVisible signal.visible = true @@ -584,7 +584,7 @@ class SignalsDrawer extends Drawer signal.x += signal.tickSizeX signal.y += signal.tickSizeY signal.k += 1 - ### + @fpsLabel.text = Math.round(Ticker.getMeasuredFPS())+" fps" @stage.update() @@ -681,8 +681,8 @@ class Renderer # moves signal from field (x,y) in particular direction moveSignal: (x, y, direction) -> - #@signalsDR.createSignal(x, y, direction) - @signalsDR.drawWorker(x, y, direction) + @signalsDR.createSignal(x, y, direction) + #@signalsDR.drawWorker(x, y, direction) # builds a channel at field (x,y) in given direction buildChannel: (x, y, direction, channel) -> From be3a85118c577e9084ccea27eecd248f5fe9d87b Mon Sep 17 00:00:00 2001 From: Piotr Bar Date: Tue, 19 Jun 2012 22:54:49 +0100 Subject: [PATCH 2/2] fog and ownership fixes, menu isnt active somtimes, when one channel and platform on a field --- dev/client/Negotiator.coffee | 17 ++++++----------- dev/client/renderer/Board.coffee | 2 +- dev/common/behaviours/ChannelBehaviour.coffee | 5 ++++- dev/common/behaviours/PlatformBehaviour.coffee | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dev/client/Negotiator.coffee b/dev/client/Negotiator.coffee index 2675e2f..607ab12 100644 --- a/dev/client/Negotiator.coffee +++ b/dev/client/Negotiator.coffee @@ -29,17 +29,12 @@ class Negotiator console.log "[NEGOTIATOR]: FULL FULL CHANNEL": x1, y1 @ui.showTextBubble "Channel full", x1, y1, color: [159, 17, 27, 1] - @on 'owner:channel', (dest, src, ownerid) -> - console.log "OWNING SHIT" - #console.debug 'owner:channel', xy, dir, state.owner - field = (_.intersection dest, src)[0] - field2 = (_.difference dest, src)[0] - #console.log "NEG: field", field, dest, src - console.log "[NEG]: FIELD", field - @renderer.captureOwnership field.xy[0], field.xy[1], ownerid, 1 - if not (field2.platform.type?) - console.log "[NEG]: FIELD2", field2 - @renderer.captureOwnership field2.xy[0], field2.xy[1], ownerid, 2 + @on 'owner:channel', (dest, src, ownerid, status) -> + field = (_.intersection dest, src)[0] + field2 = (_.difference dest, src)[0] + @renderer.captureOwnership field.xy[0], field.xy[1], ownerid, 1 + if not (field2.platform.type?) + @renderer.captureOwnership field2.xy[0], field2.xy[1], ownerid, 2 @on 'owner:platform', (xy, ownerid) -> #console.debug 'owner:platform', xy, state diff --git a/dev/client/renderer/Board.coffee b/dev/client/renderer/Board.coffee index 45c94c6..786aef6 100644 --- a/dev/client/renderer/Board.coffee +++ b/dev/client/renderer/Board.coffee @@ -269,7 +269,7 @@ class BoardDrawer extends Drawer @setVisibility [x, y], false, ownerid else @ownership = @without @ownership, point - @owner[x][y].visible = false + @owner[x][y] = null @updateAll() changeOwnership: (x, y, ownerid) -> diff --git a/dev/common/behaviours/ChannelBehaviour.coffee b/dev/common/behaviours/ChannelBehaviour.coffee index d462afe..ebd71ef 100644 --- a/dev/common/behaviours/ChannelBehaviour.coffee +++ b/dev/common/behaviours/ChannelBehaviour.coffee @@ -49,7 +49,10 @@ class ChannelBehaviour state.owner = signal.owner state.life = S.Properties.channel.life #console.log "[ChannelBehaviour]: source", signal.source - @eventBus.trigger 'owner:channel', state.fields, signal.source.fields, signal.owner.id + if signal.source.type is S.Types.Entities.Channel + @eventBus.trigger 'owner:channel', state.fields, signal.source.fields, signal.owner.id + else + @eventBus.trigger 'owner:channel', state.fields, [signal.source.field], signal.owner.id route: ( state, ownObject ) -> signal = ownObject.state.signals.shift() diff --git a/dev/common/behaviours/PlatformBehaviour.coffee b/dev/common/behaviours/PlatformBehaviour.coffee index 24a7bbb..51eac5f 100644 --- a/dev/common/behaviours/PlatformBehaviour.coffee +++ b/dev/common/behaviours/PlatformBehaviour.coffee @@ -39,7 +39,7 @@ class PlatformBehaviour accept: ( signal, state, callback, ownObject ) -> callback signal - if signal.owner?.id is state.owner.id or S.Types.Resources.Gold <= signal.type <= S.Types.Resources.Food + if signal.owner?.id is state.owner.id addSignal = (signal) => ownObject.state.signals.push signal ownObject.trigger 'route'