Fixed Fencer, LabRat, MadderHatter, Raven, TurtleShell, `Mo…

…th`, `Spring`, `Queen`, minor changes
deathkiller · Jan 26, 2024 · a032e5f · a032e5f
1 parent b482484
commit a032e5f
Show file tree

Hide file tree

Showing 131 changed files with 246 additions and 243 deletions.
diff --git a/Content/Metadata/UI/HUD.res b/Content/Metadata/UI/HUD.res
@@ -153,7 +153,7 @@
 
 		"BossHealthBar": {
 			"Path": "UI/boss_health_bar.aura",
-			"States": [ 74 ]
+			"States": [ 75 ]
 		},
 
 		"WeaponWheel": {

diff --git a/Sources/Jazz2/Actors/ActorBase.h b/Sources/Jazz2/Actors/ActorBase.h
@@ -139,7 +139,7 @@ namespace Jazz2::Actors
 
 	class ActorBase : public std::enable_shared_from_this<ActorBase>
 	{
-		DEATH_RTTI_OBJECT();
+		DEATH_RUNTIME_OBJECT();
 
 		friend class Jazz2::LevelHandler;
 #if defined(WITH_MULTIPLAYER)

diff --git a/Sources/Jazz2/Actors/Collectibles/AmmoCollectible.h b/Sources/Jazz2/Actors/Collectibles/AmmoCollectible.h
@@ -7,7 +7,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class AmmoCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		AmmoCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/CarrotCollectible.h b/Sources/Jazz2/Actors/Collectibles/CarrotCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class CarrotCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		CarrotCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/CarrotFlyCollectible.h b/Sources/Jazz2/Actors/Collectibles/CarrotFlyCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class CarrotFlyCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		CarrotFlyCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/CarrotInvincibleCollectible.h b/Sources/Jazz2/Actors/Collectibles/CarrotInvincibleCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class CarrotInvincibleCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		CarrotInvincibleCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/CoinCollectible.h b/Sources/Jazz2/Actors/Collectibles/CoinCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class CoinCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		CoinCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/CollectibleBase.h b/Sources/Jazz2/Actors/Collectibles/CollectibleBase.h
@@ -11,7 +11,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class CollectibleBase : public ActorBase
 	{
-		DEATH_RTTI_OBJECT(ActorBase);
+		DEATH_RUNTIME_OBJECT(ActorBase);
 
 	public:
 		CollectibleBase();

diff --git a/Sources/Jazz2/Actors/Collectibles/FastFireCollectible.h b/Sources/Jazz2/Actors/Collectibles/FastFireCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class FastFireCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		FastFireCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/FoodCollectible.h b/Sources/Jazz2/Actors/Collectibles/FoodCollectible.h
@@ -45,7 +45,7 @@ namespace Jazz2::Actors::Collectibles
 
 	class FoodCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		FoodCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/GemCollectible.h b/Sources/Jazz2/Actors/Collectibles/GemCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class GemCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		GemCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/GemGiant.h b/Sources/Jazz2/Actors/Collectibles/GemGiant.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class GemGiant : public ActorBase
 	{
-		DEATH_RTTI_OBJECT(ActorBase);
+		DEATH_RUNTIME_OBJECT(ActorBase);
 
 	public:
 		GemGiant();

diff --git a/Sources/Jazz2/Actors/Collectibles/GemRing.h b/Sources/Jazz2/Actors/Collectibles/GemRing.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class GemRing : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		GemRing();

diff --git a/Sources/Jazz2/Actors/Collectibles/OneUpCollectible.h b/Sources/Jazz2/Actors/Collectibles/OneUpCollectible.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class OneUpCollectible : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		OneUpCollectible();

diff --git a/Sources/Jazz2/Actors/Collectibles/Stopwatch.h b/Sources/Jazz2/Actors/Collectibles/Stopwatch.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Collectibles
 {
 	class Stopwatch : public CollectibleBase
 	{
-		DEATH_RTTI_OBJECT(CollectibleBase);
+		DEATH_RUNTIME_OBJECT(CollectibleBase);
 
 	public:
 		Stopwatch();

diff --git a/Sources/Jazz2/Actors/Enemies/Bat.cpp b/Sources/Jazz2/Actors/Enemies/Bat.cpp
@@ -91,8 +91,8 @@ namespace Jazz2::Actors::Enemies
 				if (length < 2.0f) {
 					_attacking = false;
 					MoveInstantly(_originPos, MoveType::Absolute | MoveType::Force);
-					_speed.X = 0;
-					_speed.Y = 0;
+					_speed.X = 0.0f;
+					_speed.Y = 0.0f;
 					_noiseCooldown = 210.0f;
 					SetAnimation(AnimState::Idle);
 					SetTransition((AnimState)1073741826, false);

diff --git a/Sources/Jazz2/Actors/Enemies/Bat.h b/Sources/Jazz2/Actors/Enemies/Bat.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Bat : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Bat();

diff --git a/Sources/Jazz2/Actors/Enemies/Bee.h b/Sources/Jazz2/Actors/Enemies/Bee.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Bee : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Bee();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Bilsy.h b/Sources/Jazz2/Actors/Enemies/Bosses/Bilsy.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Bilsy : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		Bilsy();
@@ -27,7 +27,7 @@ namespace Jazz2::Actors::Bosses
 
 		class Fireball : public EnemyBase
 		{
-			DEATH_RTTI_OBJECT(EnemyBase);
+			DEATH_RUNTIME_OBJECT(EnemyBase);
 
 		public:
 			bool OnHandleCollision(std::shared_ptr<ActorBase> other) override;

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Bolly.h b/Sources/Jazz2/Actors/Enemies/Bosses/Bolly.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Bolly : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		Bolly();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/BossBase.h b/Sources/Jazz2/Actors/Enemies/Bosses/BossBase.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class BossBase : public Enemies::EnemyBase
 	{
-		DEATH_RTTI_OBJECT(Enemies::EnemyBase);
+		DEATH_RUNTIME_OBJECT(Enemies::EnemyBase);
 
 	public:
 		virtual bool OnActivatedBoss() = 0;

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Bubba.h b/Sources/Jazz2/Actors/Enemies/Bosses/Bubba.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Bubba : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		Bubba();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Devan.h b/Sources/Jazz2/Actors/Enemies/Bosses/Devan.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Devan : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		Devan();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/DevanRemote.h b/Sources/Jazz2/Actors/Enemies/Bosses/DevanRemote.h
@@ -7,7 +7,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class DevanRemote : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		DevanRemote();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Queen.cpp b/Sources/Jazz2/Actors/Enemies/Bosses/Queen.cpp
@@ -222,7 +222,8 @@ namespace Jazz2::Actors::Bosses
 			case StateScreaming: {
 				auto& players = _levelHandler->GetPlayers();
 				for (auto player : players) {
-					player->AddExternalForce(-1.5f * timeMult, 0.0f);
+					//player->AddExternalForce(-1.5f * timeMult, 0.0f);
+					player->MoveInstantly(Vector2f(-1.5f * timeMult, 0.0f), MoveType::Relative);
 				}
 				break;
 			}

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Queen.h b/Sources/Jazz2/Actors/Enemies/Bosses/Queen.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Queen : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		Queen();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Robot.h b/Sources/Jazz2/Actors/Enemies/Bosses/Robot.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Robot : public Enemies::EnemyBase
 	{
-		DEATH_RTTI_OBJECT(Enemies::EnemyBase);
+		DEATH_RUNTIME_OBJECT(Enemies::EnemyBase);
 
 	public:
 		Robot();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/TurtleBoss.h b/Sources/Jazz2/Actors/Enemies/Bosses/TurtleBoss.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class TurtleBoss : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		TurtleBoss();
@@ -31,7 +31,7 @@ namespace Jazz2::Actors::Bosses
 
 		class Mace : public EnemyBase
 		{
-			DEATH_RTTI_OBJECT(EnemyBase);
+			DEATH_RUNTIME_OBJECT(EnemyBase);
 
 		public:
 			~Mace();

diff --git a/Sources/Jazz2/Actors/Enemies/Bosses/Uterus.h b/Sources/Jazz2/Actors/Enemies/Bosses/Uterus.h
@@ -7,7 +7,7 @@ namespace Jazz2::Actors::Bosses
 {
 	class Uterus : public BossBase
 	{
-		DEATH_RTTI_OBJECT(BossBase);
+		DEATH_RUNTIME_OBJECT(BossBase);
 
 	public:
 		Uterus();

diff --git a/Sources/Jazz2/Actors/Enemies/Caterpillar.h b/Sources/Jazz2/Actors/Enemies/Caterpillar.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Caterpillar : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Caterpillar();
@@ -26,7 +26,7 @@ namespace Jazz2::Actors::Enemies
 
 		class Smoke : public EnemyBase
 		{
-			DEATH_RTTI_OBJECT(EnemyBase);
+			DEATH_RUNTIME_OBJECT(EnemyBase);
 
 		public:
 			bool OnHandleCollision(std::shared_ptr<ActorBase> other) override;

diff --git a/Sources/Jazz2/Actors/Enemies/Crab.h b/Sources/Jazz2/Actors/Enemies/Crab.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Crab : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Crab();

diff --git a/Sources/Jazz2/Actors/Enemies/Demon.h b/Sources/Jazz2/Actors/Enemies/Demon.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Demon : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Demon();

diff --git a/Sources/Jazz2/Actors/Enemies/Doggy.h b/Sources/Jazz2/Actors/Enemies/Doggy.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Doggy : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Doggy();

diff --git a/Sources/Jazz2/Actors/Enemies/Dragon.h b/Sources/Jazz2/Actors/Enemies/Dragon.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Dragon : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Dragon();
@@ -23,7 +23,7 @@ namespace Jazz2::Actors::Enemies
 
 		class Fire : public EnemyBase
 		{
-			DEATH_RTTI_OBJECT(EnemyBase);
+			DEATH_RUNTIME_OBJECT(EnemyBase);
 
 		protected:
 			Task<bool> OnActivatedAsync(const ActorActivationDetails& details) override;

diff --git a/Sources/Jazz2/Actors/Enemies/Dragonfly.h b/Sources/Jazz2/Actors/Enemies/Dragonfly.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class Dragonfly : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		Dragonfly();

diff --git a/Sources/Jazz2/Actors/Enemies/EnemyBase.h b/Sources/Jazz2/Actors/Enemies/EnemyBase.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class EnemyBase : public ActorBase
 	{
-		DEATH_RTTI_OBJECT(ActorBase);
+		DEATH_RUNTIME_OBJECT(ActorBase);
 
 	public:
 		EnemyBase();

diff --git a/Sources/Jazz2/Actors/Enemies/FatChick.h b/Sources/Jazz2/Actors/Enemies/FatChick.h
@@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies
 {
 	class FatChick : public EnemyBase
 	{
-		DEATH_RTTI_OBJECT(EnemyBase);
+		DEATH_RUNTIME_OBJECT(EnemyBase);
 
 	public:
 		FatChick();
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ namespace Jazz2::Actors::Enemies @@
     {
     	class Bat : public EnemyBase
     	{
-    		DEATH_RTTI_OBJECT(EnemyBase);
+    		DEATH_RUNTIME_OBJECT(EnemyBase);
     	public:
     		Bat();
@@ Expand Down @@