Optimized resource loading, removed setting animation by key, refacto…

…ring
deathkiller · Oct 28, 2023 · 0d88d67 · 0d88d67
1 parent 58dd6c2
commit 0d88d67
Show file tree

Hide file tree

Showing 136 changed files with 1,421 additions and 901 deletions.
diff --git a/Content/Metadata/Boss/Robot.res b/Content/Metadata/Boss/Robot.res
@@ -40,31 +40,40 @@
 		},
 
 		"Shrapnel1": {
-			"Path": "Robot/shrapnel_1.aura"
+			"Path": "Robot/shrapnel_1.aura",
+			"States": [ 100 ]
 		},
 		"Shrapnel2": {
-			"Path": "Robot/shrapnel_2.aura"
+			"Path": "Robot/shrapnel_2.aura",
+			"States": [ 101 ]
 		},
 		"Shrapnel3": {
-			"Path": "Robot/shrapnel_3.aura"
+			"Path": "Robot/shrapnel_3.aura",
+			"States": [ 102 ]
 		},
 		"Shrapnel4": {
-			"Path": "Robot/shrapnel_4.aura"
+			"Path": "Robot/shrapnel_4.aura",
+			"States": [ 103 ]
 		},
 		"Shrapnel5": {
-			"Path": "Robot/shrapnel_5.aura"
+			"Path": "Robot/shrapnel_5.aura",
+			"States": [ 104 ]
 		},
 		"Shrapnel6": {
-			"Path": "Robot/shrapnel_6.aura"
+			"Path": "Robot/shrapnel_6.aura",
+			"States": [ 105 ]
 		},
 		"Shrapnel7": {
-			"Path": "Robot/shrapnel_7.aura"
+			"Path": "Robot/shrapnel_7.aura",
+			"States": [ 106 ]
 		},
 		"Shrapnel8": {
-			"Path": "Robot/shrapnel_8.aura"
+			"Path": "Robot/shrapnel_8.aura",
+			"States": [ 107 ]
 		},
 		"Shrapnel9": {
-			"Path": "Robot/shrapnel_9.aura"
+			"Path": "Robot/shrapnel_9.aura",
+			"States": [ 108 ]
 		}
 	},
 

diff --git a/Content/Metadata/Boss/TurtleBossShell.res b/Content/Metadata/Boss/TurtleBossShell.res
@@ -3,8 +3,7 @@
 
 	"Animations": {
 		"Idle": {
-			"Path": "TurtleBoss/shell.aura",
-			"States": [ 0 ]
+			"Path": "TurtleBoss/shell.aura"
 		}
 	},
 

diff --git a/Content/Metadata/Collectible/Coins.res b/Content/Metadata/Collectible/Coins.res
@@ -4,13 +4,15 @@
 	},
 
 	"Animations": {
-		"CoinGold": {
-			"Path": "Pickup/coin_gold.aura",
-			"FrameRate": 5
-		},
 		"CoinSilver": {
 			"Path": "Pickup/coin_silver.aura",
-			"FrameRate": 5
+			"FrameRate": 5,
+			"States": [ 0 ]
+		},
+		"CoinGold": {
+			"Path": "Pickup/coin_gold.aura",
+			"FrameRate": 5,
+			"States": [ 1 ]
 		}
 	}
 }
diff --git a/Content/Metadata/Collectible/Gems.res b/Content/Metadata/Collectible/Gems.res
@@ -4,19 +4,23 @@
 	"Animations": {
 		"GemRed": {
 			"Path": "Pickup/gem.aura",
-			"PaletteOffset": 128
+			"PaletteOffset": 128,
+			"States": [ 0 ]
 		},
 		"GemGreen": {
 			"Path": "Pickup/gem.aura",
-			"PaletteOffset": 256
+			"PaletteOffset": 256,
+			"States": [ 1 ]
 		},
 		"GemBlue": {
 			"Path": "Pickup/gem.aura",
-			"PaletteOffset": 384
+			"PaletteOffset": 384,
+			"States": [ 2 ]
 		},
 		"GemPurple": {
 			"Path": "Pickup/gem.aura",
-			"PaletteOffset": 512
+			"PaletteOffset": 512,
+			"States": [ 3 ]
 		}
 	}
 }
