diff --git a/src/game/TaelinArena.ModelIds.fm b/src/game/TaelinArena.ModelIds.fm index 24ae431e1..848c8bce3 100644 --- a/src/game/TaelinArena.ModelIds.fm +++ b/src/game/TaelinArena.ModelIds.fm @@ -3598,6 +3598,9 @@ enum | LOKI_GIFT_FROM_THE_GODS_CASTED_006 | LOKI_GIFT_FROM_THE_GODS_CASTED_007 | LOKI_GIFT_FROM_THE_GODS_CASTED_008 +| LOKI_GIFT_FROM_THE_GODS_CASTED_009 +| LOKI_GIFT_FROM_THE_GODS_CASTED_010 +| LOKI_GIFT_FROM_THE_GODS_CASTED_011 | LOKI_GIFT_FROM_THE_GODS_CASTING_000 | LOKI_GIFT_FROM_THE_GODS_CASTING_001 | LOKI_GIFT_FROM_THE_GODS_CASTING_002 @@ -3614,15 +3617,11 @@ enum | LOKI_GIFT_FROM_THE_GODS_PRESSED_007 | LOKI_GIFT_FROM_THE_GODS_PRESSED_008 | LOKI_GIFT_FROM_THE_GODS_PRESSED_009 -| LOKI_GIFT_FROM_THE_GODS_PROJECT_TRAP_000 -| LOKI_GIFT_FROM_THE_GODS_PROJECT_TRAP_001 -| LOKI_GIFT_FROM_THE_GODS_PROJECT_TRAP_002 -| LOKI_GIFT_FROM_THE_GODS_PROJECT_TRAP_003 -| LOKI_GIFT_FROM_THE_GODS_RAP_IDLE_000 -| LOKI_GIFT_FROM_THE_GODS_RAP_IDLE_001 -| LOKI_GIFT_FROM_THE_GODS_RAP_IDLE_002 -| LOKI_GIFT_FROM_THE_GODS_RAP_IDLE_003 -| LOKI_GIFT_FROM_THE_GODS_RAP_IDLE_004 +| LOKI_GIFT_FROM_THE_GODS_TRAP_IDLE_000 +| LOKI_GIFT_FROM_THE_GODS_TRAP_IDLE_001 +| LOKI_GIFT_FROM_THE_GODS_TRAP_IDLE_002 +| LOKI_GIFT_FROM_THE_GODS_TRAP_IDLE_003 +| LOKI_GIFT_FROM_THE_GODS_TRAP_IDLE_004 | LOKI_GOLDEN_PULSE_CASTING_000 | LOKI_GOLDEN_PULSE_CASTING_001 | LOKI_GOLDEN_PULSE_CASTING_002 @@ -3653,9 +3652,6 @@ enum | LOKI_IDLE_004 | LOKI_IDLE_005 | LOKI_IDLE_006 -| LOKI_IDLE_007 -| LOKI_IDLE_008 -| LOKI_IDLE_009 | LOKI_RUNIC_CURSE_CASTED_000 | LOKI_RUNIC_CURSE_CASTED_001 | LOKI_RUNIC_CURSE_CASTED_002 @@ -3665,6 +3661,9 @@ enum | LOKI_RUNIC_CURSE_CASTED_006 | LOKI_RUNIC_CURSE_CASTED_007 | LOKI_RUNIC_CURSE_CASTED_008 +| LOKI_RUNIC_CURSE_CASTED_009 +| LOKI_RUNIC_CURSE_CASTED_010 +| LOKI_RUNIC_CURSE_CASTED_011 | LOKI_RUNIC_CURSE_CASTING_000 | LOKI_RUNIC_CURSE_CASTING_001 | LOKI_RUNIC_CURSE_CASTING_002 @@ -3682,10 +3681,6 @@ enum | LOKI_RUNIC_CURSE_PRESSED_008 | LOKI_RUNIC_CURSE_PRESSED_009 | LOKI_RUNIC_CURSE_PRESSED_010 -| LOKI_RUNIC_CURSE_PROJECT_TRAP_000 -| LOKI_RUNIC_CURSE_PROJECT_TRAP_001 -| LOKI_RUNIC_CURSE_PROJECT_TRAP_002 -| LOKI_RUNIC_CURSE_PROJECT_TRAP_003 | LOKI_RUNIC_CURSE_TRAP_IDLE_000 | LOKI_RUNIC_CURSE_TRAP_IDLE_001 | LOKI_RUNIC_CURSE_TRAP_IDLE_002 @@ -3710,6 +3705,14 @@ enum | LOKI_TAUNT_016 | LOKI_TAUNT_017 | LOKI_TAUNT_018 +| LOKI_TELEPORT_IN_000 +| LOKI_TELEPORT_IN_001 +| LOKI_TELEPORT_IN_002 +| LOKI_TELEPORT_IN_003 +| LOKI_TELEPORT_IN_004 +| LOKI_TELEPORT_OUT_000 +| LOKI_TELEPORT_OUT_001 +| LOKI_TELEPORT_OUT_002 | LOKI_WALK_000 | LOKI_WALK_001 | LOKI_WALK_002 diff --git a/src/game/TaelinArena.Thing.Loki.fm b/src/game/TaelinArena.Thing.Loki.fm index 2bcb4f8f9..132b1ca9f 100644 --- a/src/game/TaelinArena.Thing.Loki.fm +++ b/src/game/TaelinArena.Thing.Loki.fm @@ -34,7 +34,7 @@ loki_fun(self: Thing) : Thing let self = animate(self, 0, LOKI_DODGER_CASTING_000, 11, 22) let shield = new_thing <= thing( fun = loki_dodger_effect, - pos = at_dist(self, 0), + pos = self.pos, dir = targ_dir(self), vel = scale_v3(0, targ_dir(self)), box = nbox) @@ -48,7 +48,7 @@ loki_fun(self: Thing) : Thing let ball = new_thing <= thing( sid = self.sid, fun = loki_runic_curse_fun, - pos = at_dist(self, 120), + pos = at_max_dist(self, 120), vel = scale_v3(0, targ_dir(self))) let self = spawn(self, 10, [ball]) self @@ -63,14 +63,12 @@ loki_fun(self: Thing) : Thing vel = scale_v3(0, targ_dir(self))) let self = spawn(self, 10, [ball]) self - - // Space |LOKI_DASH let self = animate_between(self, 0, LOKI_TELEPORT_IN_000, 5, 0, 10) let self = animate_between(self, 0, LOKI_TELEPORT_OUT_000, 3, 10, 19) - let self = blink(self, 10, self.trg) + let self = blink(self, 10, at_max_dist(self, 200)) let self = reset(self, 19) self diff --git a/src/game/TaelinArena.Thing.Magnamite.fm b/src/game/TaelinArena.Thing.Magnamite.fm index 9bc390e13..614625533 100644 --- a/src/game/TaelinArena.Thing.Magnamite.fm +++ b/src/game/TaelinArena.Thing.Magnamite.fm @@ -184,7 +184,7 @@ magneton_fun(self: Thing) : Thing hit([damage(2)], at_dist(self, 108), self.dir, cbox(12)), ] let self = cast(self, 11, horizontal_hits) - let self = spawn(self, 22, [move(thunder_ver, at_max_dist(self, 100))]) + let self = spawn(self, 22, [move(thunder_ver, at_dist(self, 110))]) let vertical_hits = [hit([damage(2), stun(ONE_SEC)], at_dist(self, 108), self.dir, cbox(12))] let self = cast(self, 25, vertical_hits) let self = cast(self, 29, vertical_hits) @@ -250,7 +250,7 @@ magneton_sonic_boom_fun(self: Thing) : Thing case self |thing let self = animate_die(self, 0, MAGNETON_SONIC_BOOM_PROJECT_000, 1, 16) let self = self <= thing(box = nbox) - let hits = [hit([damage(1)], self.pos, self.dir, cbox(30))] + let hits = [hit([damage(1)], self.pos, self.dir, cbox(20))] let self = cast(self, 0, hits) let self = cast(self, 1, hits) let self = cast(self, 2, hits) @@ -273,7 +273,7 @@ magneton_thunder_wave_fun(self: Thing) : Thing case self |thing let self = animate_die(self, 0, MAGNETON_THUNDER_WAVE_PROJECT_000, 1, 16) let self = self <= thing(box = nbox) - let hits = [hit([damage(0.5)], self.pos, self.dir, cbox(30))] + let hits = [hit([damage(0.5)], self.pos, self.dir, cbox(25))] let self = cast(self, 0, hits) let self = cast(self, 1, hits) let self = cast(self, 2, hits) diff --git a/src/game/TaelinArena.Thing.Shao.fm b/src/game/TaelinArena.Thing.Shao.fm index a0caaf5b9..a554ad733 100644 --- a/src/game/TaelinArena.Thing.Shao.fm +++ b/src/game/TaelinArena.Thing.Shao.fm @@ -35,7 +35,7 @@ shao_fun(self: Thing) : Thing // Middle |SHAO_BALUN let self = animate(self, 1, SHAO_BALUN_CAST_000, 6, 30) - let blun = new_thing <= thing(fun=shao_balun_fun, dir=targ_dir(self), box=nbox) + let blun = new_thing <= thing(fun=shao_balun_fun, dir=targ_dir(self), box=nbox, sid=self.sid) let hits = new_thing <= thing(fun=shao_balun_hit_fun) let self = spawn(self, 29, [ move(hits, at_dist(self, 90)), @@ -68,14 +68,18 @@ shao_fun(self: Thing) : Thing // Q // TODO: add cooldown? - // TODO: adding the commented code always return true + // TODO: the commented code only works once |SHAO_HURRICANE - let self = animate(self, 0, SHAO_HURRICANE_CAST_000, 3, 24) - // case is_using_buff(self, SHAO_ULT) as ultimate - // | true => self + let self = animate(self, 0, SHAO_HURRICANE_CAST_000, 3, 27) + // let self = animate_between(self, 0, SHAO_HURRICANE_CAST_000, 1, 0, 1) + // case is_using_buff(self, ULT_TIME) as ultimate + // | true => + // let self = animate_between(self, 0, SHAO_HURRICANE_CAST_001, 2, 1, 13) + // let self = reset(self, 13) + // self // | false => let dist_trg = at_max_dist(self, 200) - let self = spawn(self, 1, [move(new_thing <= thing(fun=shao_hurricane_fun, box=nbox), dist_trg)]) + let hurricane = new_thing <= thing(fun=shao_hurricane_fun, box=nbox, sid=self.sid) let h0 = [hit([damage(1)], dist_trg, self.dir, cbox(25))] let h1 = [hit([damage(1), slow(1, 0.5)], dist_trg, self.dir, cbox(25))] let self = cast(self, 10, h0) @@ -85,7 +89,9 @@ shao_fun(self: Thing) : Thing let self = cast(self, 18, h0) let self = cast(self, 20, h0) let self = cast(self, 22, h1) - // let self = end_thing(self, (self: Thing) => self, ONE_SEC * 5, SHAO_ULT) + // let self = end_thing(self, shao_fun, ONE_SEC * 5, ULT_TIME) + let self = spawn(self, 10, [move(hurricane, dist_trg)]) + // let self = spawn(self, self.tik, [move(hurricane, dist_trg)]) self |SHAO_DASH diff --git a/src/game/TaelinArena.Thing.Tophoro.fm b/src/game/TaelinArena.Thing.Tophoro.fm index 91afeaea3..295976a41 100644 --- a/src/game/TaelinArena.Thing.Tophoro.fm +++ b/src/game/TaelinArena.Thing.Tophoro.fm @@ -24,8 +24,8 @@ tophoro_fun(self: Thing) : Thing // !! TODO !! add cooldown |TOPHORO_HIGHER_GROUND let self = animate(self, 0, TOPHORO_HIGHER_GROUND_000, 8, 16) - let explosion = new_thing <= thing(box = nbox, fun = tophoro_higher_ground_init_fun) - let arc = new_thing <= thing(box = nbox, fun = tophoro_higher_ground_effect_fun) + let explosion = new_thing <= thing(box = nbox, fun = tophoro_higher_ground_init_fun, sid = self.sid) + let arc = new_thing <= thing(box = nbox, fun = tophoro_higher_ground_effect_fun, sid = self.sid) let self = spawn(self, 13, [move(explosion, self.pos)]) let self = spawn(self, 15, [move(arc, self.pos)]) self @@ -54,7 +54,7 @@ tophoro_fun(self: Thing) : Thing // !! TODO !! add cooldown |TOPHORO_EARTH_RISE let self = animate(self, 0, TOPHORO_EARTH_RISE_000, 8, 16) - let rock = new_thing <= thing(fun=tophoro_eath_rise_effect_fun, box=nbox) + let rock = new_thing <= thing(fun=tophoro_eath_rise_effect_fun, box=nbox, sid = self.sid) let self = spawn(self, 14, [move(rock, at_max_dist(self, 150))]) self @@ -64,7 +64,8 @@ tophoro_fun(self: Thing) : Thing let hand = new_thing <= thing( fun = tophoro_ground_force_fun, box = nbox, - dir = rot90_v3(targ_dir(self))) + dir = rot90_v3(targ_dir(self)), + sid = self.sid) let self = spawn(self, 1, [move(hand, at_max_dist(self, 100))]) self diff --git a/src/models/models.js b/src/models/models.js index 5468e8ae2..861f6b8d4 100644 --- a/src/models/models.js +++ b/src/models/models.js @@ -3598,6 +3598,9 @@ module.exports = [ ()=>import("./../../models/loki/gift_from_the_gods_casted/006.json"), ()=>import("./../../models/loki/gift_from_the_gods_casted/007.json"), ()=>import("./../../models/loki/gift_from_the_gods_casted/008.json"), + ()=>import("./../../models/loki/gift_from_the_gods_casted/009.json"), + ()=>import("./../../models/loki/gift_from_the_gods_casted/010.json"), + ()=>import("./../../models/loki/gift_from_the_gods_casted/011.json"), ()=>import("./../../models/loki/gift_from_the_gods_casting/000.json"), ()=>import("./../../models/loki/gift_from_the_gods_casting/001.json"), ()=>import("./../../models/loki/gift_from_the_gods_casting/002.json"), @@ -3614,15 +3617,11 @@ module.exports = [ ()=>import("./../../models/loki/gift_from_the_gods_pressed/007.json"), ()=>import("./../../models/loki/gift_from_the_gods_pressed/008.json"), ()=>import("./../../models/loki/gift_from_the_gods_pressed/009.json"), - ()=>import("./../../models/loki/gift_from_the_gods_project_trap/000.json"), - ()=>import("./../../models/loki/gift_from_the_gods_project_trap/001.json"), - ()=>import("./../../models/loki/gift_from_the_gods_project_trap/002.json"), - ()=>import("./../../models/loki/gift_from_the_gods_project_trap/003.json"), - ()=>import("./../../models/loki/gift_from_the_gods_rap_idle/000.json"), - ()=>import("./../../models/loki/gift_from_the_gods_rap_idle/001.json"), - ()=>import("./../../models/loki/gift_from_the_gods_rap_idle/002.json"), - ()=>import("./../../models/loki/gift_from_the_gods_rap_idle/003.json"), - ()=>import("./../../models/loki/gift_from_the_gods_rap_idle/004.json"), + ()=>import("./../../models/loki/gift_from_the_gods_trap_idle/000.json"), + ()=>import("./../../models/loki/gift_from_the_gods_trap_idle/001.json"), + ()=>import("./../../models/loki/gift_from_the_gods_trap_idle/002.json"), + ()=>import("./../../models/loki/gift_from_the_gods_trap_idle/003.json"), + ()=>import("./../../models/loki/gift_from_the_gods_trap_idle/004.json"), ()=>import("./../../models/loki/golden_pulse_casting/000.json"), ()=>import("./../../models/loki/golden_pulse_casting/001.json"), ()=>import("./../../models/loki/golden_pulse_casting/002.json"), @@ -3653,9 +3652,6 @@ module.exports = [ ()=>import("./../../models/loki/idle/004.json"), ()=>import("./../../models/loki/idle/005.json"), ()=>import("./../../models/loki/idle/006.json"), - ()=>import("./../../models/loki/idle/007.json"), - ()=>import("./../../models/loki/idle/008.json"), - ()=>import("./../../models/loki/idle/009.json"), ()=>import("./../../models/loki/runic_curse_casted/000.json"), ()=>import("./../../models/loki/runic_curse_casted/001.json"), ()=>import("./../../models/loki/runic_curse_casted/002.json"), @@ -3665,6 +3661,9 @@ module.exports = [ ()=>import("./../../models/loki/runic_curse_casted/006.json"), ()=>import("./../../models/loki/runic_curse_casted/007.json"), ()=>import("./../../models/loki/runic_curse_casted/008.json"), + ()=>import("./../../models/loki/runic_curse_casted/009.json"), + ()=>import("./../../models/loki/runic_curse_casted/010.json"), + ()=>import("./../../models/loki/runic_curse_casted/011.json"), ()=>import("./../../models/loki/runic_curse_casting/000.json"), ()=>import("./../../models/loki/runic_curse_casting/001.json"), ()=>import("./../../models/loki/runic_curse_casting/002.json"), @@ -3682,10 +3681,6 @@ module.exports = [ ()=>import("./../../models/loki/runic_curse_pressed/008.json"), ()=>import("./../../models/loki/runic_curse_pressed/009.json"), ()=>import("./../../models/loki/runic_curse_pressed/010.json"), - ()=>import("./../../models/loki/runic_curse_project_trap/000.json"), - ()=>import("./../../models/loki/runic_curse_project_trap/001.json"), - ()=>import("./../../models/loki/runic_curse_project_trap/002.json"), - ()=>import("./../../models/loki/runic_curse_project_trap/003.json"), ()=>import("./../../models/loki/runic_curse_trap_idle/000.json"), ()=>import("./../../models/loki/runic_curse_trap_idle/001.json"), ()=>import("./../../models/loki/runic_curse_trap_idle/002.json"), @@ -3710,6 +3705,14 @@ module.exports = [ ()=>import("./../../models/loki/taunt/016.json"), ()=>import("./../../models/loki/taunt/017.json"), ()=>import("./../../models/loki/taunt/018.json"), + ()=>import("./../../models/loki/teleport_in/000.json"), + ()=>import("./../../models/loki/teleport_in/001.json"), + ()=>import("./../../models/loki/teleport_in/002.json"), + ()=>import("./../../models/loki/teleport_in/003.json"), + ()=>import("./../../models/loki/teleport_in/004.json"), + ()=>import("./../../models/loki/teleport_out/000.json"), + ()=>import("./../../models/loki/teleport_out/001.json"), + ()=>import("./../../models/loki/teleport_out/002.json"), ()=>import("./../../models/loki/walk/000.json"), ()=>import("./../../models/loki/walk/001.json"), ()=>import("./../../models/loki/walk/002.json"), diff --git a/src/models/packs.js b/src/models/packs.js index d4d23147c..7c1219913 100644 --- a/src/models/packs.js +++ b/src/models/packs.js @@ -117,162 +117,162 @@ module.exports = { }, "loki": { "from": 3571, - "til": 3717 + "til": 3720 }, "luffy": { - "from": 3717, - "til": 3818 + "from": 3720, + "til": 3821 }, "magnamite": { - "from": 3818, - "til": 3927 + "from": 3821, + "til": 3930 }, "magneton": { - "from": 3927, - "til": 4049 + "from": 3930, + "til": 4052 }, "mando": { - "from": 4049, - "til": 4231 + "from": 4052, + "til": 4234 }, "martha_lynch": { - "from": 4231, - "til": 4464 + "from": 4234, + "til": 4467 }, "mechwarrior": { - "from": 4464, - "til": 4571 + "from": 4467, + "til": 4574 }, "mikegator": { - "from": 4571, - "til": 4643 + "from": 4574, + "til": 4646 }, "min": { - "from": 4643, - "til": 4715 + "from": 4646, + "til": 4718 }, "monica": { - "from": 4715, - "til": 4830 + "from": 4718, + "til": 4833 }, "muk": { - "from": 4830, - "til": 4955 + "from": 4833, + "til": 4958 }, "pichu": { - "from": 4955, - "til": 5058 + "from": 4958, + "til": 5061 }, "pikachu": { - "from": 5058, - "til": 5163 + "from": 5061, + "til": 5166 }, "poste": { - "from": 5163, - "til": 5164 + "from": 5166, + "til": 5167 }, "ppg": { - "from": 5164, - "til": 5326 + "from": 5167, + "til": 5329 }, "punchingbag": { - "from": 5326, - "til": 5350 + "from": 5329, + "til": 5353 }, "raichu": { - "from": 5350, - "til": 5453 + "from": 5353, + "til": 5456 }, "ray": { - "from": 5453, - "til": 5527 + "from": 5456, + "til": 5530 }, "ryu": { - "from": 5527, - "til": 5690 + "from": 5530, + "til": 5693 }, "samson_armor": { - "from": 5690, - "til": 5783 + "from": 5693, + "til": 5786 }, "scorpion": { - "from": 5783, - "til": 5886 + "from": 5786, + "til": 5889 }, "shao": { - "from": 5886, - "til": 5993 + "from": 5889, + "til": 5996 }, "squirtle": { - "from": 5993, - "til": 6125 + "from": 5996, + "til": 6128 }, "sr_madruga": { - "from": 6125, - "til": 6247 + "from": 6128, + "til": 6250 }, "steve": { - "from": 6247, - "til": 6379 + "from": 6250, + "til": 6382 }, "teichi": { - "from": 6379, - "til": 6509 + "from": 6382, + "til": 6512 }, "teresa": { - "from": 6509, - "til": 6634 + "from": 6512, + "til": 6637 }, "tony_stark": { - "from": 6634, - "til": 6733 + "from": 6637, + "til": 6736 }, "tophoro": { - "from": 6733, - "til": 6854 + "from": 6736, + "til": 6857 }, "tupitree": { - "from": 6854, - "til": 7008 + "from": 6857, + "til": 7011 }, "tvee": { - "from": 7008, - "til": 7104 + "from": 7011, + "til": 7107 }, "wall": { - "from": 7104, - "til": 7105 + "from": 7107, + "til": 7108 }, "wartortle": { - "from": 7105, - "til": 7243 + "from": 7108, + "til": 7246 }, "weedle": { - "from": 7243, - "til": 7298 + "from": 7246, + "til": 7301 }, "xululu_child": { - "from": 7298, - "til": 7450 + "from": 7301, + "til": 7453 }, "young_link": { - "from": 7450, - "til": 7479 + "from": 7453, + "til": 7482 }, "zagatur": { - "from": 7479, - "til": 7567 + "from": 7482, + "til": 7570 }, "zed": { - "from": 7567, - "til": 7702 + "from": 7570, + "til": 7705 }, "zoio": { - "from": 7702, - "til": 7801 + "from": 7705, + "til": 7804 }, "zora": { - "from": 7801, - "til": 7843 + "from": 7804, + "til": 7846 } } \ No newline at end of file