mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Formatting & cleanup
This commit is contained in:
Ivan Savenko
parent
e54287ea5d
commit
c2d5f7f22f
@ -366,44 +366,11 @@ public:
|
||||
|
||||
DWELL_UP2_FIRST = DWELL_LVL_7_UP + 1,
|
||||
|
||||
//Special buildings for towns.
|
||||
LIGHTHOUSE = SPECIAL_1,
|
||||
STABLES = SPECIAL_2, //Castle
|
||||
BROTHERHOOD = SPECIAL_3,
|
||||
|
||||
MYSTIC_POND = SPECIAL_1,
|
||||
FOUNTAIN_OF_FORTUNE = SPECIAL_2, //Rampart
|
||||
TREASURY = SPECIAL_3,
|
||||
|
||||
ARTIFACT_MERCHANT = SPECIAL_1,
|
||||
LOOKOUT_TOWER = SPECIAL_2, //Tower
|
||||
LIBRARY = SPECIAL_3,
|
||||
WALL_OF_KNOWLEDGE = SPECIAL_4,
|
||||
|
||||
STORMCLOUDS = SPECIAL_2,
|
||||
// //Special buildings for towns.
|
||||
CASTLE_GATE = SPECIAL_3, //Inferno
|
||||
ORDER_OF_FIRE = SPECIAL_4,
|
||||
|
||||
COVER_OF_DARKNESS = SPECIAL_1,
|
||||
NECROMANCY_AMPLIFIER = SPECIAL_2, //Necropolis
|
||||
SKELETON_TRANSFORMER = SPECIAL_3,
|
||||
|
||||
//ARTIFACT_MERCHANT - same ID as in tower
|
||||
MANA_VORTEX = SPECIAL_2,
|
||||
PORTAL_OF_SUMMON = SPECIAL_3, //Dungeon
|
||||
BATTLE_ACADEMY = SPECIAL_4,
|
||||
|
||||
ESCAPE_TUNNEL = SPECIAL_1,
|
||||
FREELANCERS_GUILD = SPECIAL_2, //Stronghold
|
||||
BALLISTA_YARD = SPECIAL_3,
|
||||
HALL_OF_VALHALLA = SPECIAL_4,
|
||||
ARTIFACT_MERCHANT = SPECIAL_1,
|
||||
|
||||
CAGE_OF_WARLORDS = SPECIAL_1,
|
||||
GLYPHS_OF_FEAR = SPECIAL_2, // Fortress
|
||||
BLOOD_OBELISK = SPECIAL_3,
|
||||
|
||||
//ARTIFACT_MERCHANT - same ID as in tower
|
||||
MAGIC_UNIVERSITY = SPECIAL_2, // Conflux
|
||||
};
|
||||
|
||||
bool IsSpecialOrGrail() const
|
||||
@ -739,31 +706,102 @@ class SpellIDBase : public IdentifierBase
|
||||
public:
|
||||
enum Type
|
||||
{
|
||||
// Special ID's
|
||||
SPELLBOOK_PRESET = -3,
|
||||
PRESET = -2,
|
||||
NONE = -1,
|
||||
SUMMON_BOAT=0, SCUTTLE_BOAT=1, VISIONS=2, VIEW_EARTH=3, DISGUISE=4, VIEW_AIR=5,
|
||||
FLY=6, WATER_WALK=7, DIMENSION_DOOR=8, TOWN_PORTAL=9,
|
||||
|
||||
QUICKSAND=10, LAND_MINE=11, FORCE_FIELD=12, FIRE_WALL=13, EARTHQUAKE=14,
|
||||
MAGIC_ARROW=15, ICE_BOLT=16, LIGHTNING_BOLT=17, IMPLOSION=18,
|
||||
CHAIN_LIGHTNING=19, FROST_RING=20, FIREBALL=21, INFERNO=22,
|
||||
METEOR_SHOWER=23, DEATH_RIPPLE=24, DESTROY_UNDEAD=25, ARMAGEDDON=26,
|
||||
SHIELD=27, AIR_SHIELD=28, FIRE_SHIELD=29, PROTECTION_FROM_AIR=30,
|
||||
PROTECTION_FROM_FIRE=31, PROTECTION_FROM_WATER=32,
|
||||
PROTECTION_FROM_EARTH=33, ANTI_MAGIC=34, DISPEL=35, MAGIC_MIRROR=36,
|
||||
CURE=37, RESURRECTION=38, ANIMATE_DEAD=39, SACRIFICE=40, BLESS=41,
|
||||
CURSE=42, BLOODLUST=43, PRECISION=44, WEAKNESS=45, STONE_SKIN=46,
|
||||
DISRUPTING_RAY=47, PRAYER=48, MIRTH=49, SORROW=50, FORTUNE=51,
|
||||
MISFORTUNE=52, HASTE=53, SLOW=54, SLAYER=55, FRENZY=56,
|
||||
TITANS_LIGHTNING_BOLT=57, COUNTERSTRIKE=58, BERSERK=59, HYPNOTIZE=60,
|
||||
FORGETFULNESS=61, BLIND=62, TELEPORT=63, REMOVE_OBSTACLE=64, CLONE=65,
|
||||
SUMMON_FIRE_ELEMENTAL=66, SUMMON_EARTH_ELEMENTAL=67, SUMMON_WATER_ELEMENTAL=68, SUMMON_AIR_ELEMENTAL=69,
|
||||
// Adventure map spells
|
||||
SUMMON_BOAT = 0,
|
||||
SCUTTLE_BOAT = 1,
|
||||
VISIONS = 2,
|
||||
VIEW_EARTH = 3,
|
||||
DISGUISE = 4,
|
||||
VIEW_AIR = 5,
|
||||
FLY = 6,
|
||||
WATER_WALK = 7,
|
||||
DIMENSION_DOOR = 8,
|
||||
TOWN_PORTAL = 9,
|
||||
|
||||
STONE_GAZE=70, POISON=71, BIND=72, DISEASE=73, PARALYZE=74, AGE=75, DEATH_CLOUD=76, THUNDERBOLT=77,
|
||||
DISPEL_HELPFUL_SPELLS=78, DEATH_STARE=79, ACID_BREATH_DEFENSE=80, ACID_BREATH_DAMAGE=81,
|
||||
// Combar spells
|
||||
QUICKSAND = 10,
|
||||
LAND_MINE = 11,
|
||||
FORCE_FIELD = 12,
|
||||
FIRE_WALL = 13,
|
||||
EARTHQUAKE = 14,
|
||||
MAGIC_ARROW = 15,
|
||||
ICE_BOLT = 16,
|
||||
LIGHTNING_BOLT = 17,
|
||||
IMPLOSION = 18,
|
||||
CHAIN_LIGHTNING = 19,
|
||||
FROST_RING = 20,
|
||||
FIREBALL = 21,
|
||||
INFERNO = 22,
|
||||
METEOR_SHOWER = 23,
|
||||
DEATH_RIPPLE = 24,
|
||||
DESTROY_UNDEAD = 25,
|
||||
ARMAGEDDON = 26,
|
||||
SHIELD = 27,
|
||||
AIR_SHIELD = 28,
|
||||
FIRE_SHIELD = 29,
|
||||
PROTECTION_FROM_AIR = 30,
|
||||
PROTECTION_FROM_FIRE = 31,
|
||||
PROTECTION_FROM_WATER = 32,
|
||||
PROTECTION_FROM_EARTH = 33,
|
||||
ANTI_MAGIC = 34,
|
||||
DISPEL = 35,
|
||||
MAGIC_MIRROR = 36,
|
||||
CURE = 37,
|
||||
RESURRECTION = 38,
|
||||
ANIMATE_DEAD = 39,
|
||||
SACRIFICE = 40,
|
||||
BLESS = 41,
|
||||
CURSE = 42,
|
||||
BLOODLUST = 43,
|
||||
PRECISION = 44,
|
||||
WEAKNESS = 45,
|
||||
STONE_SKIN = 46,
|
||||
DISRUPTING_RAY = 47,
|
||||
PRAYER = 48,
|
||||
MIRTH = 49,
|
||||
SORROW = 50,
|
||||
FORTUNE = 51,
|
||||
MISFORTUNE = 52,
|
||||
HASTE = 53,
|
||||
SLOW = 54,
|
||||
SLAYER = 55,
|
||||
FRENZY = 56,
|
||||
TITANS_LIGHTNING_BOLT = 57,
|
||||
COUNTERSTRIKE = 58,
|
||||
BERSERK = 59,
|
||||
HYPNOTIZE = 60,
|
||||
FORGETFULNESS = 61,
|
||||
BLIND = 62,
|
||||
TELEPORT = 63,
|
||||
REMOVE_OBSTACLE = 64,
|
||||
CLONE = 65,
|
||||
SUMMON_FIRE_ELEMENTAL = 66,
|
||||
SUMMON_EARTH_ELEMENTAL = 67,
|
||||
SUMMON_WATER_ELEMENTAL = 68,
|
||||
SUMMON_AIR_ELEMENTAL = 69,
|
||||
|
||||
FIRST_NON_SPELL = 70, AFTER_LAST = 82
|
||||
// Creature abilities
|
||||
STONE_GAZE = 70,
|
||||
POISON = 71,
|
||||
BIND = 72,
|
||||
DISEASE = 73,
|
||||
PARALYZE = 74,
|
||||
AGE = 75,
|
||||
DEATH_CLOUD = 76,
|
||||
THUNDERBOLT = 77,
|
||||
DISPEL_HELPFUL_SPELLS = 78,
|
||||
DEATH_STARE = 79,
|
||||
ACID_BREATH_DEFENSE = 80,
|
||||
ACID_BREATH_DAMAGE = 81,
|
||||
|
||||
// Special ID's
|
||||
FIRST_NON_SPELL = 70,
|
||||
AFTER_LAST = 82
|
||||
};
|
||||
|
||||
DLL_LINKAGE const CSpell * toSpell() const; //deprecated
|
||||
@ -877,7 +915,14 @@ class GameResIDBase : public IdentifierBase
|
||||
public:
|
||||
enum Type : int32_t
|
||||
{
|
||||
WOOD = 0, MERCURY, ORE, SULFUR, CRYSTAL, GEMS, GOLD, MITHRIL,
|
||||
WOOD = 0,
|
||||
MERCURY,
|
||||
ORE,
|
||||
SULFUR,
|
||||
CRYSTAL,
|
||||
GEMS,
|
||||
GOLD,
|
||||
MITHRIL,
|
||||
COUNT,
|
||||
|
||||
WOOD_AND_ORE = 127, // special case for town bonus resource
|
||||
|
||||
Loading…
Reference in New Issue
Block a user