diff --git a/Content/Metadata/Common/Explosions.res b/Content/Metadata/Common/Explosions.res
@@ -4,72 +4,90 @@
 	},
 
 	"Animations": {
-		"Large": {
-			"Path": "Common/explosion_large.aura",
-			"FrameRate": 8
+		"Tiny": {
+			"Path": "Common/explosion_tiny.aura",
+			"FrameRate": 13,
+			"States": [ 0 ]
 		},
-		"Pepper": {
-			"Path": "Common/explosion_pepper.aura"
+		"TinyBlue": {
+			"Path": "Common/explosion_freezer_maybe.aura",
+			"FrameRate": 13,
+			"States": [ 1 ]
 		},
-		"RF": {
-			"Path": "Common/explosion_rf.aura",
-			"FrameRate": 6
+		"TinyDark": {
+			"Path": "Common/explosion_tiny_black.aura",
+			"FrameRate": 13,
+			"States": [ 2 ]
 		},
 		"Small": {
 			"Path": "Common/explosion_upwards.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 3 ]
 		},
 		"SmallDark": {
 			"Path": "Common/explosion_small.aura",
-			"FrameRate": 8
-		},
-		"Tiny": {
-			"Path": "Common/explosion_tiny.aura",
-			"FrameRate": 13
-		},
-		"TinyBlue": {
-			"Path": "Common/explosion_freezer_maybe.aura",
-			"FrameRate": 13
+			"FrameRate": 8,
+			"States": [ 4 ]
 		},
-		"TinyDark": {
-			"Path": "Common/explosion_tiny_black.aura",
-			"FrameRate": 13
+		"Large": {
+			"Path": "Common/explosion_large.aura",
+			"FrameRate": 8,
+			"States": [ 5 ]
 		},
 		"SmokeBrown": {
 			"Path": "Common/smoke_circling_brown.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 6 ]
 		},
 		"SmokeGray": {
 			"Path": "Common/smoke_circling_gray.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 7 ]
 		},
 		"SmokeWhite": {
 			"Path": "Common/smoke_circling_white.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 8 ]
 		},
 		"SmokePoof": {
 			"Path": "Common/smoke_poof.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 9 ]
 		},
 		"WaterSplash": {
 			"Path": "Common/water_splash.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 10 ]
+		},
+		"Pepper": {
+			"Path": "Common/explosion_pepper.aura",
+			"States": [ 11 ]
+		},
+		"RF": {
+			"Path": "Common/explosion_rf.aura",
+			"FrameRate": 6,
+			"States": [ 12 ]
 		},
 		"Generator": {
-			"Path": "Common/generator.aura"
+			"Path": "Common/generator.aura",
+			"States": [ 13 ]
 		},
 
 		"IceShrapnel1": {
-			"Path": "Common/ice_break_shrapnel_1.aura"
+			"Path": "Common/ice_break_shrapnel_1.aura",
+			"States": [ 14 ]
 		},
 		"IceShrapnel2": {
-			"Path": "Common/ice_break_shrapnel_2.aura"
+			"Path": "Common/ice_break_shrapnel_2.aura",
+			"States": [ 15 ]
 		},
 		"IceShrapnel3": {
-			"Path": "Common/ice_break_shrapnel_3.aura"
+			"Path": "Common/ice_break_shrapnel_3.aura",
+			"States": [ 16 ]
 		},
 		"IceShrapnel4": {
-			"Path": "Common/ice_break_shrapnel_4.aura"
+			"Path": "Common/ice_break_shrapnel_4.aura",
+			"States": [ 17 ]
 		}
 	}
 }
diff --git a/Content/Metadata/Common/Scenery.res b/Content/Metadata/Common/Scenery.res
@@ -3,10 +3,12 @@
 
 	"Animations": {
 		"Snow": {
-			"Path": "Common/snow.aura"
+			"Path": "Common/snow.aura",
+			"States": [ 0 ]
 		},
 		"Rain": {
-			"Path": "Common/rain.aura"
+			"Path": "Common/rain.aura",
+			"States": [ 1 ]
 		}
 	},
 

diff --git a/Content/Metadata/Enemy/Caterpillar.res b/Content/Metadata/Enemy/Caterpillar.res
@@ -36,7 +36,8 @@
 
 		"Smoke": {
 			"Path": "Caterpillar/smoke.aura",
-			"FrameRate": 5
+			"FrameRate": 5,
+			"States": [ 7 ]
 		}
 	},
 	"Sounds": {

diff --git a/Content/Metadata/Enemy/LizardFloat.res b/Content/Metadata/Enemy/LizardFloat.res
@@ -22,11 +22,13 @@
 		},
 		"Copter": {
 			"Path": "Lizard/copter.aura",
-			"FrameRate": 20
+			"FrameRate": 20,
+			"States": [ 1 ]
 		},
 
 		"Bomb": {
-			"Path": "Lizard/bomb.aura"
+			"Path": "Lizard/bomb.aura",
+			"States": [ 2 ]
 		}
 	},
 

diff --git a/Content/Metadata/Enemy/LizardFloatXmas.res b/Content/Metadata/Enemy/LizardFloatXmas.res
@@ -22,12 +22,14 @@
 		},
 		"Copter": {
 			"Path": "Lizard/xmas_copter.aura",
-			"FrameRate": 20
+			"FrameRate": 20,
+			"States": [ 1 ]
 		},
 
 		"Bomb": {
 			"Path": "Lizard/xmas_bomb.aura",
-			"FrameRate": 8
+			"FrameRate": 8,
+			"States": [ 2 ]
 		}
 	},
 

