From fa0092006f41844be5b7b064bd5dc6c6f6204951 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Sat, 18 Nov 2023 02:38:54 -0600
Subject: [PATCH] Hardcoding: AHZ/AGZ/SSZ cloud object/state/sprite definitions

---
 src/info.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/info.h |  49 ++++++++
 2 files changed, 378 insertions(+)

diff --git a/src/info.c b/src/info.c
index b23860213..f96a00510 100644
--- a/src/info.c
+++ b/src/info.c
@@ -965,6 +965,21 @@ char sprnames[NUMSPRITES + 1][5] =
 	"PUYC",
 	"PUYD",
 	"PUYE",
+	
+	// Aerial Highlands
+	"BCLD",
+	
+	// Avant Garden
+	"AGTU",
+	"AGTL",
+	"AGTS",
+	"AGTR",
+	"AGFL",
+	"AGFF",
+	"AGCL",
+	
+	// Sky Sanctuary
+	"SSCL",
 
 	"MGSH", // Mega Barrier
 
@@ -5666,6 +5681,23 @@ state_t states[NUMSTATES] =
 	{SPR_PUYA, 3, -1, {A_BlendEyePuyoHack}, 0, 0, S_NULL},					// S_BLENDEYE_PUYO_SHOCK,
 	{SPR_PUYA, 4|FF_ANIMATE,  5, {A_BlendEyePuyoHack}, 2, 2, S_NULL},				// S_BLENDEYE_PUYO_DIE,
 	{SPR_PUYA, 5,             2, {A_BlendEyePuyoHack}, 0, 0, S_BLENDEYE_PUYO_DIE},	// S_BLENDEYE_PUYO_DUST,
