Changes randomise to randomize

This commit is contained in:
Jayant Jain 2014-07-14 06:01:09 +05:30
parent deecd7d2ff
commit 493ebd07e6
6 changed files with 22 additions and 22 deletions
app
locale
styles/editor/level/modal
templates/editor/level
views/editor/level

View file

@ -499,7 +499,6 @@
back: "Back"
revert: "Revert"
revert_models: "Revert Models"
randomise: "Randomise"
pick_a_terrain: "Pick A Terrain"
small: "Small"
grassy: "Grassy"

View file

@ -1,4 +1,4 @@
#terrain-randomise-modal
#terrain-randomize-modal
.choose-option
margin-bottom: 15px

View file

@ -80,7 +80,7 @@ block header
li(class=anonymous ? "disabled": "")
a(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert")#revert-button Revert
li(class=anonymous ? "disabled": "")
a(data-toggle="coco-modal", data-target="editor/level/modal/terrain_randomise", data-i18n="editor.randomise")#randomise-button Randomise
a(data-toggle="coco-modal", data-target="editor/level/modal/terrain_randomize", data-i18n="editor.randomize")#randomize-button Randomize
li(class=anonymous ? "disabled": "")
a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n
li.divider

View file

@ -1,5 +1,5 @@
ModalView = require 'views/kinds/ModalView'
template = require 'templates/editor/level/modal/terrain_randomise'
template = require 'templates/editor/level/modal/terrain_randomize'
CocoModel = require 'models/CocoModel'
clusters = {
@ -69,13 +69,13 @@ sizes = {
}
}
module.exports = class TerrainRandomiseModal extends ModalView
id: 'terrain-randomise-modal'
module.exports = class TerrainRandomizeModal extends ModalView
id: 'terrain-randomize-modal'
template: template
thangs = []
events:
'click .choose-option': 'onRandomise'
'click .choose-option': 'onRandomize'
onRevertModel: (e) ->
id = $(e.target).val()
@ -83,25 +83,25 @@ module.exports = class TerrainRandomiseModal extends ModalView
$(e.target).closest('tr').remove()
@reloadOnClose = true
onRandomise: (e) ->
onRandomize: (e) ->
target = $(e.target)
presetType = target.attr 'data-preset-type'
presetSize = target.attr 'data-preset-size'
@randomiseThangs presetType, presetSize
Backbone.Mediator.publish('randomise:terrain-generated',
@randomizeThangs presetType, presetSize
Backbone.Mediator.publish('randomize:terrain-generated',
'thangs': @thangs
)
@hide()
randomiseThangs: (presetName, presetSize) ->
randomizeThangs: (presetName, presetSize) ->
preset = presets[presetName]
presetSize = sizes[presetSize]
@thangs = []
@randomiseFloor preset, presetSize
@randomiseBorder preset, presetSize
@randomiseDecorations preset, presetSize
@randomizeFloor preset, presetSize
@randomizeBorder preset, presetSize
@randomizeDecorations preset, presetSize
randomiseFloor: (preset, presetSize) ->
randomizeFloor: (preset, presetSize) ->
for i in _.range(0, presetSize.x, sizes.floorSize.x)
for j in _.range(0, presetSize.y, sizes.floorSize.y)
@thangs.push {
@ -112,7 +112,7 @@ module.exports = class TerrainRandomiseModal extends ModalView
}
}
randomiseBorder: (preset, presetSize) ->
randomizeBorder: (preset, presetSize) ->
for i in _.range(0-sizes.floorSize.x/2+sizes.borderSize.x, presetSize.x-sizes.floorSize.x/2, sizes.borderSize.x)
@thangs.push {
'id': @getRandomThang(preset.borders)
@ -145,7 +145,7 @@ module.exports = class TerrainRandomiseModal extends ModalView
}
}
randomiseDecorations: (preset, presetSize)->
randomizeDecorations: (preset, presetSize)->
for name, decoration of preset.decorations
for num in _.range(_.random(decoration.num[0], decoration.num[1]))
center =

View file

@ -43,7 +43,7 @@ module.exports = class ThangsTabView extends View
'sprite:mouse-up': 'onSpriteMouseUp'
'sprite:double-clicked': 'onSpriteDoubleClicked'
'surface:stage-mouse-up': 'onStageMouseUp'
'randomise:terrain-generated': 'onRandomiseTerrain'
'randomize:terrain-generated': 'onRandomizeTerrain'
events:
'click #extant-thangs-filter button': 'onFilterExtantThangs'
@ -224,11 +224,12 @@ module.exports = class ThangsTabView extends View
return unless e.thang
@editThang thangID: e.thang.id
onRandomiseTerrain: (e) ->
onRandomizeTerrain: (e) ->
console.log 'here'
@thangsBatch = []
for id in @randomiseThangIDs?
for id in @randomizeThangIDs?
@thangsTreema.delete "id=#{id}"
@randomiseThangIDs = []
@randomizeThangIDs = []
for thang in e.thangs
@selectAddThangType thang.id
@addThang @addThangType, thang.pos, true
@ -408,7 +409,7 @@ module.exports = class ThangsTabView extends View
addThang: (thangType, pos, batchInsert = false) ->
thangID = Thang.nextID(thangType.get('name'), @world) until thangID and not @thangsTreema.get "id=#{thangID}"
@randomiseThangIDs.push thangID
@randomizeThangIDs.push thangID
if @cloneSourceThang
components = _.cloneDeep @thangsTreema.get "id=#{@cloneSourceThang.id}/components"
@selectAddThang null