galactica
/
Galactica
1
0
Fork 0
Code Issues Releases Activity

Compare commits

base: galactica:57f2b97f40db5719ee7c961468b38463482244aa
Branches Tags
galactica:master
..
compare: galactica:97720ea6fe652ab3fbfb274c550277eb3955cebc
Branches Tags
galactica:master

No commits in common. "57f2b97f40db5719ee7c961468b38463482244aa" and "97720ea6fe652ab3fbfb274c550277eb3955cebc" have entirely different histories.
57f2b97f40 ... 97720ea6fe

3 changed files with 17 additions and 15 deletions
Show Stats Expand all files Collapse all files

1
TODO.md
View File

@ -1,7 +1,6 @@
# Specific projects # Specific projects
## Currently working on: ## Currently working on:
- first: fix animation transition timings
- first: fix particles & physics - first: fix particles & physics
- clickable buttons - clickable buttons
- planet outfitter - planet outfitter

27
content/sprite.toml
View File

@ -6,10 +6,12 @@
file = "star/B-09.png" file = "star/B-09.png"
[sprite."flare::ion"] [sprite."flare::ion"]
start_at = "idle:top" start_at = "rise:top"
random_start_frame = false
section.idle.timing.duration = 3.0 section.idle.timing.duration = 5
section.idle.frames = ["flare/ion/idle-01.png", "flare/ion/idle-02.png"] #section.idle.repeat = "reverse"
section.idle.frames = ["flare/1.png", "flare/4.png", "flare/5.png"]
section.idle.top = "reverse" section.idle.top = "reverse"
section.idle.bot = "reverse" section.idle.bot = "reverse"
# stop: stop on last frame (special) # stop: stop on last frame (special)
@ -19,19 +21,20 @@ section.idle.bot = "reverse"
# spec: "idle:bot", "idle:top", or "idle:random" # spec: "idle:bot", "idle:top", or "idle:random"
section.rise.timing.duration = 0.15 section.rise.timing.duration = 0.15
section.rise.top = "idle:top" section.rise.top = "stop"
section.rise.bot = "run:top" section.rise.bot = "run:top"
section.rise.frames = [ section.rise.frames = [
"flare/ion/rise-01.png", "flare/6.png",
"flare/ion/rise-02.png", "flare/5.png",
"flare/ion/rise-03.png", "flare/4.png",
"flare/ion/rise-04.png", "flare/3.png",
"flare/2.png",
] ]
section.run.timing.duration = 3.0 section.run.timing.duration = 0.01
section.run.top = "reverse" section.run.top = "stop"
section.run.bot = "reverse" section.run.bot = "stop"
section.run.frames = ["flare/ion/run-01.png", "flare/ion/run-02.png"] section.run.frames = ["flare/1.png"]
[sprite."planet::earth"] [sprite."planet::earth"]

4
crates/system/src/phys/objects/ship.rs
View File

@ -115,7 +115,7 @@ impl PhysSimShip {
let flare = res.ct.get_outfit(flare_outfit); let flare = res.ct.get_outfit(flare_outfit);
if flare.engine_flare_on_stop.is_some() { if flare.engine_flare_on_stop.is_some() {
for (_, e) in &mut self.engine_anim { for (_, e) in &mut self.engine_anim {
e.jump_to(res.ct, flare.engine_flare_on_stop.unwrap()); e.next_edge(flare.engine_flare_on_stop.unwrap().into());
} }
} }
}; };
@ -126,7 +126,7 @@ impl PhysSimShip {
let flare = res.ct.get_outfit(flare_outfit); let flare = res.ct.get_outfit(flare_outfit);
if flare.engine_flare_on_start.is_some() { if flare.engine_flare_on_start.is_some() {
for (_, e) in &mut self.engine_anim { for (_, e) in &mut self.engine_anim {
e.jump_to(res.ct, flare.engine_flare_on_start.unwrap()); e.next_edge(flare.engine_flare_on_start.unwrap().into());
} }
} }
}; };