From 432ca92c71d907b3ea40b802369191d3db104a86 Mon Sep 17 00:00:00 2001 From: doctorgester Date: Thu, 28 May 2015 22:30:41 +0400 Subject: [PATCH] Changed directory names back due to some git bug --- .../res/buffs/scripts/bonusDamageBuff.groovy | 20 ---------- .../res/buffs/scripts/contagionBuff.groovy | 39 ------------------- .../res/buffs/scripts/disarmBuff.groovy | 30 -------------- .../res/buffs/scripts/poisonBuff.groovy | 16 -------- mmo-client/res/buffs/scripts/rootBuff.groovy | 30 -------------- .../res/buffs/scripts/silenceBuff.groovy | 30 -------------- mmo-client/res/buffs/scripts/stunBuff.groovy | 30 -------------- mmo-client/res/buffs/scripts/testBuff.groovy | 14 ------- .../Contagion.groovy | 0 .../{abilities2 => abilities}/Damage.groovy | 0 .../{abilities2 => abilities}/Heal.groovy | 0 .../{abilities2 => abilities}/Poison.groovy | 0 .../{abilities2 => abilities}/Silence.groovy | 0 .../{buffs2 => buffs}/BonusDamageBuff.groovy | 0 .../{buffs2 => buffs}/ContagionBuff.groovy | 0 .../data/{buffs2 => buffs}/DisarmBuff.groovy | 0 .../data/{buffs2 => buffs}/PoisonBuff.groovy | 0 .../data/{buffs2 => buffs}/RootBuff.groovy | 0 .../data/{buffs2 => buffs}/SilenceBuff.groovy | 0 .../data/{buffs2 => buffs}/StunBuff.groovy | 0 .../data/{buffs2 => buffs}/TestBuff.groovy | 0 .../{spells2 => spells}/DebuffSlow.groovy | 0 .../{spells2 => spells}/PressTheAttack.groovy | 0 .../res/data/{spells2 => spells}/Purge.groovy | 0 .../data/spells/scripts/debuff-slow.groovy | 21 ---------- .../res/data/spells/scripts/purge.groovy | 25 ------------ .../spells/hero/scripts/pressTheAttack.groovy | 26 ------------- 27 files changed, 281 deletions(-) delete mode 100644 mmo-client/res/buffs/scripts/bonusDamageBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/contagionBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/disarmBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/poisonBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/rootBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/silenceBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/stunBuff.groovy delete mode 100644 mmo-client/res/buffs/scripts/testBuff.groovy rename mmo-client/res/data/{abilities2 => abilities}/Contagion.groovy (100%) rename mmo-client/res/data/{abilities2 => abilities}/Damage.groovy (100%) rename mmo-client/res/data/{abilities2 => abilities}/Heal.groovy (100%) rename mmo-client/res/data/{abilities2 => abilities}/Poison.groovy (100%) rename mmo-client/res/data/{abilities2 => abilities}/Silence.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/BonusDamageBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/ContagionBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/DisarmBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/PoisonBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/RootBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/SilenceBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/StunBuff.groovy (100%) rename mmo-client/res/data/{buffs2 => buffs}/TestBuff.groovy (100%) rename mmo-client/res/data/{spells2 => spells}/DebuffSlow.groovy (100%) rename mmo-client/res/data/{spells2 => spells}/PressTheAttack.groovy (100%) rename mmo-client/res/data/{spells2 => spells}/Purge.groovy (100%) delete mode 100644 mmo-client/res/data/spells/scripts/debuff-slow.groovy delete mode 100644 mmo-client/res/data/spells/scripts/purge.groovy delete mode 100644 mmo-client/res/spells/hero/scripts/pressTheAttack.groovy diff --git a/mmo-client/res/buffs/scripts/bonusDamageBuff.groovy b/mmo-client/res/buffs/scripts/bonusDamageBuff.groovy deleted file mode 100644 index acc9ece..0000000 --- a/mmo-client/res/buffs/scripts/bonusDamageBuff.groovy +++ /dev/null @@ -1,20 +0,0 @@ -import shared.board.Board -import shared.board.Buff -import shared.board.Unit - -def onInit(Buff buff, Board board){ - Unit unit = (buff.data["unit"] as Unit); - - unit.addBuff(buff) - unit.bonusAttackDamage += buff.data["value"] -} - -def onTick(Buff buff, Board board){ -} - -def onEnd(Buff buff, Board board){ - Unit unit = (buff.data["unit"] as Unit); - - unit.removeBuff(buff) - unit.bonusAttackDamage -= buff.data["value"] -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/contagionBuff.groovy b/mmo-client/res/buffs/scripts/contagionBuff.groovy deleted file mode 100644 index 462053d..0000000 --- a/mmo-client/res/buffs/scripts/contagionBuff.groovy +++ /dev/null @@ -1,39 +0,0 @@ -import core.board.ClientBoard -import core.graphics.scenes.BattleScene -import core.graphics.scenes.Scenes -import program.main.SceneUtil -import shared.board.Board -import shared.board.Buff -import shared.board.DamageType -import shared.board.Unit - -def onInit(Buff buff, ClientBoard board){ - // Buff is added in the spell code - - def attach = SceneUtil.getScene(Scenes.BATTLE, BattleScene.class).getSpatialByUnit(buff.data as Unit).node - board.addEffect("heal-effect", attach) -} - -def onTick(Buff buff, Board board){ - Unit holder = buff.data as Unit; - - def neighbours = board.units.findAll { - def x = Math.abs(it.position.x - holder.position.x) - def y = Math.abs(it.position.y - holder.position.y) - - (x <= 1 && y <= 1) && it.state != Unit.STATE_DEAD && !it.hasBuff(buff.buffData.id) - } - - neighbours.each { - it.addBuff(board.addBuff(buff.buffData.id, buff.timesToRepeat, buff.period, it)) - } - - holder.doDamage(1, DamageType.POISON) -} - -def onEnd(Buff buff, ClientBoard board){ - (buff.data as Unit).removeBuff(buff) - - def attach = SceneUtil.getScene(Scenes.BATTLE, BattleScene.class).getSpatialByUnit(buff.data as Unit).node - board.addEffect("purge-effect", attach) -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/disarmBuff.groovy b/mmo-client/res/buffs/scripts/disarmBuff.groovy deleted file mode 100644 index 20588fa..0000000 --- a/mmo-client/res/buffs/scripts/disarmBuff.groovy +++ /dev/null @@ -1,30 +0,0 @@ -import shared.board.Board -import shared.board.Buff -import shared.board.ControlType -import shared.board.Unit - -def onInit(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).addBuff(buff) - (buff.data as Unit).applyControl(ControlType.DISARM, buff) - } else if (buff.data instanceof List){ - for (Unit unit in (buff.data as List)){ - unit.addBuff(buff) - unit.applyControl(ControlType.DISARM, buff) - } - } -} - -def onTick(Buff buff, Board board){} - -def onEnd(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).removeBuff(buff) - } else if (buff.data instanceof List){ - - for (Unit unit in (buff.data as List)) - unit.removeBuff(buff) - - } - -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/poisonBuff.groovy b/mmo-client/res/buffs/scripts/poisonBuff.groovy deleted file mode 100644 index 544b527..0000000 --- a/mmo-client/res/buffs/scripts/poisonBuff.groovy +++ /dev/null @@ -1,16 +0,0 @@ -import shared.board.Board -import shared.board.Buff -import shared.board.DamageType -import shared.board.Unit - -def onInit(Buff buff, Board board){ - (buff.data as Unit).addBuff(buff) -} - -def onTick(Buff buff, Board board){ - (buff.data as Unit).doDamage(1, DamageType.MAGIC) -} - -def onEnd(Buff buff, Board board){ - (buff.data as Unit).removeBuff(buff) -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/rootBuff.groovy b/mmo-client/res/buffs/scripts/rootBuff.groovy deleted file mode 100644 index 7b46bc7..0000000 --- a/mmo-client/res/buffs/scripts/rootBuff.groovy +++ /dev/null @@ -1,30 +0,0 @@ -import shared.board.Board -import shared.board.Buff -import shared.board.ControlType -import shared.board.Unit - -def onInit(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).addBuff(buff) - (buff.data as Unit).applyControl(ControlType.ROOT, buff) - } else if (buff.data instanceof List){ - for (Unit unit in (buff.data as List)){ - unit.addBuff(buff) - unit.applyControl(ControlType.ROOT, buff) - } - } -} - -def onTick(Buff buff, Board board){} - -def onEnd(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).removeBuff(buff) - } else if (buff.data instanceof List){ - - for (Unit unit in (buff.data as List)) - unit.removeBuff(buff) - - } - -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/silenceBuff.groovy b/mmo-client/res/buffs/scripts/silenceBuff.groovy deleted file mode 100644 index 9e006f4..0000000 --- a/mmo-client/res/buffs/scripts/silenceBuff.groovy +++ /dev/null @@ -1,30 +0,0 @@ -import shared.board.Board -import shared.board.Buff -import shared.board.ControlType -import shared.board.Unit - -def onInit(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).addBuff(buff) - (buff.data as Unit).applyControl(ControlType.SILENCE, buff) - } else if (buff.data instanceof List){ - for (Unit unit in (buff.data as List)){ - unit.addBuff(buff) - unit.applyControl(ControlType.SILENCE, buff) - } - } -} - -def onTick(Buff buff, Board board){} - -def onEnd(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).removeBuff(buff) - } else if (buff.data instanceof List){ - - for (Unit unit in (buff.data as List)) - unit.removeBuff(buff) - - } - -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/stunBuff.groovy b/mmo-client/res/buffs/scripts/stunBuff.groovy deleted file mode 100644 index b6ac78b..0000000 --- a/mmo-client/res/buffs/scripts/stunBuff.groovy +++ /dev/null @@ -1,30 +0,0 @@ -import shared.board.Board -import shared.board.Buff -import shared.board.ControlType -import shared.board.Unit - -def onInit(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).addBuff(buff) - (buff.data as Unit).applyControl(ControlType.STUN, buff) - } else if (buff.data instanceof List){ - for (Unit unit in (buff.data as List)){ - unit.addBuff(buff) - unit.applyControl(ControlType.STUN, buff) - } - } -} - -def onTick(Buff buff, Board board){} - -def onEnd(Buff buff, Board board){ - if (buff.data instanceof Unit) { - (buff.data as Unit).removeBuff(buff) - } else if (buff.data instanceof List){ - - for (Unit unit in (buff.data as List)) - unit.removeBuff(buff) - - } - -} \ No newline at end of file diff --git a/mmo-client/res/buffs/scripts/testBuff.groovy b/mmo-client/res/buffs/scripts/testBuff.groovy deleted file mode 100644 index ba1b938..0000000 --- a/mmo-client/res/buffs/scripts/testBuff.groovy +++ /dev/null @@ -1,14 +0,0 @@ -import shared.board.Board -import shared.board.Buff - -def onInit(Buff buff, Board board){ - System.out.println('init'); -} - -def onTick(Buff buff, Board board){ - out.println('tick'); -} - -def onEnd(Buff buff, Board board){ - out.println('end'); -} \ No newline at end of file diff --git a/mmo-client/res/data/abilities2/Contagion.groovy b/mmo-client/res/data/abilities/Contagion.groovy similarity index 100% rename from mmo-client/res/data/abilities2/Contagion.groovy rename to mmo-client/res/data/abilities/Contagion.groovy diff --git a/mmo-client/res/data/abilities2/Damage.groovy b/mmo-client/res/data/abilities/Damage.groovy similarity index 100% rename from mmo-client/res/data/abilities2/Damage.groovy rename to mmo-client/res/data/abilities/Damage.groovy diff --git a/mmo-client/res/data/abilities2/Heal.groovy b/mmo-client/res/data/abilities/Heal.groovy similarity index 100% rename from mmo-client/res/data/abilities2/Heal.groovy rename to mmo-client/res/data/abilities/Heal.groovy diff --git a/mmo-client/res/data/abilities2/Poison.groovy b/mmo-client/res/data/abilities/Poison.groovy similarity index 100% rename from mmo-client/res/data/abilities2/Poison.groovy rename to mmo-client/res/data/abilities/Poison.groovy diff --git a/mmo-client/res/data/abilities2/Silence.groovy b/mmo-client/res/data/abilities/Silence.groovy similarity index 100% rename from mmo-client/res/data/abilities2/Silence.groovy rename to mmo-client/res/data/abilities/Silence.groovy diff --git a/mmo-client/res/data/buffs2/BonusDamageBuff.groovy b/mmo-client/res/data/buffs/BonusDamageBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/BonusDamageBuff.groovy rename to mmo-client/res/data/buffs/BonusDamageBuff.groovy diff --git a/mmo-client/res/data/buffs2/ContagionBuff.groovy b/mmo-client/res/data/buffs/ContagionBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/ContagionBuff.groovy rename to mmo-client/res/data/buffs/ContagionBuff.groovy diff --git a/mmo-client/res/data/buffs2/DisarmBuff.groovy b/mmo-client/res/data/buffs/DisarmBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/DisarmBuff.groovy rename to mmo-client/res/data/buffs/DisarmBuff.groovy diff --git a/mmo-client/res/data/buffs2/PoisonBuff.groovy b/mmo-client/res/data/buffs/PoisonBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/PoisonBuff.groovy rename to mmo-client/res/data/buffs/PoisonBuff.groovy diff --git a/mmo-client/res/data/buffs2/RootBuff.groovy b/mmo-client/res/data/buffs/RootBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/RootBuff.groovy rename to mmo-client/res/data/buffs/RootBuff.groovy diff --git a/mmo-client/res/data/buffs2/SilenceBuff.groovy b/mmo-client/res/data/buffs/SilenceBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/SilenceBuff.groovy rename to mmo-client/res/data/buffs/SilenceBuff.groovy diff --git a/mmo-client/res/data/buffs2/StunBuff.groovy b/mmo-client/res/data/buffs/StunBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/StunBuff.groovy rename to mmo-client/res/data/buffs/StunBuff.groovy diff --git a/mmo-client/res/data/buffs2/TestBuff.groovy b/mmo-client/res/data/buffs/TestBuff.groovy similarity index 100% rename from mmo-client/res/data/buffs2/TestBuff.groovy rename to mmo-client/res/data/buffs/TestBuff.groovy diff --git a/mmo-client/res/data/spells2/DebuffSlow.groovy b/mmo-client/res/data/spells/DebuffSlow.groovy similarity index 100% rename from mmo-client/res/data/spells2/DebuffSlow.groovy rename to mmo-client/res/data/spells/DebuffSlow.groovy diff --git a/mmo-client/res/data/spells2/PressTheAttack.groovy b/mmo-client/res/data/spells/PressTheAttack.groovy similarity index 100% rename from mmo-client/res/data/spells2/PressTheAttack.groovy rename to mmo-client/res/data/spells/PressTheAttack.groovy diff --git a/mmo-client/res/data/spells2/Purge.groovy b/mmo-client/res/data/spells/Purge.groovy similarity index 100% rename from mmo-client/res/data/spells2/Purge.groovy rename to mmo-client/res/data/spells/Purge.groovy diff --git a/mmo-client/res/data/spells/scripts/debuff-slow.groovy b/mmo-client/res/data/spells/scripts/debuff-slow.groovy deleted file mode 100644 index 4143488..0000000 --- a/mmo-client/res/data/spells/scripts/debuff-slow.groovy +++ /dev/null @@ -1,21 +0,0 @@ -import shared.board.Spell -import shared.board.Board -import shared.board.Cell -import shared.board.Unit -import shared.map.CardMaster - -def onCheck(Spell spell, Board board, CardMaster caster, Cell cell){ - cell.contentsType == Cell.CONTENTS_UNIT && !board.areAllies(cell.unit.owner, caster) && cell.unit.state != Unit.STATE_DEAD -} - -def onCastBegin(Spell spell, Board board, CardMaster caster){ - 0.3f -} - -def onCastEnd(Spell spell, Board board, CardMaster caster){ - for (Unit unit: board.units) - if (!board.areAllies(unit.owner, caster) && unit.state != Unit.STATE_DEAD) - unit.maxActionPoints -= 1; - - board.nextTurn() -} \ No newline at end of file diff --git a/mmo-client/res/data/spells/scripts/purge.groovy b/mmo-client/res/data/spells/scripts/purge.groovy deleted file mode 100644 index 3349387..0000000 --- a/mmo-client/res/data/spells/scripts/purge.groovy +++ /dev/null @@ -1,25 +0,0 @@ -import core.board.ClientBoard -import shared.board.Spell -import shared.board.Board -import shared.board.Cell -import shared.board.Unit -import shared.map.CardMaster - -def onCheck(Spell spell, Board board, CardMaster caster, Cell cell){ - cell.contentsType == Cell.CONTENTS_UNIT && cell.unit.state != Unit.STATE_DEAD && cell.unit.buffs.size() > 0 -} - -def onCastBegin(Spell spell, ClientBoard board, CardMaster caster){ - for (Unit unit: board.units) - if (unit.state != Unit.STATE_DEAD && unit.buffs.size() > 0){ - board.addEffect("purge-effect", unit) - unit.purgeBuffs() - } - - 1.0f -} - -def onCastEnd(Spell spell, Board board, CardMaster caster){ - board.nextTurn() -} - diff --git a/mmo-client/res/spells/hero/scripts/pressTheAttack.groovy b/mmo-client/res/spells/hero/scripts/pressTheAttack.groovy deleted file mode 100644 index 2fea1cd..0000000 --- a/mmo-client/res/spells/hero/scripts/pressTheAttack.groovy +++ /dev/null @@ -1,26 +0,0 @@ -import core.board.ClientBoard -import shared.board.Spell -import shared.board.Board -import shared.board.Cell -import shared.board.Unit -import shared.map.CardMaster - -def onCheck(Spell spell, Board board, CardMaster caster, Cell cell){ - cell.contentsType == Cell.CONTENTS_UNIT && board.areAllies(cell.unit.owner, caster) && cell.unit.state != Unit.STATE_DEAD -} - -def onCastBegin(Spell spell, ClientBoard board, CardMaster caster){ - for (Unit unit: board.units) - if (board.areAllies(unit.owner, caster) && unit.state != Unit.STATE_DEAD){ - board.addEffect("heal-effect", unit) - board.addBuff("bonusDamageBuff", 0, Integer.MAX_VALUE, [ - "unit": unit, - "value": 2 - ]) - } - 1.0f -} - -def onCastEnd(Spell spell, Board board, CardMaster caster){ - board.nextTurn() -} \ No newline at end of file