diff --git a/Code/assets/buttons/add.png b/Code/assets/buttons/add.png new file mode 100644 index 0000000..fc77c71 Binary files /dev/null and b/Code/assets/buttons/add.png differ diff --git a/Code/assets/buttons/enemyBot.png b/Code/assets/buttons/enemyBot.png new file mode 100644 index 0000000..38f5710 Binary files /dev/null and b/Code/assets/buttons/enemyBot.png differ diff --git a/Code/assets/buttons/fleeFrom.png b/Code/assets/buttons/fleeFrom.png new file mode 100644 index 0000000..c9a613f Binary files /dev/null and b/Code/assets/buttons/fleeFrom.png differ diff --git a/Code/assets/buttons/longRange.png b/Code/assets/buttons/longRange.png new file mode 100644 index 0000000..83ece7f Binary files /dev/null and b/Code/assets/buttons/longRange.png differ diff --git a/Code/assets/buttons/mediumRange.png b/Code/assets/buttons/mediumRange.png new file mode 100644 index 0000000..13ccd1a Binary files /dev/null and b/Code/assets/buttons/mediumRange.png differ diff --git a/Code/assets/buttons/moveToward.png b/Code/assets/buttons/moveToward.png new file mode 100644 index 0000000..1fde2b1 Binary files /dev/null and b/Code/assets/buttons/moveToward.png differ diff --git a/Code/assets/buttons/myself.png b/Code/assets/buttons/myself.png new file mode 100644 index 0000000..8c4a09e Binary files /dev/null and b/Code/assets/buttons/myself.png differ diff --git a/Code/assets/buttons/shield0.png b/Code/assets/buttons/shield0.png new file mode 100644 index 0000000..186d378 Binary files /dev/null and b/Code/assets/buttons/shield0.png differ diff --git a/Code/assets/buttons/shield100.png b/Code/assets/buttons/shield100.png new file mode 100644 index 0000000..59e2fb7 Binary files /dev/null and b/Code/assets/buttons/shield100.png differ diff --git a/Code/assets/buttons/shield33.png b/Code/assets/buttons/shield33.png new file mode 100644 index 0000000..11ae175 Binary files /dev/null and b/Code/assets/buttons/shield33.png differ diff --git a/Code/assets/buttons/shield66.png b/Code/assets/buttons/shield66.png new file mode 100644 index 0000000..457fdc1 Binary files /dev/null and b/Code/assets/buttons/shield66.png differ diff --git a/Code/assets/buttons/shortRange.png b/Code/assets/buttons/shortRange.png new file mode 100644 index 0000000..3a627db Binary files /dev/null and b/Code/assets/buttons/shortRange.png differ diff --git a/Code/index.html b/Code/index.html index 0a8da76..ceab8f3 100644 --- a/Code/index.html +++ b/Code/index.html @@ -13,6 +13,7 @@
+ diff --git a/Code/public/js/AddNode.js b/Code/public/js/AddNode.js new file mode 100644 index 0000000..b92c512 --- /dev/null +++ b/Code/public/js/AddNode.js @@ -0,0 +1,55 @@ +class AddNode extends Phaser.Scene { + constructor(game, selected) { + super('AddNode'); + this.game = game; + this.selected = selected; + } + + create() { + let height = HEIGHT_WINDOW / (4 / 3); + this.add.rectangle(0, 0, WIDTH_WINDOW, HEIGHT_WINDOW, 0x000000).setOrigin(0, 0).setAlpha(0.5); + this.add.rectangle(0, HEIGHT_WINDOW / 2, WIDTH_WINDOW, height, 0x35363A).setOrigin(0, 0.5); + this.createButtonCancel(); + this.createButtonAdd(); + } + + + addButton(x, y, width, height, texture) { + let btn = this.add.image(x, y, texture).setOrigin(0.5, 0.5).setInteractive(); + btn.on('pointerover', () => btn.setFrame(1)); + btn.on('pointerout', () => btn.setFrame(0)); + btn.displayHeight = height; + if (width === null) { + btn.scaleX = btn.scaleY; + } else { + btn.displayWidth = width; + } + return btn; + } + + addTitle(x, y, title) { + let sizeText = HEIGHT_WINDOW / 12; + let style = {font: sizeText.toString() + 'px stencil', fill: "#e2e2e2"}; + this.add.text(x, y, title, style).setOrigin(0.5, 0.5); + } + + createButtonCancel() { + this.addButton(WIDTH_WINDOW / 3, HEIGHT_WINDOW / (16 / 15), null, HEIGHT_WINDOW / 9, 'cancel') + .on('pointerdown', () => this.cancel()); + } + + createButtonAdd() { + this.addButton(WIDTH_WINDOW / 1.5, HEIGHT_WINDOW / (16 / 15), null, HEIGHT_WINDOW / 9, 'add') + .on('pointerdown', () => this.add()); + } + + add() { + + } + + cancel() { + this.scene.resume('Game'); + this.scene.stop('AddNode'); + this.game.scene.remove('AddNode'); + } +} \ No newline at end of file diff --git a/Code/public/js/class.min.js b/Code/public/js/class.min.js index 87585c8..54998d9 100644 --- a/Code/public/js/class.min.js +++ b/Code/public/js/class.min.js @@ -1 +1 @@ -class AddAttack extends Phaser.Scene{constructor(t){super("addNode"),this.game=t}create(){this.add.rectangle(0,0,WIDTH_WINDOW,HEIGHT_WINDOW,0).setOrigin(0,0).setAlpha(.5),console.log("ATTACK"),this.createButton()}createButton(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW-100;this.cancelBtn=this.add.image(t,e,"cancel").setOrigin(.5,.5).setInteractive(),this.cancelBtn.on("pointerover",()=>this.cancelBtn.setFrame(1)),this.cancelBtn.on("pointerout",()=>this.cancelBtn.setFrame(0)),this.cancelBtn.on("pointerdown",()=>this.cancel())}cancel(){this.scene.resume("Game"),this.scene.stop("addNode"),this.game.scene.remove("addNode")}}class AddCondition extends Phaser.Scene{constructor(t){super("addNode"),this.game=t}create(){this.add.rectangle(0,0,WIDTH_WINDOW,HEIGHT_WINDOW,0).setOrigin(0,0).setAlpha(.5),console.log("CONDITION"),this.createButton()}createButton(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW-100;this.cancelBtn=this.add.image(t,e,"cancel").setOrigin(.5,.5).setInteractive(),this.cancelBtn.on("pointerover",()=>this.cancelBtn.setFrame(1)),this.cancelBtn.on("pointerout",()=>this.cancelBtn.setFrame(0)),this.cancelBtn.on("pointerdown",()=>this.cancel())}cancel(){this.scene.resume("Game"),this.scene.stop("addNode"),this.game.scene.remove("addNode")}}class AddMove extends Phaser.Scene{constructor(t){super("addNode"),this.game=t}create(){this.add.rectangle(0,0,WIDTH_WINDOW,HEIGHT_WINDOW,0).setOrigin(0,0).setAlpha(.5),console.log("MOVE"),this.createButton()}createButton(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW-100;this.cancelBtn=this.add.image(t,e,"cancel").setOrigin(.5,.5).setInteractive(),this.cancelBtn.on("pointerover",()=>this.cancelBtn.setFrame(1)),this.cancelBtn.on("pointerout",()=>this.cancelBtn.setFrame(0)),this.cancelBtn.on("pointerdown",()=>this.cancel())}cancel(){this.scene.resume("Game"),this.scene.stop("addNode"),this.game.scene.remove("addNode")}}class Attack{constructor(){}do(t){return!(!t.haveTarget()||!t.isTargetInRange())&&t.attackTarget()}}class Boot extends Phaser.Scene{constructor(){super("Boot")}preload(){let t=this.add.graphics(),e=this.add.graphics(),i=WIDTH_WINDOW/2-160,s=HEIGHT_WINDOW/2-25;e.fillStyle(2236962,.8),e.fillRect(i,s,320,50),this.load.on("progress",function(e){t.clear(),t.fillStyle(16777215,1),t.fillRect(i+10,s+10,300*e,30)}),this.load.on("complete",function(){t.destroy(),e.destroy()}),this.load.spritesheet("btn_play","assets/btnPlay.png",{frameWidth:650,frameHeight:170}),this.load.spritesheet("btn_duel","assets/btnDuel.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_last","assets/btnLast.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_team","assets/btnTeam.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_flag","assets/btnFlag.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_map","assets/btnMap.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("play","assets/play.png",{frameWidth:100,frameHeight:100}),this.load.image("background","assets/background.png"),this.load.image("bullet","assets/bullet.png"),this.load.image("logoWaria","assets/logoWaria.png"),this.load.spritesheet("attackN","assets/nodes/attackNode.png",{frameWidth:180,frameHeight:190}),this.load.spritesheet("moveN","assets/nodes/moveNode.png",{frameWidth:180,frameHeight:190}),this.load.spritesheet("conditionN","assets/nodes/conditionNode.png",{frameWidth:180,frameHeight:190}),this.load.image("attack","assets/nodes/attack.png"),this.load.image("move","assets/nodes/move.png"),this.load.image("condition","assets/nodes/condition.png"),this.load.spritesheet("bin","assets/buttons/bin.png",{frameWidth:100,frameHeight:100}),this.load.spritesheet("plus","assets/buttons/plus.png",{frameWidth:100,frameHeight:100}),this.load.spritesheet("pencil","assets/buttons/pencil.png",{frameWidth:100,frameHeight:100}),this.load.spritesheet("cancel","assets/buttons/cancel.png",{frameWidth:550,frameHeight:150})}create(){this.add.text(WIDTH_WINDOW/2,HEIGHT_WINDOW/3,"WARIA",{font:"200px stencil",fill:"#e2e2e2"}).setOrigin(.5,.5);let t=this.add.sprite(WIDTH_WINDOW/2,HEIGHT_WINDOW/3*2,"btn_play").setInteractive();t.on("pointerout",()=>t.setFrame(0)),t.on("pointerover",()=>t.setFrame(1)),t.on("pointerdown",()=>this.clickPlay(t))}clickPlay(t){t.setFrame(2),console.log("Play"),this.scene.start("Type")}}class Condition{constructor(t,e=!1,i=!1,s,a){this.shieldFilter=e,this.rangeFilter=i,this.shield=s,this.range=a,this.target=t,this.lNode=[]}addNode(t){this.lNode.push(t)}do(t){if(this.doCondition(t))for(let e=0;et.getX()-e.getX();this.tree.lRect.sort(t),this.tree.lRect.forEach(function(e){void 0!==e.lRect&&e.lRect.sort(t)}),this.gm.modifyNodes(this.tree.getNodes()),this.scene.resume("GamingBoard")}createButton(){let t=WIDTH_MAP+WIDTH_WINDOW/10,e=WIDTH_MAP+HEIGHT_WINDOW/10+5,i=HEIGHT_WINDOW/10,s=HEIGHT_WINDOW/15,a=this.add.sprite(t,e,"play").setOrigin(1,0).setInteractive();this.pencil=this.add.sprite(t-i,e,"pencil").setOrigin(1,0).setInteractive().setVisible(!1),this.bin=this.add.sprite(t-2*i,e,"bin").setOrigin(1,0).setInteractive().setVisible(!1),this.plus=this.add.sprite(t-3*i,e,"plus").setOrigin(1,0).setInteractive().setVisible(!1),this.line=0,a.displayHeight=a.displayWidth=s,this.pencil.displayHeight=this.pencil.displayWidth=s,this.bin.displayHeight=this.bin.displayWidth=s,this.plus.displayHeight=this.plus.displayWidth=s,this.creatBtnOutAndOver(a),this.creatBtnOutAndOver(this.pencil),this.creatBtnOutAndOver(this.bin),this.creatBtnOutAndOver(this.plus),a.on("pointerdown",()=>this.clickPlay(a)),this.pencil.on("pointerdown",()=>this.clickPencil()),this.bin.on("pointerdown",()=>this.clickBin()),this.plus.on("pointerdown",()=>this.clickPlus()),this.input.on("pointerdown",()=>this.OK()),this.input.on("drag",this.doDrag),this.input.on("dragstart",()=>this.pauseScene(a))}creatBtnOutAndOver(t){t.on("pointerout",()=>this.changeFrame(t,0)),t.on("pointerover",()=>this.changeFrame(t,1))}clickPlay(t){this.scene.isPaused("GamingBoard")?this.resume():this.pauseScene(t),this.changeFrame(t,1)}clickPencil(){console.log("PENCIL"),this.changeFrame(this.pencil,0)}clickBin(){console.log("BIN"),this.tree.delete(this.selected),this.changeFrame(this.bin,0)}clickPlus(){console.log("PLUS"),this.scene.launch("PlusNode"),this.changeFrame(this.plus,0),this.scene.pause("Game")}}class GamingBoard extends Phaser.Scene{constructor(){super("GamingBoard"),this.listRobot=[]}preload(){this.cameras.main.setViewport(WIDTH_WINDOW/10,HEIGHT_WINDOW/10,WIDTH_MAP,WIDTH_MAP)}create(){this.add.image(0,0,"background").alpha=.1;for(let t=0;tthis.resume()),this.time.addEvent({delay:2e3,callback:this.upShield,callbackScope:this})}update(t,e){super.update(t,e),this.listRobot.forEach(function(t){t.read()});for(let t=0;tthis.listRobot[0].addNode(t))}chooseTarget(t){let e=2*WIDTH_MAP,i=[];this.listRobot.forEach(function(s){if(s!==t&&s.isAlive()){let a=Math.hypot(s.x-t.x,s.y-t.y);e>=a&&(e>a&&(e=a,i=[]),i.push(s))}}),this.listRobot.length>1?t.setTarget(i[Math.floor(Math.random()*(i.length+1))]):t.setTarget(i[0])}upShield(){this.listRobot.forEach(t=>t.addShield(SHIELD_PER_SECOND)),this.time.addEvent({delay:1e3,callback:this.upShield,callbackScope:this})}}class HealthBar{constructor(t,e,i,s,a,h,n){this.bar=new Phaser.GameObjects.Graphics(t),this.width=e,this.height=i,this.valueMax=h,this.value=h,this.color=n,this.draw(),this.setX(s),this.setY(a),t.add.existing(this.bar)}decrease(t){this.value-=t;let e=0;return this.value<0&&(e=-this.value,this.value=0),this.draw(),e}increase(t){this.value+=t,this.value>this.valueMax&&(this.value=this.valueMax),this.draw()}setX(t){this.bar.setX(t-this.width/2)}setY(t){this.bar.setY(t)}draw(){this.bar.clear(),this.bar.fillStyle(0),this.bar.fillRect(0,0,this.width,this.height),this.bar.fillStyle(16777215),this.bar.fillRect(2,2,this.width-4,this.height-4);let t=this.value/this.valueMax;t<1/3?this.bar.fillStyle(16711680):this.bar.fillStyle(this.color);let e=Math.floor(t*(this.width-4));this.bar.fillRect(2,2,e,this.height-4)}destroy(){this.bar.destroy()}}class Missile extends Phaser.GameObjects.Image{constructor(t,e,i,s){super(t,0,0,e),this.visible=!1,this.setOrigin(.5,.5),this.setScale(.02)}}class Move{constructor(t){this.toward=t}do(t){return!!t.haveTarget()&&(!0===this.toward?this.moveToward(t):this.fleeFrom(t))}moveToward(t){return t.advanceToTarget()}fleeFrom(t){return t.fleeFromTarget()}}class PlusNode extends Phaser.Scene{constructor(t){super("PlusNode"),this.game=t}create(){this.add.rectangle(0,0,WIDTH_WINDOW,HEIGHT_WINDOW,0).setOrigin(0,0).setAlpha(.5),this.add.rectangle(0,HEIGHT_WINDOW/2,WIDTH_WINDOW,HEIGHT_WINDOW/2,3487290).setOrigin(0,.5),this.createNode(),this.createButton()}createNode(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW/2,i=WIDTH_WINDOW/4,s=HEIGHT_WINDOW/10,a={font:s.toString()+"px stencil",fill:"#e2e2e2"};this.add.text(t-i,e-s,"ATTACK",a).setOrigin(.5,.5),this.add.text(t,e-s,"MOVE",a).setOrigin(.5,.5),this.add.text(t+i,e-s,"CONDITION",a).setOrigin(.5,.5),this.add.sprite(t-i,e+s,"attack").setOrigin(.5,.5).setInteractive().on("pointerdown",()=>this.click("attack")),this.add.sprite(t,e+s,"move").setOrigin(.5,.5).setInteractive().on("pointerdown",()=>this.click("move")),this.add.sprite(t+i,e+s,"condition").setOrigin(.5,.5).setInteractive().on("pointerdown",()=>this.click("condition"))}click(t){switch(t.toString()){case"attack":this.game.scene.add("addNode",new AddAttack(this.game));break;case"move":this.game.scene.add("addNode",new AddMove(this.game));break;case"condition":this.game.scene.add("addNode",new AddCondition(this.game))}this.scene.launch("addNode"),this.scene.stop("PlusNode"),console.log(t.toString())}createButton(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW-100;this.cancelBtn=this.add.image(t,e,"cancel").setOrigin(.5,.5).setInteractive(),this.cancelBtn.on("pointerover",()=>this.cancelBtn.setFrame(1)),this.cancelBtn.on("pointerout",()=>this.cancelBtn.setFrame(0)),this.cancelBtn.on("pointerdown",()=>this.cancel())}cancel(){this.scene.resume("Game"),this.scene.stop("PlusNode")}}class RectangleNode{constructor(t,e,i,s,...a){switch(s.toString().toLowerCase()){case"attack":this.rect=new Phaser.GameObjects.Image(i,t,e,"attackN"),this.node=new Attack,this.canAddNode=!1,this.line=i.add.graphics();break;case"move":this.rect=new Phaser.GameObjects.Image(i,t,e,"moveN"),this.node=new Move(a[0]),this.canAddNode=!1,this.line=i.add.graphics(),!0===a[0]?this.rect.setFrame(0):this.rect.setFrame(2);break;case"condition":let h;this.rect=new Phaser.GameObjects.Image(i,t,e,"conditionN"),this.node=new Condition(a[0],a[1],a[2],a[3],a[4]),this.canAddNode=!0,this.lRect=[],this.scene=i,this.line=i.add.graphics(),h="myself"===a[0].name.toString().toLowerCase()?0:1;let n=0;!0===a[1]&&(n=Math.floor(3*a[3])),a[2],this.rect.setFrame(4*h+n);break;case"waria":this.rect=new Phaser.GameObjects.Image(i,t,e,"logoWaria").setInteractive(),this.canAddNode=!0,this.lRect=[],this.scene=i,this.scene.add.existing(this.rect);break;default:return void console.log("Création d'un node echoué")}s.toString().toLowerCase(),this.rect.on("pointerdown",()=>this.click()),this.rect.setOrigin(.5,0),this.rect.displayHeight=HEIGHT_WINDOW/6,this.rect.scaleX=this.rect.scaleY}getSelected(){if(this.rect.isTinted)return this;if(this.canAddNode)for(let t=0;tthis.addLine(t))}addLine(t){t.setLine(this.rect.x,this.rect.y+.9*this.rect.displayHeight)}getNodes(){if(void 0===this.node){let t=[];return this.lRect.forEach(function(e){void 0!==e.node&&(void 0!==e.lRect&&(e.node.clearNodes(),e.lRect.forEach(t=>e.node.addNode(t.node))),t.push(e.node))}),t}}destroy(){this.line.destroy(),this.rect.destroy(),void 0!==this.lRect&&this.lRect.forEach(t=>t.destroy())}delete(t){let e=this.lRect.indexOf(t);if(-1!==e)return this.lRect.splice(e,1),t.destroy(),!0;for(let e=0;e=0&&this.x>=this.target.x||this.velocityX<=0&&this.x<=this.target.x?this.setX(this.target.x):this.setX(this.x+this.velocityX),this.velocityY>=0&&this.y>=this.target.y||this.velocityY<=0&&this.y<=this.target.y?this.setY(this.target.y):this.setY(this.y+this.velocityY),!0)}fleeFromTarget(){return!!this.verifyTarget()&&(this.velocityX>=0&&this.x-this.width/2<=0?this.setX(this.width/2):this.velocityX<=0&&this.x+this.width/2>=WIDTH_MAP?this.setX(WIDTH_MAP-this.width/2):this.setX(this.x-this.velocityX),this.velocityY>=0&&this.y-this.width/2<=0?this.setY(this.height/2):this.velocityY<=0&&this.y+this.width/2>=WIDTH_MAP?this.setY(WIDTH_MAP-this.height/2):this.setY(this.y-this.velocityY),!0)}attackTarget(){return!!(this.verifyTarget()&&this.target.isAlive()&&this.isTargetInRange())&&(this.canAttack&&this.attack(this.target),!0)}verifyTarget(){return!!this.haveTarget()&&(!!this.target.isAlive()||(this.setTarget(null),!1))}attack(t){this.canAttack=!1,this.missile.setPosition(this.x,this.y).setVisible(!0),this.missile.setRotation(Math.atan2(this.y-this.target.y,this.x-this.target.x)-1.57),this.scene.tweens.add({targets:this.missile,x:t.x,y:t.y,ease:"Linear",duration:200,onComplete:()=>this.finishAttack(t)}),this.scene.time.addEvent({delay:Phaser.Math.Between(1e3,3e3),callback:this.reload,callbackScope:this})}finishAttack(t){t.beAttack(this.damage)&&this.setTarget(null),this.missile.setVisible(!1)}reload(){this.canAttack=!0}beAttack(t){let e=this.shield.decrease(t);return e>0&&(console.log("Shield Broken"),this.life.decrease(e)),this.die()}isTargetInRange(){return!!this.verifyTarget()&&this.calcDistance(this.target)0}die(){return 0===this.life.value&&(this.circle.destroy(),this.shield.destroy(),this.life.destroy(),!0)}haveTarget(){return null!=this.target}read(){for(let t=0;tt.setFrame(0)),t.on("pointerover",()=>t.setFrame(1)),t.on("pointerdown",()=>this.clickPlay(t))}clickPlay(t){this.scene.start("Game")}} \ No newline at end of file +class AddAttack extends AddNode{constructor(t,e){super(t,e),this.game=t}create(){console.log("ATTACK"),super.create(),super.addTitle(WIDTH_WINDOW/2,HEIGHT_WINDOW/16,"ADD NODE : ATTACK"),super.addTitle(WIDTH_WINDOW/2,HEIGHT_WINDOW/(16/3),"WHO ?"),super.addButton(WIDTH_WINDOW/2,HEIGHT_WINDOW/3.2,null,HEIGHT_WINDOW/8,"enemyBot")}}class AddCondition extends AddNode{constructor(t,e){super(t,e),this.game=t,this.selected=e}create(){super.create(),console.log("CONDITION"),super.addTitle(WIDTH_WINDOW/2,HEIGHT_WINDOW/16,"ADD NODE : CONDITION"),super.addTitle(WIDTH_WINDOW/2,HEIGHT_WINDOW/(16/3),"WHO ?"),super.addButton(WIDTH_WINDOW/3,HEIGHT_WINDOW/3.2,null,HEIGHT_WINDOW/8,"enemyBot"),super.addButton(WIDTH_WINDOW/1.5,HEIGHT_WINDOW/3.2,null,HEIGHT_WINDOW/8,"myself")}}class AddMove extends AddNode{constructor(t,e){super(t,e),this.game=t}create(){console.log("MOVE"),super.create(),super.addTitle(WIDTH_WINDOW/2,HEIGHT_WINDOW/16,"ADD NODE : MOVE"),super.addTitle(WIDTH_WINDOW/4,HEIGHT_WINDOW/(16/3),"FLEE OR MOVE ?"),super.addButton(WIDTH_WINDOW/6,HEIGHT_WINDOW/3.2,null,HEIGHT_WINDOW/8,"fleeFrom"),super.addButton(WIDTH_WINDOW/3,HEIGHT_WINDOW/3.2,null,HEIGHT_WINDOW/8,"moveToward"),super.addTitle(WIDTH_WINDOW/4*3,HEIGHT_WINDOW/(16/3),"WHO ?"),super.addButton(WIDTH_WINDOW/4*3,HEIGHT_WINDOW/3.2,null,HEIGHT_WINDOW/8,"enemyBot")}}class Attack{constructor(){}do(t){return!(!t.haveTarget()||!t.isTargetInRange())&&t.attackTarget()}}class Boot extends Phaser.Scene{constructor(){super("Boot")}preload(){let t=this.add.graphics(),e=this.add.graphics(),s=WIDTH_WINDOW/2-160,i=HEIGHT_WINDOW/2-25;e.fillStyle(2236962,.8),e.fillRect(s,i,320,50),this.load.on("progress",function(e){t.clear(),t.fillStyle(16777215,1),t.fillRect(s+10,i+10,300*e,30)}),this.load.on("complete",function(){t.destroy(),e.destroy()}),this.load.spritesheet("btn_play","assets/btnPlay.png",{frameWidth:650,frameHeight:170}),this.load.spritesheet("btn_duel","assets/btnDuel.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_last","assets/btnLast.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_team","assets/btnTeam.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_flag","assets/btnFlag.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("btn_map","assets/btnMap.png",{frameWidth:269,frameHeight:262}),this.load.spritesheet("play","assets/play.png",{frameWidth:100,frameHeight:100}),this.load.image("background","assets/background.png"),this.load.image("bullet","assets/bullet.png"),this.load.image("logoWaria","assets/logoWaria.png"),this.load.spritesheet("attackN","assets/nodes/attackNode.png",{frameWidth:180,frameHeight:190}),this.load.spritesheet("moveN","assets/nodes/moveNode.png",{frameWidth:180,frameHeight:190}),this.load.spritesheet("conditionN","assets/nodes/conditionNode.png",{frameWidth:180,frameHeight:190}),this.load.image("attack","assets/nodes/attack.png"),this.load.image("move","assets/nodes/move.png"),this.load.image("condition","assets/nodes/condition.png"),this.load.spritesheet("bin","assets/buttons/bin.png",{frameWidth:100,frameHeight:100}),this.load.spritesheet("plus","assets/buttons/plus.png",{frameWidth:100,frameHeight:100}),this.load.spritesheet("pencil","assets/buttons/pencil.png",{frameWidth:100,frameHeight:100}),this.load.spritesheet("cancel","assets/buttons/cancel.png",{frameWidth:550,frameHeight:150}),this.load.spritesheet("add","assets/buttons/add.png",{frameWidth:550,frameHeight:150}),this.load.spritesheet("shortRange","assets/buttons/shortRange.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("mediumRange","assets/buttons/mediumRange.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("longRange","assets/buttons/longRange.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("shield0","assets/buttons/shield0.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("shield33","assets/buttons/shield33.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("shield66","assets/buttons/shield66.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("shield100","assets/buttons/shield100.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("myself","assets/buttons/myself.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("enemyBot","assets/buttons/enemyBot.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("moveToward","assets/buttons/moveToward.png",{frameWidth:300,frameHeight:150}),this.load.spritesheet("fleeFrom","assets/buttons/fleeFrom.png",{frameWidth:300,frameHeight:150})}create(){this.add.text(WIDTH_WINDOW/2,HEIGHT_WINDOW/3,"WARIA",{font:"200px stencil",fill:"#e2e2e2"}).setOrigin(.5,.5);let t=this.add.sprite(WIDTH_WINDOW/2,HEIGHT_WINDOW/3*2,"btn_play").setInteractive();t.on("pointerout",()=>t.setFrame(0)),t.on("pointerover",()=>t.setFrame(1)),t.on("pointerdown",()=>this.clickPlay(t))}clickPlay(t){t.setFrame(2),console.log("Play"),this.scene.start("Type")}}class Condition{constructor(t,e=!1,s=!1,i,h){this.shieldFilter=e,this.rangeFilter=s,this.shield=i,this.range=h,this.target=t,this.lNode=[]}addNode(t){this.lNode.push(t)}do(t){if(this.doCondition(t))for(let e=0;et.getX()-e.getX();this.tree.lRect.sort(t),this.tree.lRect.forEach(function(e){void 0!==e.lRect&&e.lRect.sort(t)}),this.gm.modifyNodes(this.tree.getNodes()),this.scene.resume("GamingBoard")}createButton(){let t=WIDTH_MAP+WIDTH_WINDOW/10,e=WIDTH_MAP+HEIGHT_WINDOW/10+5,s=HEIGHT_WINDOW/10,i=HEIGHT_WINDOW/15,h=this.add.sprite(t,e,"play").setOrigin(1,0).setInteractive();this.pencil=this.add.sprite(t-s,e,"pencil").setOrigin(1,0).setInteractive().setVisible(!1),this.bin=this.add.sprite(t-2*s,e,"bin").setOrigin(1,0).setInteractive().setVisible(!1),this.plus=this.add.sprite(t-3*s,e,"plus").setOrigin(1,0).setInteractive().setVisible(!1),this.line=0,h.displayHeight=h.displayWidth=i,this.pencil.displayHeight=this.pencil.displayWidth=i,this.bin.displayHeight=this.bin.displayWidth=i,this.plus.displayHeight=this.plus.displayWidth=i,this.creatBtnOutAndOver(h),this.creatBtnOutAndOver(this.pencil),this.creatBtnOutAndOver(this.bin),this.creatBtnOutAndOver(this.plus),h.on("pointerdown",()=>this.clickPlay(h)),this.pencil.on("pointerdown",()=>this.clickPencil()),this.bin.on("pointerdown",()=>this.clickBin()),this.plus.on("pointerdown",()=>this.clickPlus()),this.input.on("pointerdown",()=>this.OK()),this.input.on("drag",this.doDrag),this.input.on("dragstart",()=>this.pauseScene(h))}creatBtnOutAndOver(t){t.on("pointerout",()=>this.changeFrame(t,0)),t.on("pointerover",()=>this.changeFrame(t,1))}clickPlay(t){this.scene.isPaused("GamingBoard")?this.resume():this.pauseScene(t),this.changeFrame(t,1)}clickPencil(){console.log("PENCIL"),this.changeFrame(this.pencil,0)}clickBin(){console.log("BIN"),this.tree.delete(this.selected),this.changeFrame(this.bin,0)}clickPlus(){console.log("PLUS"),this.game.scene.add("PlusNode",new PlusNode(this.game,this.selected)),this.scene.launch("PlusNode"),this.changeFrame(this.plus,0),this.scene.pause("Game")}}class GamingBoard extends Phaser.Scene{constructor(){super("GamingBoard"),this.listRobot=[]}preload(){this.cameras.main.setViewport(WIDTH_WINDOW/10,HEIGHT_WINDOW/10,WIDTH_MAP,WIDTH_MAP)}create(){this.add.image(0,0,"background").alpha=.1;for(let t=0;tthis.resume()),this.time.addEvent({delay:2e3,callback:this.upShield,callbackScope:this})}update(t,e){super.update(t,e),this.listRobot.forEach(function(t){t.read()});for(let t=0;tthis.listRobot[0].addNode(t))}chooseTarget(t){let e=2*WIDTH_MAP,s=[];this.listRobot.forEach(function(i){if(i!==t&&i.isAlive()){let h=Math.hypot(i.x-t.x,i.y-t.y);e>=h&&(e>h&&(e=h,s=[]),s.push(i))}}),this.listRobot.length>1?t.setTarget(s[Math.floor(Math.random()*(s.length+1))]):t.setTarget(s[0])}upShield(){this.listRobot.forEach(t=>t.addShield(SHIELD_PER_SECOND)),this.time.addEvent({delay:1e3,callback:this.upShield,callbackScope:this})}}class HealthBar{constructor(t,e,s,i,h,a,r){this.bar=new Phaser.GameObjects.Graphics(t),this.width=e,this.height=s,this.valueMax=a,this.value=a,this.color=r,this.draw(),this.setX(i),this.setY(h),t.add.existing(this.bar)}decrease(t){this.value-=t;let e=0;return this.value<0&&(e=-this.value,this.value=0),this.draw(),e}increase(t){this.value+=t,this.value>this.valueMax&&(this.value=this.valueMax),this.draw()}setX(t){this.bar.setX(t-this.width/2)}setY(t){this.bar.setY(t)}draw(){this.bar.clear(),this.bar.fillStyle(0),this.bar.fillRect(0,0,this.width,this.height),this.bar.fillStyle(16777215),this.bar.fillRect(2,2,this.width-4,this.height-4);let t=this.value/this.valueMax;t<1/3?this.bar.fillStyle(16711680):this.bar.fillStyle(this.color);let e=Math.floor(t*(this.width-4));this.bar.fillRect(2,2,e,this.height-4)}destroy(){this.bar.destroy()}}class Missile extends Phaser.GameObjects.Image{constructor(t,e,s,i){super(t,0,0,e),this.visible=!1,this.setOrigin(.5,.5),this.setScale(.02)}}class Move{constructor(t){this.toward=t}do(t){return!!t.haveTarget()&&(!0===this.toward?this.moveToward(t):this.fleeFrom(t))}moveToward(t){return t.advanceToTarget()}fleeFrom(t){return t.fleeFromTarget()}}class PlusNode extends Phaser.Scene{constructor(t,e){super("PlusNode"),this.game=t,this.selected=e}create(){this.add.rectangle(0,0,WIDTH_WINDOW,HEIGHT_WINDOW,0).setOrigin(0,0).setAlpha(.5),this.add.rectangle(0,HEIGHT_WINDOW/2,WIDTH_WINDOW,HEIGHT_WINDOW/2,3487290).setOrigin(0,.5),this.createNode(),this.createButton()}createNode(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW/2,s=WIDTH_WINDOW/4,i=HEIGHT_WINDOW/10,h={font:i.toString()+"px stencil",fill:"#e2e2e2"};this.add.text(t-s,e-i,"ATTACK",h).setOrigin(.5,.5),this.add.text(t,e-i,"MOVE",h).setOrigin(.5,.5),this.add.text(t+s,e-i,"CONDITION",h).setOrigin(.5,.5),this.add.sprite(t-s,e+i,"attack").setOrigin(.5,.5).setInteractive().on("pointerdown",()=>this.click("attack")),this.add.sprite(t,e+i,"move").setOrigin(.5,.5).setInteractive().on("pointerdown",()=>this.click("move")),this.add.sprite(t+s,e+i,"condition").setOrigin(.5,.5).setInteractive().on("pointerdown",()=>this.click("condition"))}click(t){switch(t.toString()){case"attack":this.game.scene.add("AddNode",new AddAttack(this.game,this.selected));break;case"move":this.game.scene.add("AddNode",new AddMove(this.game,this.selected));break;case"condition":this.game.scene.add("AddNode",new AddCondition(this.game,this.selected))}this.scene.launch("AddNode"),this.scene.stop("PlusNode"),this.game.scene.remove("PlusNode")}createButton(){let t=WIDTH_WINDOW/2,e=HEIGHT_WINDOW-100;this.cancelBtn=this.add.image(t,e,"cancel").setOrigin(.5,.5).setInteractive(),this.cancelBtn.on("pointerover",()=>this.cancelBtn.setFrame(1)),this.cancelBtn.on("pointerout",()=>this.cancelBtn.setFrame(0)),this.cancelBtn.on("pointerdown",()=>this.cancel())}cancel(){this.scene.resume("Game"),this.scene.stop("PlusNode"),this.game.scene.remove("PlusNode")}}class RectangleNode{constructor(t,e,s,i,...h){switch(i.toString().toLowerCase()){case"attack":this.rect=new Phaser.GameObjects.Image(s,t,e,"attackN"),this.node=new Attack,this.canAddNode=!1,this.line=s.add.graphics();break;case"move":this.rect=new Phaser.GameObjects.Image(s,t,e,"moveN"),this.node=new Move(h[0]),this.canAddNode=!1,this.line=s.add.graphics(),!0===h[0]?this.rect.setFrame(0):this.rect.setFrame(2);break;case"condition":let a;this.rect=new Phaser.GameObjects.Image(s,t,e,"conditionN"),this.node=new Condition(h[0],h[1],h[2],h[3],h[4]),this.canAddNode=!0,this.lRect=[],this.scene=s,this.line=s.add.graphics(),a="myself"===h[0].name.toString().toLowerCase()?0:1;let r=0;!0===h[1]&&(r=Math.floor(3*h[3])),h[2],this.rect.setFrame(4*a+r);break;case"waria":this.rect=new Phaser.GameObjects.Image(s,t,e,"logoWaria").setInteractive(),this.canAddNode=!0,this.lRect=[],this.scene=s,this.scene.add.existing(this.rect);break;default:return void console.log("Création d'un node echoué")}i.toString().toLowerCase(),this.rect.on("pointerdown",()=>this.click()),this.rect.setOrigin(.5,0),this.rect.displayHeight=HEIGHT_WINDOW/6,this.rect.scaleX=this.rect.scaleY}getSelected(){if(this.rect.isTinted)return this;if(this.canAddNode)for(let t=0;tthis.addLine(t))}addLine(t){t.setLine(this.rect.x,this.rect.y+.9*this.rect.displayHeight)}getNodes(){if(void 0===this.node){let t=[];return this.lRect.forEach(function(e){void 0!==e.node&&(void 0!==e.lRect&&(e.node.clearNodes(),e.lRect.forEach(t=>e.node.addNode(t.node))),t.push(e.node))}),t}}destroy(){this.line.destroy(),this.rect.destroy(),void 0!==this.lRect&&this.lRect.forEach(t=>t.destroy())}delete(t){let e=this.lRect.indexOf(t);if(-1!==e)return this.lRect.splice(e,1),t.destroy(),!0;for(let e=0;e=0&&this.x>=this.target.x||this.velocityX<=0&&this.x<=this.target.x?this.setX(this.target.x):this.setX(this.x+this.velocityX),this.velocityY>=0&&this.y>=this.target.y||this.velocityY<=0&&this.y<=this.target.y?this.setY(this.target.y):this.setY(this.y+this.velocityY),!0)}fleeFromTarget(){return!!this.verifyTarget()&&(this.velocityX>=0&&this.x-this.width/2<=0?this.setX(this.width/2):this.velocityX<=0&&this.x+this.width/2>=WIDTH_MAP?this.setX(WIDTH_MAP-this.width/2):this.setX(this.x-this.velocityX),this.velocityY>=0&&this.y-this.width/2<=0?this.setY(this.height/2):this.velocityY<=0&&this.y+this.width/2>=WIDTH_MAP?this.setY(WIDTH_MAP-this.height/2):this.setY(this.y-this.velocityY),!0)}attackTarget(){return!!(this.verifyTarget()&&this.target.isAlive()&&this.isTargetInRange())&&(this.canAttack&&this.attack(this.target),!0)}verifyTarget(){return!!this.haveTarget()&&(!!this.target.isAlive()||(this.setTarget(null),!1))}attack(t){this.canAttack=!1,this.missile.setPosition(this.x,this.y).setVisible(!0),this.missile.setRotation(Math.atan2(this.y-this.target.y,this.x-this.target.x)-1.57),this.scene.tweens.add({targets:this.missile,x:t.x,y:t.y,ease:"Linear",duration:200,onComplete:()=>this.finishAttack(t)}),this.scene.time.addEvent({delay:Phaser.Math.Between(1e3,3e3),callback:this.reload,callbackScope:this})}finishAttack(t){t.beAttack(this.damage)&&this.setTarget(null),this.missile.setVisible(!1)}reload(){this.canAttack=!0}beAttack(t){let e=this.shield.decrease(t);return e>0&&(console.log("Shield Broken"),this.life.decrease(e)),this.die()}isTargetInRange(){return!!this.verifyTarget()&&this.calcDistance(this.target)0}die(){return 0===this.life.value&&(this.circle.destroy(),this.shield.destroy(),this.life.destroy(),!0)}haveTarget(){return null!=this.target}read(){for(let t=0;tt.setFrame(0)),t.on("pointerover",()=>t.setFrame(1)),t.on("pointerdown",()=>this.clickPlay(t))}clickPlay(t){this.scene.start("Game")}} \ No newline at end of file diff --git a/Code/src/js/classes/AddAttack.js b/Code/src/js/classes/AddAttack.js index 72784a5..ee7c31f 100644 --- a/Code/src/js/classes/AddAttack.js +++ b/Code/src/js/classes/AddAttack.js @@ -1,29 +1,16 @@ -class AddAttack extends Phaser.Scene { - constructor(game) { - super('addNode'); +class AddAttack extends AddNode { + constructor(game, selected) { + super(game, selected); this.game = game; } create() { - this.add.rectangle(0, 0, WIDTH_WINDOW, HEIGHT_WINDOW, 0x000000).setOrigin(0, 0).setAlpha(0.5); console.log("ATTACK"); - this.createButton(); + super.create(); + super.addTitle(WIDTH_WINDOW / 2, HEIGHT_WINDOW / 16, "ADD NODE : ATTACK"); + super.addTitle(WIDTH_WINDOW / 2, HEIGHT_WINDOW / (16 / 3), "WHO ?"); + super.addButton(WIDTH_WINDOW / 2, HEIGHT_WINDOW / (16 / 5), null, HEIGHT_WINDOW / 8, 'enemyBot'); } - - createButton() { - let x = WIDTH_WINDOW / 2; - let y = HEIGHT_WINDOW - 100; - this.cancelBtn = this.add.image(x, y, 'cancel').setOrigin(0.5, 0.5).setInteractive(); - this.cancelBtn.on('pointerover', () => this.cancelBtn.setFrame(1)); - this.cancelBtn.on('pointerout', () => this.cancelBtn.setFrame(0)); - this.cancelBtn.on('pointerdown', () => this.cancel()); - } - - cancel() { - this.scene.resume('Game'); - this.scene.stop('addNode'); - this.game.scene.remove('addNode'); - } } \ No newline at end of file diff --git a/Code/src/js/classes/AddCondition.js b/Code/src/js/classes/AddCondition.js index 8017613..48e8e36 100644 --- a/Code/src/js/classes/AddCondition.js +++ b/Code/src/js/classes/AddCondition.js @@ -1,28 +1,18 @@ -class AddCondition extends Phaser.Scene { - constructor(game) { - super('addNode'); +class AddCondition extends AddNode { + constructor(game, selected) { + super(game, selected); this.game = game; + this.selected = selected; } create() { - this.add.rectangle(0, 0, WIDTH_WINDOW, HEIGHT_WINDOW, 0x000000).setOrigin(0, 0).setAlpha(0.5); + super.create(); console.log("CONDITION"); - this.createButton(); + super.addTitle(WIDTH_WINDOW / 2, HEIGHT_WINDOW / 16, "ADD NODE : CONDITION"); + super.addTitle(WIDTH_WINDOW / 2, HEIGHT_WINDOW / (16 / 3), "WHO ?"); + super.addButton(WIDTH_WINDOW / 3, HEIGHT_WINDOW / (16 / 5), null, HEIGHT_WINDOW / 8, 'enemyBot'); + super.addButton(WIDTH_WINDOW / 1.5, HEIGHT_WINDOW / (16 / 5), null, HEIGHT_WINDOW / 8, 'myself'); } - createButton() { - let x = WIDTH_WINDOW / 2; - let y = HEIGHT_WINDOW - 100; - this.cancelBtn = this.add.image(x, y, 'cancel').setOrigin(0.5, 0.5).setInteractive(); - this.cancelBtn.on('pointerover', () => this.cancelBtn.setFrame(1)); - this.cancelBtn.on('pointerout', () => this.cancelBtn.setFrame(0)); - this.cancelBtn.on('pointerdown', () => this.cancel()); - } - - cancel() { - this.scene.resume('Game'); - this.scene.stop('addNode'); - this.game.scene.remove('addNode'); - } } \ No newline at end of file diff --git a/Code/src/js/classes/AddMove.js b/Code/src/js/classes/AddMove.js index 0995b5c..e388848 100644 --- a/Code/src/js/classes/AddMove.js +++ b/Code/src/js/classes/AddMove.js @@ -1,29 +1,20 @@ -class AddMove extends Phaser.Scene { - constructor(game) { - super('addNode'); +class AddMove extends AddNode { + constructor(game, selected) { + super(game, selected); this.game = game; } create() { - this.add.rectangle(0, 0, WIDTH_WINDOW, HEIGHT_WINDOW, 0x000000).setOrigin(0, 0).setAlpha(0.5); console.log("MOVE"); - this.createButton(); - } - + super.create(); + super.addTitle(WIDTH_WINDOW / 2, HEIGHT_WINDOW / 16, "ADD NODE : MOVE"); + super.addTitle(WIDTH_WINDOW / 4, HEIGHT_WINDOW / (16 / 3), "FLEE OR MOVE ?"); + super.addButton(WIDTH_WINDOW / 6, HEIGHT_WINDOW / (16 / 5), null, HEIGHT_WINDOW / 8, 'fleeFrom'); + super.addButton(WIDTH_WINDOW / 3, HEIGHT_WINDOW / (16 / 5), null, HEIGHT_WINDOW / 8, 'moveToward'); - createButton() { - let x = WIDTH_WINDOW / 2; - let y = HEIGHT_WINDOW - 100; - this.cancelBtn = this.add.image(x, y, 'cancel').setOrigin(0.5, 0.5).setInteractive(); - this.cancelBtn.on('pointerover', () => this.cancelBtn.setFrame(1)); - this.cancelBtn.on('pointerout', () => this.cancelBtn.setFrame(0)); - this.cancelBtn.on('pointerdown', () => this.cancel()); + super.addTitle(WIDTH_WINDOW / 4 * 3, HEIGHT_WINDOW / (16 / 3), "WHO ?"); + super.addButton(WIDTH_WINDOW / 4 * 3, HEIGHT_WINDOW / (16 / 5), null, HEIGHT_WINDOW / 8, 'enemyBot'); } - cancel() { - this.scene.resume('Game'); - this.scene.stop('addNode'); - this.game.scene.remove('addNode'); - } } \ No newline at end of file diff --git a/Code/src/js/classes/Boot.js b/Code/src/js/classes/Boot.js index a857505..b3b5957 100644 --- a/Code/src/js/classes/Boot.js +++ b/Code/src/js/classes/Boot.js @@ -45,6 +45,22 @@ class Boot extends Phaser.Scene { this.load.spritesheet('plus', 'assets/buttons/plus.png', {frameWidth: 100, frameHeight: 100}); this.load.spritesheet('pencil', 'assets/buttons/pencil.png', {frameWidth: 100, frameHeight: 100}); this.load.spritesheet('cancel', 'assets/buttons/cancel.png', {frameWidth: 550, frameHeight: 150}); + this.load.spritesheet('add', 'assets/buttons/add.png', {frameWidth: 550, frameHeight: 150}); + + this.load.spritesheet('shortRange', 'assets/buttons/shortRange.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('mediumRange', 'assets/buttons/mediumRange.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('longRange', 'assets/buttons/longRange.png', {frameWidth: 300, frameHeight: 150}); + + this.load.spritesheet('shield0', 'assets/buttons/shield0.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('shield33', 'assets/buttons/shield33.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('shield66', 'assets/buttons/shield66.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('shield100', 'assets/buttons/shield100.png', {frameWidth: 300, frameHeight: 150}); + + this.load.spritesheet('myself', 'assets/buttons/myself.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('enemyBot', 'assets/buttons/enemyBot.png', {frameWidth: 300, frameHeight: 150}); + + this.load.spritesheet('moveToward', 'assets/buttons/moveToward.png', {frameWidth: 300, frameHeight: 150}); + this.load.spritesheet('fleeFrom', 'assets/buttons/fleeFrom.png', {frameWidth: 300, frameHeight: 150}); } create() { diff --git a/Code/src/js/classes/Game.js b/Code/src/js/classes/Game.js index 93ebde2..fb0ab86 100644 --- a/Code/src/js/classes/Game.js +++ b/Code/src/js/classes/Game.js @@ -7,8 +7,6 @@ class Game extends Phaser.Scene { preload() { this.gm = new GamingBoard(); this.game.scene.add('GamingBoard', this.gm); - - this.game.scene.add('PlusNode', new PlusNode(this.game)); } create() { @@ -155,6 +153,7 @@ class Game extends Phaser.Scene { clickPlus() { console.log("PLUS"); + this.game.scene.add('PlusNode', new PlusNode(this.game, this.selected)); this.scene.launch('PlusNode'); diff --git a/Code/src/js/classes/Node.js b/Code/src/js/classes/Node.js deleted file mode 100644 index e69de29..0000000 diff --git a/Code/src/js/classes/PlusNode.js b/Code/src/js/classes/PlusNode.js index 765cdf5..7390b53 100644 --- a/Code/src/js/classes/PlusNode.js +++ b/Code/src/js/classes/PlusNode.js @@ -1,7 +1,8 @@ class PlusNode extends Phaser.Scene { - constructor(game) { + constructor(game, selected) { super('PlusNode'); this.game = game; + this.selected = selected; } create() { @@ -37,18 +38,18 @@ class PlusNode extends Phaser.Scene { click(action) { switch (action.toString()) { case 'attack': - this.game.scene.add('addNode', new AddAttack(this.game)) + this.game.scene.add('AddNode', new AddAttack(this.game, this.selected)) break; case 'move': - this.game.scene.add('addNode', new AddMove(this.game)) + this.game.scene.add('AddNode', new AddMove(this.game, this.selected)) break; case 'condition': - this.game.scene.add('addNode', new AddCondition(this.game)) + this.game.scene.add('AddNode', new AddCondition(this.game, this.selected)) break; } - this.scene.launch('addNode'); + this.scene.launch('AddNode'); this.scene.stop('PlusNode'); - console.log(action.toString()); + this.game.scene.remove('PlusNode'); } createButton() { @@ -63,5 +64,6 @@ class PlusNode extends Phaser.Scene { cancel() { this.scene.resume('Game'); this.scene.stop('PlusNode'); + this.game.scene.remove('PlusNode'); } } \ No newline at end of file