+	
+	// Aerial Highlands
+	{SPR_BCLD, FF_ANIMATE, -1, {NULL}, 3, 6, S_AHZCLOUD},  // S_AHZCLOUD
+	
+	// Avant Garden
+	{SPR_AGTL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_AGZBULB_BASE}, // S_AGZBULB_BASE
+	{SPR_AGTU, 0, -1, {NULL}, 0, 0, S_AGZBULB_NEUTRAL}, // S_AGZBULB_NEUTRAL
+	{SPR_AGTS, FF_ANIMATE, 8, {NULL}, 3, 2, S_AGZBULB_ANIM2}, // S_AGZBULB_ANIM1
+	{SPR_AGTS, 4, 8, {NULL}, 0, 0, S_AGZBULB_ANIM3}, // S_AGZBULB_ANIM2
+	{SPR_AGTS, FF_ANIMATE, 8, {NULL}, 3, 2, S_AGZBULB_NEUTRAL}, // S_AGZBULB_ANIM3
+	{SPR_AGTR, 0, -1, {NULL}, 0, 0, S_AGTR}, // S_AGTR
+	{SPR_AGFL, 0, -1, {NULL}, 0, 0, S_AGFL}, // S_AGFL
+	{SPR_AGFF, 0, -1, {NULL}, 0, 0, S_AGFF}, // S_AGFF
+	{SPR_AGCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_AGZCLOUD}, // S_AGZCLOUD
+	
+	// Sky Sanctuary
+	{SPR_SSCL, FF_ANIMATE, -1, {NULL}, 3, 6, S_SSZCLOUD}, // S_SSZCLOUD
 
 	{SPR_MGSH, 2|FF_PAPERSPRITE|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_MEGABARRIER1,
 	{SPR_MGSH, 1|FF_PAPERSPRITE|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_MEGABARRIER2,
@@ -31854,6 +31886,303 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		MF_SCENERY|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
 		S_NULL          // raisestate
 	},
+	
+	{           // MT_AHZ_CLOUD
+		-1,             // doomednum
+		S_AHZCLOUD,     // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		64<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_SPECIAL,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AHZ_CLOUDCLUSTER
+		3486,           // doomednum
+		S_INVISIBLE,    // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		64<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_BULB
+		3445,           // doomednum
+		S_INVISIBLE,    // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		48<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_BULB_PART
+		-1,             // doomednum
+		S_INVISIBLE,    // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		48<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_TREE
+		3447,           // doomednum
+		S_AGTR,         // spawnstate
+		1,              // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		32<<FRACBITS,   // radius
+		32<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		0,              // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_AGFL
+		3448,           // doomednum
+		S_AGFL,         // spawnstate
+		1,              // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		32<<FRACBITS,   // radius
+		32<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		0,              // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_AGFF
+		3449,           // doomednum
+		S_AGFF,         // spawnstate
+		1,              // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		32<<FRACBITS,   // radius
+		32<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		0,              // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_CLOUD
+		-1,             // doomednum
+		S_AGZCLOUD,     // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		64<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_SPECIAL,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_AGZ_CLOUDCLUSTER
+		3446,           // doomednum
+		S_INVISIBLE,    // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		64<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_SSZ_CLOUD
+		-1,             // doomednum
+		S_SSZCLOUD,     // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		64<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY|MF_SPECIAL,   // flags
+		S_NULL          // raisestate
+	},
+	
+	{           // MT_SSZ_CLOUDCLUSTER
+		3456,           // doomednum
+		S_INVISIBLE,    // spawnstate
+		1000,           // spawnhealth
+		S_NULL,         // seestate
+		sfx_None,       // seesound
+		0,              // reactiontime
+		sfx_None,       // attacksound
+		S_NULL,         // painstate
+		0,              // painchance
+		sfx_None,       // painsound
+		S_NULL,         // meleestate
+		S_NULL,         // missilestate
+		S_NULL,         // deathstate
+		S_NULL,         // xdeathstate
+		sfx_None,       // deathsound
+		0,              // speed
+		64<<FRACBITS,   // radius
+		64<<FRACBITS,   // height
+		0,              // display offset
+		0,              // mass
+		0,              // damage
+		sfx_None,       // activesound
+		MF_NOGRAVITY,   // flags
+		S_NULL          // raisestate
+	},
 
 	{           // MT_MEGABARRIER
 		-1,             // doomednum
diff --git a/src/info.h b/src/info.h
index 17762d8db..6b88476f4 100644
--- a/src/info.h
+++ b/src/info.h
@@ -1519,6 +1519,21 @@ typedef enum sprite
 	SPR_PUYC,
 	SPR_PUYD,
 	SPR_PUYE,
+	
+	// Aerial Highlands
+	SPR_BCLD,
+	
+	// Avant Garden
+	SPR_AGTU,
+	SPR_AGTL,
+	SPR_AGTS,
+	SPR_AGTR,
+	SPR_AGFL,
+	SPR_AGFF,
+	SPR_AGCL,
+	
+	// Sky Sanctuary
+	SPR_SSCL,
 
 	SPR_MGSH, // Mega Barrier
 
@@ -6090,6 +6105,23 @@ typedef enum state
 	S_BLENDEYE_PUYO_SHOCK,
 	S_BLENDEYE_PUYO_DIE,
 	S_BLENDEYE_PUYO_DUST,
+	
+	// Aerial Highlands
+	S_AHZCLOUD,
+	
+	// Avant Garden
+	S_AGZBULB_BASE,
+	S_AHZBULB_NEUTRAL,
+	S_AHZBULB_ANIM1,
+	S_AHZBULB_ANIM2,
+	S_AHZBULB_ANIM3,
+	S_AGTR,
+	S_AGFL,
+	S_AGFF,
+	S_AGZCLOUD,
+	
+	// Sky Sanctuary
+	S_SSZCLOUD,
 
 	S_MEGABARRIER1,
 	S_MEGABARRIER2,
@@ -7457,6 +7489,23 @@ typedef enum mobj_type
 	MT_BLENDEYE_PUYO,
 	MT_BLENDEYE_PUYO_DUST,
 	MT_BLENDEYE_PUYO_DUST_COFFEE,
+	
+	// Aerial Highlands
+	MT_AHZ_CLOUD,
+	MT_AHZ_CLOUDCLUSTER,
+	
+	// Avant Garden
+	MT_AGZ_BULB,
+	MT_AGZ_BULB_PART,
+	MT_AGZ_TREE,
+	MT_AGZ_AGFL,
+	MT_AGZ_AGFF,
+	MT_AGZ_CLOUD,
+	MT_AGZ_CLOUDCLUSTER,
+	
+	// Sky Sanctuary
+	MT_SSZ_CLOUD,
+	MT_SSZ_CLOUDCLUSTER,
 
 	MT_MEGABARRIER,