diff --git a/Content/Metadata/Enemy/MadderHatter.res b/Content/Metadata/Enemy/MadderHatter.res
@@ -27,10 +27,12 @@
 			"States": [ 1073741826 ]
 		},
 		"Cup": {
-			"Path": "MadderHatter/cup.aura"
+			"Path": "MadderHatter/cup.aura",
+			"States": [ 2 ]
 		},
 		"Hat": {
-			"Path": "MadderHatter/hat.aura"
+			"Path": "MadderHatter/hat.aura",
+			"States": [ 3 ]
 		}
 	},
 

diff --git a/Content/Metadata/Enemy/Skeleton.res b/Content/Metadata/Enemy/Skeleton.res
@@ -10,10 +10,12 @@
 			"States": [ 1 ]
 		},
 		"Bone": {
-			"Path": "Skeleton/bone.aura"
+			"Path": "Skeleton/bone.aura",
+			"States": [ 2 ]
 		},
 		"Skull": {
-			"Path": "Skeleton/skull.aura"
+			"Path": "Skeleton/skull.aura",
+			"States": [ 3 ]
 		}
 	}
 }
diff --git a/Content/Metadata/Enemy/TurtleShell.res b/Content/Metadata/Enemy/TurtleShell.res
@@ -3,8 +3,7 @@
 
 	"Animations": {
 		"Idle": {
-			"Path": "Turtle/shell_reverse.aura",
-			"States": [ 0 ]
+			"Path": "Turtle/shell_reverse.aura"
 		}
 	},
 

diff --git a/Content/Metadata/Enemy/TurtleShellXmas.res b/Content/Metadata/Enemy/TurtleShellXmas.res
@@ -3,8 +3,7 @@
 
 	"Animations": {
 		"Idle": {
-			"Path": "Turtle/xmas_shell_reverse.aura",
-			"States": [ 0 ]
+			"Path": "Turtle/xmas_shell_reverse.aura"
 		}
 	},
 

diff --git a/Content/Metadata/Interactive/PlayerFrog.res b/Content/Metadata/Interactive/PlayerFrog.res
@@ -58,16 +58,20 @@
 		},
 
 		"Shield": {
-			"Path": "Common/player_shield.aura"
+			"Path": "Common/player_shield.aura",
+			"States": [ 536870928 ]
 		},
 		"ShieldFire": {
-			"Path": "Common/shield_fire.aura"
+			"Path": "Common/shield_fire.aura",
+			"States": [ 536870929 ]
 		},
 		"ShieldWater": {
-			"Path": "Common/shield_water.aura"
+			"Path": "Common/shield_water.aura",
+			"States": [ 536870930 ]
 		},
 		"ShieldLightning": {
-			"Path": "Common/shield_lightning.aura"
+			"Path": "Common/shield_lightning.aura",
+			"States": [ 536870931 ]
 		},
 
 		"TransformFromJazz": {