From b46454ba940dea4434e7d729d6f5ce729938ce6d Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Sat, 10 Aug 2024 23:17:19 +0530 Subject: [PATCH 1/9] Added cancel icon and fixed the temporary display --- .../autoload/phaser/interface/cancel_icon.png | Bin 0 -> 7601 bytes src/creature.ts | 62 ++++++++++++++++-- 2 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 assets/autoload/phaser/interface/cancel_icon.png diff --git a/assets/autoload/phaser/interface/cancel_icon.png b/assets/autoload/phaser/interface/cancel_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..344ea537727650c916d54a4750c9d9ad641c9cc1 GIT binary patch literal 7601 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 C;@g@4 literal 0 HcmV?d00001 diff --git a/src/creature.ts b/src/creature.ts index 241a50c83..eb226088d 100644 --- a/src/creature.ts +++ b/src/creature.ts @@ -687,17 +687,15 @@ export class Creature { }, // overwrite any fields of `defaultOptions` that were provided in `options` o = $j.extend(defaultOptions, options); - - if (!o.isAbility) { - if (game.UI.selectedAbility != -1) { - this.hint('Canceled', 'gamehintblack'); - } - + if (!o.isAbility) { + if (game.UI.selectedAbility !== -1) { + this.hint('Canceled', 'gamehintblack'); + } $j('#abilities .ability').removeClass('active'); game.UI.selectAbility(-1); game.UI.updateQueueDisplay(); } - + game.grid.orderCreatureZ(); this.facePlayerDefault(); this.updateHealth(); @@ -2048,7 +2046,57 @@ class CreatureSprite { hint.data.hintType = hintType; hint.data.tweenAlpha = null; hint.data.tweenPos = null; + let visited = 0 + if(hintType === 'gamehintblack') + { + const frame = this._phaser.add.sprite(0, 50, 'frame'); + const frameBackground = this._phaser.make.bitmapData(frame.width, frame.height); + frameBackground.ctx.fillStyle = 'rgba(0, 0, 0, 0.55)'; + frameBackground.ctx.fillRect(0, 0, frameBackground.width, frameBackground.height); + frameBackground.draw('frame', 0, 0); + + const combinedSprite = this._phaser.add.sprite(0, 50, frameBackground); + combinedSprite.anchor.setTo(0.5, 0.175); + combinedSprite.setScaleMinMax(0.75, 0.75, 0.75, 0.75); + combinedSprite.alpha = 0; + combinedSprite.data = { + hintType: hintType, + tweenAlpha: null, + tweenPos: null + }; + + this._hintGrp.add(combinedSprite); + + combinedSprite.data.tweenAlpha = this._phaser.add.tween(combinedSprite) + .to({ alpha: 1 }, tooltipSpeed, tooltipTransition) + .to({ alpha: 0 }, tooltipSpeed, tooltipTransition, false, tooltipDisplaySpeed) + .start(); + + combinedSprite.data.tweenAlpha.onComplete.add(() => combinedSprite.destroy()); + + const cancelIcon = this._phaser.add.sprite(0, 50, 'cancel_icon'); + cancelIcon.anchor.setTo(0.5, 0.7); // Give a bit more vertical space + cancelIcon.setScaleMinMax(0.63, 0.63, 0.63, 0.63); + cancelIcon.alpha = 0; + cancelIcon.data = { + hintType: hintType, + tweenAlpha: null, + tweenPos: null + }; + + this._hintGrp.add(cancelIcon); + + // Create a fade-in tween for the skip turn icon + cancelIcon.data.tweenAlpha = this._phaser.add.tween(cancelIcon) + .to({ alpha: 1 }, tooltipSpeed, tooltipTransition) + .to({ alpha: 0 }, tooltipSpeed, tooltipTransition, false, tooltipDisplaySpeed) + .start(); + + cancelIcon.data.tweenAlpha.onComplete.add(() => cancelIcon.destroy()); + + } + if (hintType === 'confirm' || hintType === 'no_action') { hint.data.tweenAlpha = this._phaser.add .tween(hint) From e42393aca6bf02a86bec5468b7460a61b3585ea1 Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Sat, 10 Aug 2024 23:26:43 +0530 Subject: [PATCH 2/9] PR cleanup --- src/creature.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/creature.ts b/src/creature.ts index d57419888..0f02c3822 100644 --- a/src/creature.ts +++ b/src/creature.ts @@ -687,6 +687,7 @@ export class Creature { }, // overwrite any fields of `defaultOptions` that were provided in `options` o = $j.extend(defaultOptions, options); + if (!o.isAbility) { if (game.UI.selectedAbility !== -1) { this.hint('Canceled', 'gamehintblack'); From 89d0010d70ca0d0a8f8c2673da43dfa8a3d8f764 Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Mon, 12 Aug 2024 12:41:48 +0530 Subject: [PATCH 3/9] Fixed the issue --- src/creature.ts | 75 ++++++++++++++----------------------------- src/ui/interface.js | 63 +++++++++++++++++++++++++++++++++--- src/ui/meta-powers.js | 1 + webpack.config.js | 2 +- 4 files changed, 84 insertions(+), 57 deletions(-) diff --git a/src/creature.ts b/src/creature.ts index 0f02c3822..d66df9a82 100644 --- a/src/creature.ts +++ b/src/creature.ts @@ -12,7 +12,10 @@ import { Damage } from './damage'; import { AugmentedMatrix } from './utility/matrices'; import { HEX_WIDTH_PX, hashOffsetCoords, offsetCoordsToPx, offsetNeighbors } from './utility/const'; import { CreatureType, Level, Realm, Unit, UnitName } from './data/types'; +// Joywin import { UnitDisplayInfo, UnitSize } from './data/units'; +import { UI } from './ui/interface'; +import { getUrl } from './assets'; // to fix @ts-expect-error 2554: properly type the arguments for the trigger functions in `game.ts` @@ -251,7 +254,6 @@ export class Creature { // Extra energy required for abilities reqEnergy: 0, }; - this.stats = { ...this.baseStats, @@ -687,12 +689,26 @@ export class Creature { }, // overwrite any fields of `defaultOptions` that were provided in `options` o = $j.extend(defaultOptions, options); - + if (!o.isAbility) { if (game.UI.selectedAbility !== -1) { this.hint('Canceled', 'gamehintblack'); } $j('#abilities .ability').removeClass('active'); + let abilitiesButtons = $j('#abilities .ability'); +console.log(abilitiesButtons); // Logs the jQuery object containing the elements + +abilitiesButtons.each(function(index, element) { + + // $j(this).css('background-image', 'none !important'); + $j(this).css('color', 'green'); + $j(this).css('cursor', 'help'); + + console.log(this); // Logs the individual element + + + $j(this).css('background-image', `icons/cancel.svg`); +}); game.UI.selectAbility(-1); game.UI.updateQueueDisplay(); } @@ -1777,6 +1793,7 @@ class CreatureSprite { this._phaser = phaser; this._creatureSize = size; this._creatureTeam = team; + // Joywin this._frameInfo = { originX: display['offset-x'], originY: display['offset-y'] }; const group: Phaser.Group = phaser.add.group(game.grid.creatureGroup, 'creatureGrp_' + id); @@ -2047,57 +2064,13 @@ class CreatureSprite { hint.data.hintType = hintType; hint.data.tweenAlpha = null; hint.data.tweenPos = null; - let visited = 0 - if(hintType === 'gamehintblack') + + const $abilitiesButtons = $j('#abilities .ability'); + // Joywin + if(hintType ==='gamehintblack') { - const frame = this._phaser.add.sprite(0, 50, 'frame'); - const frameBackground = this._phaser.make.bitmapData(frame.width, frame.height); - frameBackground.ctx.fillStyle = 'rgba(0, 0, 0, 0.55)'; - frameBackground.ctx.fillRect(0, 0, frameBackground.width, frameBackground.height); - frameBackground.draw('frame', 0, 0); - - const combinedSprite = this._phaser.add.sprite(0, 50, frameBackground); - combinedSprite.anchor.setTo(0.5, 0.175); - combinedSprite.setScaleMinMax(0.75, 0.75, 0.75, 0.75); - combinedSprite.alpha = 0; - combinedSprite.data = { - hintType: hintType, - tweenAlpha: null, - tweenPos: null - }; - - this._hintGrp.add(combinedSprite); - - combinedSprite.data.tweenAlpha = this._phaser.add.tween(combinedSprite) - .to({ alpha: 1 }, tooltipSpeed, tooltipTransition) - .to({ alpha: 0 }, tooltipSpeed, tooltipTransition, false, tooltipDisplaySpeed) - .start(); - - combinedSprite.data.tweenAlpha.onComplete.add(() => combinedSprite.destroy()); - - const cancelIcon = this._phaser.add.sprite(0, 50, 'cancel_icon'); - cancelIcon.anchor.setTo(0.5, 0.7); // Give a bit more vertical space - cancelIcon.setScaleMinMax(0.63, 0.63, 0.63, 0.63); - cancelIcon.alpha = 0; - cancelIcon.data = { - hintType: hintType, - tweenAlpha: null, - tweenPos: null - }; - - this._hintGrp.add(cancelIcon); - - // Create a fade-in tween for the skip turn icon - cancelIcon.data.tweenAlpha = this._phaser.add.tween(cancelIcon) - .to({ alpha: 1 }, tooltipSpeed, tooltipTransition) - .to({ alpha: 0 }, tooltipSpeed, tooltipTransition, false, tooltipDisplaySpeed) - .start(); - - cancelIcon.data.tweenAlpha.onComplete.add(() => cancelIcon.destroy()); - + } - - if (hintType === 'confirm' || hintType === 'no_action') { hint.data.tweenAlpha = this._phaser.add .tween(hint) diff --git a/src/ui/interface.js b/src/ui/interface.js index 53d824ede..9ef70fba4 100644 --- a/src/ui/interface.js +++ b/src/ui/interface.js @@ -270,12 +270,16 @@ export class UI { $button: $j('.ability[ability="' + i + '"]'), hasShortcut: true, click: () => { + if(this.clickedAbility === -1) + { + this.clickedAbility = i; + } + console.log("Click happened",i) const game = this.game; if (this.selectedAbility != i) { if (this.dashopen) { return false; } - const ability = game.activeCreature.abilities[i]; // Passive ability icon can cycle between usable abilities if (i == 0) { @@ -287,6 +291,7 @@ export class UI { } // Colored frame around selected ability if (ability.require() == true && i != 0) { + // Joywin2 this.selectAbility(i); } // Activate Ability @@ -575,6 +580,7 @@ export class UI { this.selectedCreature = ''; this.selectedPlayer = 0; this.selectedAbility = -1; + this.clickedAbility = -1; this.queueAnimSpeed = 500; // ms this.dashAnimSpeed = 250; // ms @@ -630,7 +636,10 @@ export class UI { * @param {object} payload Event payload. */ _handleUiEvent(message, payload) { + // Joywin2 if (message === 'toggleDash') { + + console.log("Hi") this.toggleDash(); this.closeMusicPlayer(); this.closeScoreboard(); @@ -1517,9 +1526,49 @@ export class UI { * @param{boolean} [randomize] - True selects a random creature from the grid. */ toggleDash(randomize) { - const game = this.game; - + + const game = this.game, + creature = game.activeCreature; if (this.$dash.hasClass('active')) { +// let abilitiesButtons = $j('#abilities .ability'); +// console.log(abilitiesButtons); // Logs the jQuery object containing the elements + +// Capture the context of 'this' +const self = this; +// Joywin +self.abilitiesButtons.forEach((btn, index) => { + console.log(index); + console.log(self.clickedAbility); + + if (self.clickedAbility === index) { + const getImage = btn.css.normal['background-image']; + const btnNow = btn; + + // Set the initial background image + btnNow.css.normal = { + 'background-image': `url('${getUrl('icons/cancel')}')` + }; + + // Apply the initial background image to the button element + $j(btnNow).css('background-image', btnNow.css.normal['background-image']); + console.log($j(btnNow)) + setTimeout(function() { + + console.log(btnNow) + console.log(getImage); + $j(btnNow.$button).css('background-image', `url('${getUrl( + 'units/abilities/' + creature.name + ' ' + btn.abilityId, + )}')`); + console.log($j(btnNow)) + console.log("Background image updated"); + }, 1000); + + // Reset the clickedAbility property + self.clickedAbility = -1; + } +}); + + this.closeDash(); return; } @@ -1778,15 +1827,19 @@ export class UI { /** * Change ability buttons and bind events */ - changeAbilityButtons() { + changeAbilityButtons(intent = 'ok') { + + const game = this.game, creature = game.activeCreature; this.abilitiesButtons.forEach((btn) => { const ab = creature.abilities[btn.abilityId]; + // Joywin btn.css.normal = { - 'background-image': `url('${getUrl( + 'background-image': `url('${getUrl( 'units/abilities/' + creature.name + ' ' + btn.abilityId, )}')`, + }; const $desc = btn.$button.next('.desc'); $desc.find('span.title').text(ab.title); diff --git a/src/ui/meta-powers.js b/src/ui/meta-powers.js index d7cb5117d..2642009f2 100644 --- a/src/ui/meta-powers.js +++ b/src/ui/meta-powers.js @@ -83,6 +83,7 @@ export class MetaPowers { { $button: this.$els.closeModal, click: () => this._toggleModal(), + // Joywin }, this.game, ); diff --git a/webpack.config.js b/webpack.config.js index 201105765..612694c5c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,7 @@ module.exports = (env, argv) => { }, devServer: { static: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : './', - port: 8080, + port: 8090, proxy: { '/api': '159.65.232.104:7350', }, From 6e0727f658d134a498b85a4fe0061867a9e96f4d Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Mon, 12 Aug 2024 15:32:39 +0530 Subject: [PATCH 4/9] Port issue maybe --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 612694c5c..201105765 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,7 @@ module.exports = (env, argv) => { }, devServer: { static: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : './', - port: 8090, + port: 8080, proxy: { '/api': '159.65.232.104:7350', }, From 57ebed12972c1e1ee26fc24a44b34f1402d6e8df Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Mon, 12 Aug 2024 15:58:32 +0530 Subject: [PATCH 5/9] Pr cleanup --- .../autoload/phaser/interface/cancel_icon.png | Bin 7601 -> 0 bytes src/creature.ts | 40 ++------ src/ui/interface.js | 95 ++++++++---------- src/ui/meta-powers.js | 1 - webpack.config.js | 2 +- 5 files changed, 50 insertions(+), 88 deletions(-) delete mode 100644 assets/autoload/phaser/interface/cancel_icon.png diff --git a/assets/autoload/phaser/interface/cancel_icon.png b/assets/autoload/phaser/interface/cancel_icon.png deleted file mode 100644 index 344ea537727650c916d54a4750c9d9ad641c9cc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7601 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 C;@g@4 diff --git a/src/creature.ts b/src/creature.ts index d66df9a82..241a50c83 100644 --- a/src/creature.ts +++ b/src/creature.ts @@ -12,10 +12,7 @@ import { Damage } from './damage'; import { AugmentedMatrix } from './utility/matrices'; import { HEX_WIDTH_PX, hashOffsetCoords, offsetCoordsToPx, offsetNeighbors } from './utility/const'; import { CreatureType, Level, Realm, Unit, UnitName } from './data/types'; -// Joywin import { UnitDisplayInfo, UnitSize } from './data/units'; -import { UI } from './ui/interface'; -import { getUrl } from './assets'; // to fix @ts-expect-error 2554: properly type the arguments for the trigger functions in `game.ts` @@ -254,6 +251,7 @@ export class Creature { // Extra energy required for abilities reqEnergy: 0, }; + this.stats = { ...this.baseStats, @@ -690,29 +688,16 @@ export class Creature { // overwrite any fields of `defaultOptions` that were provided in `options` o = $j.extend(defaultOptions, options); - if (!o.isAbility) { - if (game.UI.selectedAbility !== -1) { - this.hint('Canceled', 'gamehintblack'); - } - $j('#abilities .ability').removeClass('active'); - let abilitiesButtons = $j('#abilities .ability'); -console.log(abilitiesButtons); // Logs the jQuery object containing the elements - -abilitiesButtons.each(function(index, element) { - - // $j(this).css('background-image', 'none !important'); - $j(this).css('color', 'green'); - $j(this).css('cursor', 'help'); - - console.log(this); // Logs the individual element - + if (!o.isAbility) { + if (game.UI.selectedAbility != -1) { + this.hint('Canceled', 'gamehintblack'); + } - $j(this).css('background-image', `icons/cancel.svg`); -}); + $j('#abilities .ability').removeClass('active'); game.UI.selectAbility(-1); game.UI.updateQueueDisplay(); } - + game.grid.orderCreatureZ(); this.facePlayerDefault(); this.updateHealth(); @@ -1793,7 +1778,6 @@ class CreatureSprite { this._phaser = phaser; this._creatureSize = size; this._creatureTeam = team; - // Joywin this._frameInfo = { originX: display['offset-x'], originY: display['offset-y'] }; const group: Phaser.Group = phaser.add.group(game.grid.creatureGroup, 'creatureGrp_' + id); @@ -2064,13 +2048,7 @@ class CreatureSprite { hint.data.hintType = hintType; hint.data.tweenAlpha = null; hint.data.tweenPos = null; - - const $abilitiesButtons = $j('#abilities .ability'); - // Joywin - if(hintType ==='gamehintblack') - { - - } + if (hintType === 'confirm' || hintType === 'no_action') { hint.data.tweenAlpha = this._phaser.add .tween(hint) @@ -2157,4 +2135,4 @@ export type CreatureHintType = | 'creature_name' | 'no_action'; -type HealthBubbleType = 'plasma' | 'frozen' | 'health'; +type HealthBubbleType = 'plasma' | 'frozen' | 'health'; \ No newline at end of file diff --git a/src/ui/interface.js b/src/ui/interface.js index 9ef70fba4..e37cc1e31 100644 --- a/src/ui/interface.js +++ b/src/ui/interface.js @@ -272,14 +272,14 @@ export class UI { click: () => { if(this.clickedAbility === -1) { - this.clickedAbility = i; + this.clickedAbility = i; } - console.log("Click happened",i) const game = this.game; if (this.selectedAbility != i) { if (this.dashopen) { return false; } + const ability = game.activeCreature.abilities[i]; // Passive ability icon can cycle between usable abilities if (i == 0) { @@ -291,7 +291,6 @@ export class UI { } // Colored frame around selected ability if (ability.require() == true && i != 0) { - // Joywin2 this.selectAbility(i); } // Activate Ability @@ -581,7 +580,6 @@ export class UI { this.selectedPlayer = 0; this.selectedAbility = -1; this.clickedAbility = -1; - this.queueAnimSpeed = 500; // ms this.dashAnimSpeed = 250; // ms @@ -636,10 +634,7 @@ export class UI { * @param {object} payload Event payload. */ _handleUiEvent(message, payload) { - // Joywin2 if (message === 'toggleDash') { - - console.log("Hi") this.toggleDash(); this.closeMusicPlayer(); this.closeScoreboard(); @@ -1526,49 +1521,43 @@ export class UI { * @param{boolean} [randomize] - True selects a random creature from the grid. */ toggleDash(randomize) { - const game = this.game, - creature = game.activeCreature; - if (this.$dash.hasClass('active')) { -// let abilitiesButtons = $j('#abilities .ability'); -// console.log(abilitiesButtons); // Logs the jQuery object containing the elements - -// Capture the context of 'this' -const self = this; -// Joywin -self.abilitiesButtons.forEach((btn, index) => { - console.log(index); - console.log(self.clickedAbility); - - if (self.clickedAbility === index) { - const getImage = btn.css.normal['background-image']; - const btnNow = btn; - - // Set the initial background image - btnNow.css.normal = { - 'background-image': `url('${getUrl('icons/cancel')}')` - }; - - // Apply the initial background image to the button element - $j(btnNow).css('background-image', btnNow.css.normal['background-image']); - console.log($j(btnNow)) - setTimeout(function() { - - console.log(btnNow) - console.log(getImage); - $j(btnNow.$button).css('background-image', `url('${getUrl( - 'units/abilities/' + creature.name + ' ' + btn.abilityId, - )}')`); - console.log($j(btnNow)) - console.log("Background image updated"); - }, 1000); - - // Reset the clickedAbility property - self.clickedAbility = -1; - } -}); - + creature = game.activeCreature; + if (this.$dash.hasClass('active')) { + const self = this; + self.abilitiesButtons.forEach((btn, index) => { + console.log(index); + console.log(self.clickedAbility); + + if (self.clickedAbility === index) { + console.log("Clicked ability found"); + const getImage = btn.css.normal['background-image']; + const btnNow = btn; + + // Set the initial background image + btnNow.css.normal = { + 'background-image': `url('${getUrl('icons/cancel')}')` + }; + + // Apply the initial background image to the button element + $j(btnNow).css('background-image', btnNow.css.normal['background-image']); + console.log($j(btnNow)) + setTimeout(function() { + + console.log(btnNow) + console.log(getImage); + $j(btnNow.$button).css('background-image', `url('${getUrl( + 'units/abilities/' + creature.name + ' ' + index, + )}')`); + console.log($j(btnNow)) + console.log("Background image updated"); + }, 1000); + + // Reset the clickedAbility property + self.clickedAbility = -1; + } + }); this.closeDash(); return; } @@ -1827,19 +1816,15 @@ self.abilitiesButtons.forEach((btn, index) => { /** * Change ability buttons and bind events */ - changeAbilityButtons(intent = 'ok') { - - + changeAbilityButtons() { const game = this.game, creature = game.activeCreature; this.abilitiesButtons.forEach((btn) => { const ab = creature.abilities[btn.abilityId]; - // Joywin btn.css.normal = { - 'background-image': `url('${getUrl( + 'background-image': `url('${getUrl( 'units/abilities/' + creature.name + ' ' + btn.abilityId, )}')`, - }; const $desc = btn.$button.next('.desc'); $desc.find('span.title').text(ab.title); @@ -2522,4 +2507,4 @@ const utils = { }; }; }, -}; +}; \ No newline at end of file diff --git a/src/ui/meta-powers.js b/src/ui/meta-powers.js index 2642009f2..d7cb5117d 100644 --- a/src/ui/meta-powers.js +++ b/src/ui/meta-powers.js @@ -83,7 +83,6 @@ export class MetaPowers { { $button: this.$els.closeModal, click: () => this._toggleModal(), - // Joywin }, this.game, ); diff --git a/webpack.config.js b/webpack.config.js index 201105765..612694c5c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,7 @@ module.exports = (env, argv) => { }, devServer: { static: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : './', - port: 8080, + port: 8090, proxy: { '/api': '159.65.232.104:7350', }, From 24d13e41b6ae3722b5c94924b412417cbbc7d2e8 Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Mon, 12 Aug 2024 16:00:08 +0530 Subject: [PATCH 6/9] Port issue maybe --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 612694c5c..201105765 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,7 @@ module.exports = (env, argv) => { }, devServer: { static: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : './', - port: 8090, + port: 8080, proxy: { '/api': '159.65.232.104:7350', }, From 8f4370362a4a4f3c60acf4d04c96119a8c0eeb12 Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Mon, 12 Aug 2024 21:42:01 +0530 Subject: [PATCH 7/9] Working --- src/style/styles.less | 3 +++ src/ui/interface.js | 58 ++++++++++++++++--------------------------- webpack.config.js | 2 +- 3 files changed, 25 insertions(+), 38 deletions(-) diff --git a/src/style/styles.less b/src/style/styles.less index 40f9ec51e..9e693917e 100644 --- a/src/style/styles.less +++ b/src/style/styles.less @@ -361,6 +361,9 @@ &.nextIcon { background-image: url('~assets/icons/next.svg') !important; } + &.cancelIcon { + background-image: url('~assets/icons/cancel.svg') !important; + } &.upgraded.noclick:hover:before { opacity: 1; diff --git a/src/ui/interface.js b/src/ui/interface.js index e37cc1e31..115c20209 100644 --- a/src/ui/interface.js +++ b/src/ui/interface.js @@ -270,10 +270,10 @@ export class UI { $button: $j('.ability[ability="' + i + '"]'), hasShortcut: true, click: () => { - if(this.clickedAbility === -1) - { + + this.clickedAbility = i; - } + const game = this.game; if (this.selectedAbility != i) { if (this.dashopen) { @@ -283,10 +283,26 @@ export class UI { const ability = game.activeCreature.abilities[i]; // Passive ability icon can cycle between usable abilities if (i == 0) { + // Joywin const selectedAbility = this.selectNextAbility(); + if (selectedAbility > 0) { b.cssTransition('nextIcon', 1000); } + else if(selectedAbility === -1) + { + + const self = this; + self.abilitiesButtons.forEach((btn, index) => { + console.log(self.clickedAbility); + const creature = game.activeCreature; + if (self.clickedAbility === index) { + b.cssTransition('cancelIcon', 1000); + this.clickedAbility = -1; + } + }); + } + return; } // Colored frame around selected ability @@ -1524,40 +1540,8 @@ export class UI { const game = this.game, creature = game.activeCreature; - if (this.$dash.hasClass('active')) { - const self = this; - self.abilitiesButtons.forEach((btn, index) => { - console.log(index); - console.log(self.clickedAbility); - - if (self.clickedAbility === index) { - console.log("Clicked ability found"); - const getImage = btn.css.normal['background-image']; - const btnNow = btn; - - // Set the initial background image - btnNow.css.normal = { - 'background-image': `url('${getUrl('icons/cancel')}')` - }; - - // Apply the initial background image to the button element - $j(btnNow).css('background-image', btnNow.css.normal['background-image']); - console.log($j(btnNow)) - setTimeout(function() { - - console.log(btnNow) - console.log(getImage); - $j(btnNow.$button).css('background-image', `url('${getUrl( - 'units/abilities/' + creature.name + ' ' + index, - )}')`); - console.log($j(btnNow)) - console.log("Background image updated"); - }, 1000); - - // Reset the clickedAbility property - self.clickedAbility = -1; - } - }); + if (this.$dash.hasClass('active')) { + this.clickedAbility = -1; this.closeDash(); return; } diff --git a/webpack.config.js b/webpack.config.js index 201105765..612694c5c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,7 @@ module.exports = (env, argv) => { }, devServer: { static: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : './', - port: 8080, + port: 8090, proxy: { '/api': '159.65.232.104:7350', }, From ef46d140c0ff175a937a070b6825721548c3ad83 Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Mon, 12 Aug 2024 23:06:00 +0530 Subject: [PATCH 8/9] Fast fix --- src/ui/interface.js | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/ui/interface.js b/src/ui/interface.js index 115c20209..318a4d46e 100644 --- a/src/ui/interface.js +++ b/src/ui/interface.js @@ -285,23 +285,35 @@ export class UI { if (i == 0) { // Joywin const selectedAbility = this.selectNextAbility(); + const creature = game.activeCreature; + if (selectedAbility > 0) { + this.abilitiesButtons.forEach((btn, index) => { + if (index === 0) { + btn.$button.removeClass('cancelIcon') + btn.$button.removeClass('nextIcon') + + console.log(btn.$button); + this.clickedAbility = -1 + } + }); b.cssTransition('nextIcon', 1000); - } - else if(selectedAbility === -1) - { + - const self = this; - self.abilitiesButtons.forEach((btn, index) => { - console.log(self.clickedAbility); - const creature = game.activeCreature; - if (self.clickedAbility === index) { - b.cssTransition('cancelIcon', 1000); - this.clickedAbility = -1; - } + } else if (selectedAbility === -1) { + this.abilitiesButtons.forEach((btn, index) => { + console.log(this.clickedAbility); + if (index === 0) { + btn.$button.removeClass('nextIcon') + btn.$button.removeClass('cancelIcon') + this.clickedAbility = -1; + } }); + b.cssTransition('cancelIcon', 1000); + } + return; } From eeacdf6aa383c5903627a293add07cc0d5103eb4 Mon Sep 17 00:00:00 2001 From: Joywin2412 <joywinpinto1@gmail.com> Date: Tue, 13 Aug 2024 18:54:43 +0530 Subject: [PATCH 9/9] PR cleanup --- src/creature.ts | 2 +- webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/creature.ts b/src/creature.ts index 241a50c83..c60782ae3 100644 --- a/src/creature.ts +++ b/src/creature.ts @@ -2135,4 +2135,4 @@ export type CreatureHintType = | 'creature_name' | 'no_action'; -type HealthBubbleType = 'plasma' | 'frozen' | 'health'; \ No newline at end of file +type HealthBubbleType = 'plasma' | 'frozen' | 'health'; diff --git a/webpack.config.js b/webpack.config.js index 612694c5c..201105765 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -146,7 +146,7 @@ module.exports = (env, argv) => { }, devServer: { static: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : './', - port: 8090, + port: 8080, proxy: { '/api': '159.65.232.104:7350', },