diff --git a/TODO.md b/TODO.md index 89c1dcd..9773dec 100644 --- a/TODO.md +++ b/TODO.md @@ -1,6 +1,7 @@ # Specific projects ## Currently working on: + - first: fix animation transition timings - first: fix particles & physics - clickable buttons - planet outfitter diff --git a/assets b/assets index b4fe811..f749d99 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit b4fe8111c7b1cb17987bbff095bd50e61e2d8998 +Subproject commit f749d99ae63bcdefb4a62774d21f30a7eebc20d3 diff --git a/content/sprite.toml b/content/sprite.toml index b3481c9..6ec71e1 100644 --- a/content/sprite.toml +++ b/content/sprite.toml @@ -6,12 +6,10 @@ file = "star/B-09.png" [sprite."flare::ion"] -start_at = "rise:top" -random_start_frame = false +start_at = "idle:top" -section.idle.timing.duration = 5 -#section.idle.repeat = "reverse" -section.idle.frames = ["flare/1.png", "flare/4.png", "flare/5.png"] +section.idle.timing.duration = 3.0 +section.idle.frames = ["flare/ion/idle-01.png", "flare/ion/idle-02.png"] section.idle.top = "reverse" section.idle.bot = "reverse" # stop: stop on last frame (special) @@ -21,20 +19,19 @@ section.idle.bot = "reverse" # spec: "idle:bot", "idle:top", or "idle:random" section.rise.timing.duration = 0.15 -section.rise.top = "stop" +section.rise.top = "idle:top" section.rise.bot = "run:top" section.rise.frames = [ - "flare/6.png", - "flare/5.png", - "flare/4.png", - "flare/3.png", - "flare/2.png", + "flare/ion/rise-01.png", + "flare/ion/rise-02.png", + "flare/ion/rise-03.png", + "flare/ion/rise-04.png", ] -section.run.timing.duration = 0.01 -section.run.top = "stop" -section.run.bot = "stop" -section.run.frames = ["flare/1.png"] +section.run.timing.duration = 3.0 +section.run.top = "reverse" +section.run.bot = "reverse" +section.run.frames = ["flare/ion/run-01.png", "flare/ion/run-02.png"] [sprite."planet::earth"] diff --git a/crates/system/src/phys/objects/ship.rs b/crates/system/src/phys/objects/ship.rs index f96381e..886754e 100644 --- a/crates/system/src/phys/objects/ship.rs +++ b/crates/system/src/phys/objects/ship.rs @@ -115,7 +115,7 @@ impl PhysSimShip { let flare = res.ct.get_outfit(flare_outfit); if flare.engine_flare_on_stop.is_some() { for (_, e) in &mut self.engine_anim { - e.next_edge(flare.engine_flare_on_stop.unwrap().into()); + e.jump_to(res.ct, flare.engine_flare_on_stop.unwrap()); } } }; @@ -126,7 +126,7 @@ impl PhysSimShip { let flare = res.ct.get_outfit(flare_outfit); if flare.engine_flare_on_start.is_some() { for (_, e) in &mut self.engine_anim { - e.next_edge(flare.engine_flare_on_start.unwrap().into()); + e.jump_to(res.ct, flare.engine_flare_on_start.unwrap()); } } };