games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-11 13:15:38 +02:00
Code Issues Releases Activity

Move list of war machines in war machine factory to config

Browse Source
This commit is contained in:
Ivan Savenko 2024-11-16 15:32:36 +00:00
parent e2fe20e26d
commit a4ef45c4f8
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/objects/generic.json
View File

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

8
lib/mapObjects/CGDwelling.cpp
View File

@ -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;