Update some new character details

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

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
 

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)

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

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
 

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"),