From 4c4539b00e3c0d84d7f59520bbc2a482a579d006 Mon Sep 17 00:00:00 2001
From: dydzio <blood990@gmail.com>
Date: Wed, 1 Feb 2017 13:38:28 +0100
Subject: [PATCH] Rename ADVANCED_CATAPULT bonus to reflect the purpose better

---
 config/bonuses_texts.json        | 4 ++--
 config/creatures/stronghold.json | 2 +-
 lib/HeroBonus.h                  | 2 +-
 server/CGameHandler.cpp          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/bonuses_texts.json b/config/bonuses_texts.json
index 38935f6ed..1c17d8aba 100644
--- a/config/bonuses_texts.json
+++ b/config/bonuses_texts.json
@@ -18,9 +18,9 @@
 		"description": "May Retaliate ${val} extra times"
 	},
 	
-	"ADVANCED_CATAPULT":
+	"CATAPULT_EXTRA_SHOTS":
 	{
-		"name": "Advanced wall breaker",
+		"name": "Additional siege attacks",
 		"description": "Can hit siege walls ${val} extra times per attack"
 	},
 
diff --git a/config/creatures/stronghold.json b/config/creatures/stronghold.json
index 76db3dfc1..a5610ea49 100644
--- a/config/creatures/stronghold.json
+++ b/config/creatures/stronghold.json
@@ -273,7 +273,7 @@
 		{
 			"siegeDoubleAttack" :
 			{
-				"type" : "ADVANCED_CATAPULT",
+				"type" : "CATAPULT_EXTRA_SHOTS",
 				"val" : 1
 			}
 		},
diff --git a/lib/HeroBonus.h b/lib/HeroBonus.h
index 321fbbda9..95431cf63 100644
--- a/lib/HeroBonus.h
+++ b/lib/HeroBonus.h
@@ -216,7 +216,7 @@ public:
 	BONUS_NAME(DISGUISED) /* subtype - spell level */\
 	BONUS_NAME(VISIONS) /* subtype - spell level */\
 	BONUS_NAME(NO_TERRAIN_PENALTY) /* subtype - terrain type */\
-	BONUS_NAME(ADVANCED_CATAPULT) /*val - number of additional shots, requires CATAPULT bonus to work*/\
+	BONUS_NAME(CATAPULT_EXTRA_SHOTS) /*val - number of additional shots, requires CATAPULT bonus to work*/\
 	/* end of list */
 
 
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index cb4e57ac6..cf4c14654 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -3961,7 +3961,7 @@ bool CGameHandler::makeBattleAction(BattleAction &ba)
 			else //may need to use higher ballistics level for creatures in future for some cases to match original H3 (upgraded cyclops etc)
 			{
 				sbi = VLC->heroh->ballistics.at(1);
-				sbi.shots += std::max(stack->valOfBonuses(Bonus::ADVANCED_CATAPULT), 0);
+				sbi.shots += std::max(stack->valOfBonuses(Bonus::CATAPULT_EXTRA_SHOTS), 0);
 			}
 
 			auto wallPart = gs->curB->battleHexToWallPart(ba.destinationTile);