Browse Source

Move list of war machines in war machine factory to config

Ivan Savenko 11 tháng trước cách đây
mục cha
commit
a4ef45c4f8
2 tập tin đã thay đổi với 2 bổ sung7 xóa
  1. 1 0
      config/objects/generic.json
  2. 1 7
      lib/mapObjects/CGDwelling.cpp

+ 1 - 0
config/objects/generic.json

@@ -223,6 +223,7 @@
 				"ambient" : ["LOOPFACT"],
 				"visit" : ["MILITARY"]
 			}
+			"creatures": [["ballista"], ["firstAidTent"], ["ammoCart"] ]
 		},
 		"types" : {
 			"object" : {

+ 1 - 7
lib/mapObjects/CGDwelling.cpp

@@ -180,6 +180,7 @@ void CGDwelling::initObj(vstd::RNG & rand)
 	{
 	case Obj::CREATURE_GENERATOR1:
 	case Obj::CREATURE_GENERATOR4:
+	case Obj::WAR_MACHINE_FACTORY:
 		{
 			getObjectHandler()->configureObject(this, rand);
 			assert(!creatures.empty());
@@ -190,13 +191,6 @@ void CGDwelling::initObj(vstd::RNG & rand)
 		//is handled within newturn func
 		break;
 
-	case Obj::WAR_MACHINE_FACTORY:
-		creatures.resize(3);
-		creatures[0].second.emplace_back(CreatureID::BALLISTA);
-		creatures[1].second.emplace_back(CreatureID::FIRST_AID_TENT);
-		creatures[2].second.emplace_back(CreatureID::AMMO_CART);
-		break;
-
 	default:
 		assert(0);
 		break;