diff --git a/CHANGELOG_4 b/CHANGELOG_4 index 2c06a481..f4117894 100644 --- a/CHANGELOG_4 +++ b/CHANGELOG_4 @@ -34,7 +34,7 @@ Changes from 4.0.10g -> 4.0.10h prevented from further moves or attacks. Full healing should mean no penalties. -- Fixed a bug in output of rules when dealing with skill-based - maintainence. + maintenance. -- Fixed a bug dealing with the cost of non-skilled units versus skilled units when in a maintenance mode which requires skill based upkeep. Units will now pay the maximum of the skill based upkeep or the normal diff --git a/basic/rules.cpp b/basic/rules.cpp index db8667c3..db1d0276 100644 --- a/basic/rules.cpp +++ b/basic/rules.cpp @@ -77,7 +77,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 20, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */ diff --git a/fracas/rules.cpp b/fracas/rules.cpp index b4e7ddd8..129f8ba8 100644 --- a/fracas/rules.cpp +++ b/fracas/rules.cpp @@ -77,7 +77,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 20, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */ diff --git a/gamedata.cpp b/gamedata.cpp index cd7fafad..e09d8cb7 100644 --- a/gamedata.cpp +++ b/gamedata.cpp @@ -4787,10 +4787,10 @@ static SpecialType spd[] = { {-1, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // SPECIAL_FIREBALL {"fireball", "a fireball", @@ -4803,9 +4803,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_ENERGY,2,5,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_ENERGY,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "shoots a Fireball", "killing ", ""}, // SPECIAL_HELLFIRE {"hellfire", "hellfire", @@ -4818,9 +4818,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_ENERGY,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_ENERGY,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "blasts the enemy with Hellfire", "killing ", ""}, // SPECIAL_CAUSEFEAR {"fear", "cause fear", @@ -4832,7 +4832,7 @@ static SpecialType spd[] = { {-1, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", - {{ATTACK_SPIRIT,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT, "fear", 1}, + {{ATTACK_SPIRIT,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT, "fear", 0}, {-1, 0, 0, 0, 0, NULL, 1}, {-1, 0, 0, 0, 0, NULL, 1}, {-1, 0, 0, 0, 0, NULL, 1}}, @@ -4849,8 +4849,8 @@ static SpecialType spd[] = { "a non-shield spell", {{ATTACK_WEATHER,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_WEATHER,0,1}, {ATTACK_ENERGY,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_ENERGY,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "unleashes a mighty lightning strike", "killing ", ""}, // SPECIAL_MINDBLAST {"mindblast", "a mindblast", @@ -4863,9 +4863,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_SPIRIT,2,125,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "blasts the minds of the enemy", "killing ", " troops"}, // SPECIAL_EARTHQUAKE {"earthquake", "an earthquake", @@ -4878,9 +4878,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_WEATHER,2,30,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_WEATHER,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "invokes a mighty Earthquake", "killing ", ""}, // SPECIAL_FORCE_SHIELD {"force_shield", "a force shield", @@ -4892,10 +4892,10 @@ static SpecialType spd[] = { {ATTACK_RANGED, -1, -1, -1}, {{ATTACK_COMBAT, 1}, {-1, 0}, {-1, 0}, {-1, 0}}, "Force Shield", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // SPECIAL_ENERGY_SHIELD {"energy_shield", "an energy shield", @@ -4907,10 +4907,10 @@ static SpecialType spd[] = { {ATTACK_ENERGY, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "Energy Shield", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // SPECIAL_SPIRIT_SHIELD {"shield_spirit", "a spirit shield", @@ -4922,10 +4922,10 @@ static SpecialType spd[] = { {ATTACK_SPIRIT, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "Spirit Shield", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // SPECIAL_DISPEL_ILLUSIONS {"dispel_illusion", "dispel illusion", @@ -4938,9 +4938,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{NUM_ATTACK_TYPES,2,50,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_ENERGY,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts Dispel Illusions", "dispelling ", " illusions"}, // SPECIAL_SUMMON_STORM {"storm", "summon storm", @@ -4952,7 +4952,7 @@ static SpecialType spd[] = { {-1, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", - {{ATTACK_WEATHER,2,50,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_WEATHER,"storm",1}, + {{ATTACK_WEATHER,2,50,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_WEATHER,"storm",0}, {-1, 0, 0, 0, 0, NULL, 1}, {-1, 0, 0, 0, 0, NULL, 1}, {-1, 0, 0, 0, 0, NULL, 1}}, @@ -4968,9 +4968,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_WEATHER,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_WEATHER, 0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "summons a wild tornado", "killing ", ""}, // SPECIAL_CLEAR_SKIES {"clear_skies", "clear skies", @@ -4982,10 +4982,10 @@ static SpecialType spd[] = { {ATTACK_WEATHER, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "Clear Skies", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // SPECIAL_BLACK_WIND, {"black_wind", "a black wind", @@ -4998,9 +4998,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_SPIRIT,2,65,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "summons the black wind", "killing ", ""}, // SPECIAL_BANISH_UNDEAD, {"banish_undead", "banish undead", @@ -5013,9 +5013,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{NUM_ATTACK_TYPES,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_ENERGY,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts Banish Undead", "banishing ", " undead"}, // SPECIAL_BANISH_DEMONS, {"banish_demon", "banish demons", @@ -5028,9 +5028,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{NUM_ATTACK_TYPES,2,25,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts Banish Demons", "banishing ", " demons"}, // SPECIAL_FIREBREATH, {"firebreath", "fiery breath", @@ -5043,9 +5043,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_ENERGY,2,5,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_ENERGY,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "breathes Fire", "killing ", ""}, // SPECIAL_ICEBREATH, {"icebreath", "icy breath", @@ -5058,9 +5058,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", {{ATTACK_SPIRIT,2,5,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "breathes Ice", "killing ", ""}, // SPECIAL_CAMEL_FEAR {"spook_horses", "terrify horses", @@ -5072,7 +5072,7 @@ static SpecialType spd[] = { {-1, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield spell", - {{ATTACK_RIDING,1,0,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT,"spook",1}, + {{ATTACK_RIDING,1,0,WeaponType::ALWAYSREADY|WeaponType::RANGED,MAGIC_SPIRIT,"spook",0}, {-1, 0, 0, 0, 0, NULL, 1}, {-1, 0, 0, 0, 0, NULL, 1}, {-1, 0, 0, 0, 0, NULL, 1}}, @@ -5087,10 +5087,10 @@ static SpecialType spd[] = { {NUM_ATTACK_TYPES, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "invulnerability", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // Actual physical shields {"physical_shield", "a physical shield", @@ -5102,10 +5102,10 @@ static SpecialType spd[] = { {ATTACK_RANGED, -1, -1, -1}, {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "Physical Shield", - {{-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {{-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "casts something that is not a spell", "annoying ", ""}, // SPECIAL_CATAPULT_STRIKE, @@ -5119,9 +5119,9 @@ static SpecialType spd[] = { {{-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}}, "a non-shield attack", {{ATTACK_RANGED,1,4,WeaponType::ALWAYSREADY|WeaponType::RANGED,ARMORPIERCING,0,1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}, - {-1, 0, 0, 0, 0, 0, 1}}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}, + {-1, 0, 0, 0, 0, 0, 0}}, "strikes", "killing ", ""}, }; diff --git a/genrules.cpp b/genrules.cpp index d0d491fb..0699a79c 100644 --- a/genrules.cpp +++ b/genrules.cpp @@ -5209,7 +5209,7 @@ int Game::GenRules(const AString &rules, const AString &css, const AString &intr f << enclose("p", true) << "After that, Stephen Baillie took over the code and maintained it until " << "the v5.2.3-v5.2.5 time frame.\n" << enclose("p", false); - f << enclose("p", true) << "Artem Trytiak took over the code maintainence at that point and has maintained it " + f << enclose("p", true) << "Artem Trytiak took over the code maintenance at that point and has maintained it " << "since along with a number of other contrubutors to the github project.\n" << enclose("p", false); f << enclose("p", true) << "The Atlantis source code is now hosted on github at the " diff --git a/havilah/rules.cpp b/havilah/rules.cpp index 8292ecdd..0ea36e36 100644 --- a/havilah/rules.cpp +++ b/havilah/rules.cpp @@ -78,7 +78,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 20, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */ diff --git a/kingdoms/rules.cpp b/kingdoms/rules.cpp index b52b6161..a84ae38d 100644 --- a/kingdoms/rules.cpp +++ b/kingdoms/rules.cpp @@ -77,7 +77,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 20, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */ diff --git a/monthorders.cpp b/monthorders.cpp index ee28c661..3a8537a6 100644 --- a/monthorders.cpp +++ b/monthorders.cpp @@ -582,7 +582,7 @@ void Game::Run1BuildOrder(ARegion *r, Object *obj, Unit *u) string job; if (needed < 1) { // This looks wrong, but isn't. - // If a building has a maxMaintainence of 75 and the road is at + // If a building has a maxMaintenance of 75 and the road is at // -70 (ie, 5 from max) then we want the value of maintMax to be // 5 here. Then we divide by maintFactor (some things are easier // to refix than others) to get how many items we need to fix it. @@ -1564,7 +1564,7 @@ void Game::Do1StudyOrder(Unit *u,Object *obj) if (taughtdays) { str += " and was taught for " + to_string(taughtdays) + " days"; } - str += "."; + str += " at a cost of " + ItemString(I_SILVER, cost) + "."; u->event(str, "study"); // study to level order if (o->level != -1) { diff --git a/neworigins/rules.cpp b/neworigins/rules.cpp index 40ed889b..ebf3da9c 100644 --- a/neworigins/rules.cpp +++ b/neworigins/rules.cpp @@ -78,7 +78,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 50, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */ diff --git a/object.cpp b/object.cpp index 240f60c7..d95ac267 100644 --- a/object.cpp +++ b/object.cpp @@ -339,7 +339,7 @@ void Object::build_json_report(json& j, Faction *fac, int obs, int truesight, if (incomplete > (0 - ob.maxMonthlyDecay)) { container["decaying"] = true; } else if (incomplete > (0 - ob.maxMaintenance/2)) { - container["needs_maintainence"] = true; + container["needs_maintenance"] = true; } } } diff --git a/runorders.cpp b/runorders.cpp index 3be4e80d..fb127967 100644 --- a/runorders.cpp +++ b/runorders.cpp @@ -1731,31 +1731,30 @@ void Game::CheckUnitMaintenanceItem(int item, int value, int consume) Object *obj = (Object *) elem; forlist((&obj->units)) { Unit *u = (Unit *) elem; - if (u->needed > 0 && ((!consume) || - (u->GetFlag(FLAG_CONSUMING_UNIT) || - u->GetFlag(FLAG_CONSUMING_FACTION)))) { + if (u->needed > 0 && + ((!consume) || (u->GetFlag(FLAG_CONSUMING_UNIT) || u->GetFlag(FLAG_CONSUMING_FACTION)))) { int amount = u->items.GetNum(item); if (amount) { int eat = (u->needed + value - 1) / value; - if (eat > amount) - eat = amount; + if (eat > amount) eat = amount; if (ItemDefs[item].type & IT_FOOD) { - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - eat * value > u->stomach_space) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && eat * value > u->stomach_space) { eat = (u->stomach_space + value - 1) / value; - if (eat < 0) - eat = 0; + if (eat < 0) eat = 0; } u->hunger -= eat * value; u->stomach_space -= eat * value; - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - u->stomach_space < 0) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && u->stomach_space < 0) { u->needed -= u->stomach_space; u->stomach_space = 0; } } - u->needed -= eat * value; - u->items.SetNum(item, amount - eat); + if (eat) { + u->needed -= eat * value; + u->items.SetNum(item, amount - eat); + + u->event("Consumes " + ItemString(item, eat) + " for maintenance.", "maintenance"); + } } } } @@ -1771,8 +1770,7 @@ void Game::CheckFactionMaintenanceItem(int item, int value, int consume) Object *obj = (Object *) elem; forlist((&obj->units)) { Unit *u = (Unit *) elem; - if (u->needed > 0 && ((!consume) || - u->GetFlag(FLAG_CONSUMING_FACTION))) { + if (u->needed > 0 && ((!consume) || u->GetFlag(FLAG_CONSUMING_FACTION))) { /* Go through all units again */ forlist((&r->objects)) { Object *obj2 = (Object *) elem; @@ -1783,25 +1781,28 @@ void Game::CheckFactionMaintenanceItem(int item, int value, int consume) int amount = u2->items.GetNum(item); if (amount) { int eat = (u->needed + value - 1) / value; - if (eat > amount) - eat = amount; + if (eat > amount) eat = amount; if (ItemDefs[item].type & IT_FOOD) { - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - eat * value > u->stomach_space) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && eat * value > u->stomach_space) { eat = (u->stomach_space + value - 1) / value; - if (eat < 0) - eat = 0; + if (eat < 0) eat = 0; } u->hunger -= eat * value; u->stomach_space -= eat * value; - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - u->stomach_space < 0) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && u->stomach_space < 0) { u->needed -= u->stomach_space; u->stomach_space = 0; } } - u->needed -= eat * value; - u2->items.SetNum(item, amount - eat); + if (eat) { + u->needed -= eat * value; + u2->items.SetNum(item, amount - eat); + + u->event("Borrows " + ItemString(item, eat) + " from " + u2->name->const_str() + + " for maintenance.", "maintenance"); + u2->event(string(u->name->const_str()) + " borrows " + ItemString(item, eat) + + " for maintenance.", "maintenance"); + } } } } @@ -1828,24 +1829,19 @@ void Game::CheckAllyMaintenanceItem(int item, int value) Object *obj2 = (Object *) elem; forlist((&obj2->units)) { Unit *u2 = (Unit *) elem; - if (u->faction != u2->faction && - u2->GetAttitude(r, u) == A_ALLY) { + if (u->faction != u2->faction && u2->GetAttitude(r, u) == A_ALLY) { int amount = u2->items.GetNum(item); if (amount) { int eat = (u->needed + value - 1) / value; - if (eat > amount) - eat = amount; + if (eat > amount) eat = amount; if (ItemDefs[item].type & IT_FOOD) { - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - eat * value > u->stomach_space) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && eat * value > u->stomach_space) { eat = (u->stomach_space + value - 1) / value; - if (eat < 0) - eat = 0; + if (eat < 0) eat = 0; } u->hunger -= eat * value; u->stomach_space -= eat * value; - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - u->stomach_space < 0) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && u->stomach_space < 0) { u->needed -= u->stomach_space; u->stomach_space = 0; } @@ -1854,10 +1850,9 @@ void Game::CheckAllyMaintenanceItem(int item, int value) u->needed -= eat * value; u2->items.SetNum(item, amount - eat); u2->event(string(u->name->const_str()) + " borrows " + - ItemString(item, eat) + " for maintenance.", "maintainence"); + ItemString(item, eat) + " for maintenance.", "maintenance"); u->event("Borrows " + ItemString(item, eat) + " from " + - u2->name->const_str() + " for maintenance.", "maintainence"); - u2->items.SetNum(item, amount - eat); + u2->name->const_str() + " for maintenance.", "maintenance"); } } } @@ -1883,17 +1878,18 @@ void Game::CheckUnitHungerItem(int item, int value) int amount = u->items.GetNum(item); if (amount) { int eat = (u->hunger + value - 1) / value; - if (eat > amount) - eat = amount; + if (eat > amount) eat = amount; u->hunger -= eat * value; u->stomach_space -= eat * value; u->needed -= eat * value; - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - u->stomach_space < 0) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && u->stomach_space < 0) { u->needed -= u->stomach_space; u->stomach_space = 0; } - u->items.SetNum(item, amount - eat); + if(eat) { + u->items.SetNum(item, amount - eat); + u->event("Consumes " + ItemString(item, eat) + " to fend off starvation.", "maintenance"); + } } } } @@ -1920,17 +1916,21 @@ void Game::CheckFactionHungerItem(int item, int value) int amount = u2->items.GetNum(item); if (amount) { int eat = (u->hunger + value - 1) / value; - if (eat > amount) - eat = amount; + if (eat > amount) eat = amount; u->hunger -= eat * value; u->stomach_space -= eat * value; u->needed -= eat * value; - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - u->stomach_space < 0) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && u->stomach_space < 0) { u->needed -= u->stomach_space; u->stomach_space = 0; } - u2->items.SetNum(item, amount - eat); + if (eat) { + u2->items.SetNum(item, amount - eat); + u->event("Borrows " + ItemString(item, eat) + " from " + u2->name->const_str() + + " to fend off starvation.", "maintenance"); + u2->event(string(u->name->const_str()) + " borrows " + ItemString(item, eat) + + " to fend off starvation.", "maintenance"); + } } } } @@ -1962,22 +1962,21 @@ void Game::CheckAllyHungerItem(int item, int value) int amount = u2->items.GetNum(item); if (amount) { int eat = (u->hunger + value - 1) / value; - if (eat > amount) - eat = amount; + if (eat > amount) eat = amount; u->hunger -= eat * value; u->stomach_space -= eat * value; u->needed -= eat * value; - if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && - u->stomach_space < 0) { + if (Globals->UPKEEP_MAXIMUM_FOOD >= 0 && u->stomach_space < 0) { u->needed -= u->stomach_space; u->stomach_space = 0; } - u2->items.SetNum(item, amount - eat); + if (eat) { + u2->items.SetNum(item, amount - eat); u2->event(string(u->name->const_str()) + " borrows " + - ItemString(item, eat) + " to fend off starvation.", "maintainence"); + ItemString(item, eat) + " to fend off starvation.", "maintenance"); u->event("Borrows " + ItemString(item, eat) + " from " + - u2->name->const_str() + " to fend off starvation.", "maintainence"); - u2->items.SetNum(item, amount - eat); + u2->name->const_str() + " to fend off starvation.", "maintenance"); + } } } } @@ -2027,11 +2026,12 @@ void Game::AssessMaintenance() for (int j = 0; j < NITEMS; j++) { if (ItemDefs[j].flags & ItemType::DISABLED) continue; if (ItemDefs[j].type & IT_FOOD) { - if (i == -1 || - ItemDefs[i].baseprice > ItemDefs[j].baseprice) + if (i == -1 || ItemDefs[i].baseprice > ItemDefs[j].baseprice) { i = j; + } } } + if (i > 0) { cost = ItemDefs[i].baseprice * 5 / 2; forlist((®ions)) { @@ -2045,14 +2045,14 @@ void Game::AssessMaintenance() int eat = (u->hunger + value - 1) / value; /* Now see if faction has money */ if (u->faction->unclaimed >= eat * cost) { - u->event("Withdraws " + ItemString(i, eat) + " for maintenance.", "maintainence"); + u->event("Withdraws " + ItemString(i, eat) + " for maintenance.", "maintenance"); u->faction->unclaimed -= eat * cost; u->hunger -= eat * value; u->stomach_space -= eat * value; u->needed -= eat * value; } else { int amount = u->faction->unclaimed / cost; - u->event("Withdraws " + ItemString(i, amount) + " for maintenance.", "maintainence"); + u->event("Withdraws " + ItemString(i, amount) + " for maintenance.", "maintenance"); u->faction->unclaimed -= amount * cost; u->hunger -= amount * value; u->stomach_space -= amount * value; @@ -2110,12 +2110,12 @@ void Game::AssessMaintenance() if (u->needed > 0 && u->faction->unclaimed) { /* Now see if faction has money */ if (u->faction->unclaimed >= u->needed) { - u->event("Claims " + to_string(u->needed) + " silver for maintenance.", "maintainence"); + u->event("Claims " + to_string(u->needed) + " silver for maintenance.", "maintenance"); u->faction->unclaimed -= u->needed; u->needed = 0; } else { - u->event("Claims " + to_string(u->faction->unclaimed) + - " silver for maintenance.", "maintainence"); + u->event("Claims " + to_string(u->faction->unclaimed) + " silver for maintenance.", + "maintenance"); u->needed -= u->faction->unclaimed; u->faction->unclaimed = 0; } diff --git a/snapshot-tests/neworigins_turns/turn_0/report.1 b/snapshot-tests/neworigins_turns/turn_0/report.1 index 1c654efe..2ff3e3d9 100644 --- a/snapshot-tests/neworigins_turns/turn_0/report.1 +++ b/snapshot-tests/neworigins_turns/turn_0/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_1/report.1 b/snapshot-tests/neworigins_turns/turn_1/report.1 index 2b9006d2..a424fa2e 100644 --- a/snapshot-tests/neworigins_turns/turn_1/report.1 +++ b/snapshot-tests/neworigins_turns/turn_1/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_1/report.3 b/snapshot-tests/neworigins_turns/turn_1/report.3 index 43ccb7cc..b6328cf8 100644 --- a/snapshot-tests/neworigins_turns/turn_1/report.3 +++ b/snapshot-tests/neworigins_turns/turn_1/report.3 @@ -21,10 +21,11 @@ Apprentices: 0 (3) Events during turn: Unit (38): Claims $100. -Unit (38): Studies stealth. +Unit (38): Studies stealth at a cost of 50 silver [SILV]. Unit (38): Casts Random Gate Jump. Capacity: 10/15. Unit (38): Jumps through a Gate to jungle (3,5) in Kleptoatres Jungle. Unit (38): Gets 5 days of practice with pattern [PATT]. +Unit (38): Consumes 50 silver [SILV] for maintenance. Skill reports: diff --git a/snapshot-tests/neworigins_turns/turn_10/report.1 b/snapshot-tests/neworigins_turns/turn_10/report.1 index f458090f..b3a6764c 100644 --- a/snapshot-tests/neworigins_turns/turn_10/report.1 +++ b/snapshot-tests/neworigins_turns/turn_10/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_10/report.3 b/snapshot-tests/neworigins_turns/turn_10/report.3 index c6e93822..47b67bf8 100644 --- a/snapshot-tests/neworigins_turns/turn_10/report.3 +++ b/snapshot-tests/neworigins_turns/turn_10/report.3 @@ -53,11 +53,19 @@ Unit (63): Walks from swamp (13,3) in Philagotuspolisus Marshes to forest (14,2) in Philagotuspolisus Woods. Unit (62): Walks from plain (14,4) in Maranarenos Dale to swamp (15,5) in Aoratalotos Swamp. -Unit (38): Studies force. +Unit (38): Studies force at a cost of 100 silver [SILV]. Unit (38): Completes study to level 2 in force. Unit (38): Casts Random Gate Jump. Capacity: 10/15. Unit (38): Jumps through a Gate to jungle (3,5) in Kleptoatres Jungle. Unit (38): Gets 5 days of practice with pattern [PATT]. +Unit (51): Consumes 80 silver [SILV] for maintenance. +Unit (52): Consumes 31 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 90 silver [SILV] for maintenance. +Unit (61): Consumes 90 silver [SILV] for maintenance. +Unit (38): Consumes 50 silver [SILV] for maintenance. +Unit (52): Borrows 19 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (52) borrows 19 silver [SILV] for maintenance. Unit (5): Claims 10 silver for maintenance. Unit (63): Claims 10 silver for maintenance. Unit (64): Claims 10 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_11/report.1 b/snapshot-tests/neworigins_turns/turn_11/report.1 index 125c7987..ddcc7496 100644 --- a/snapshot-tests/neworigins_turns/turn_11/report.1 +++ b/snapshot-tests/neworigins_turns/turn_11/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_11/report.3 b/snapshot-tests/neworigins_turns/turn_11/report.3 index 23592a47..37d9bb42 100644 --- a/snapshot-tests/neworigins_turns/turn_11/report.3 +++ b/snapshot-tests/neworigins_turns/turn_11/report.3 @@ -67,11 +67,19 @@ Unit (62): Walks from swamp (15,5) in Aoratalotos Swamp to swamp (0,4) in Aoratalotos Swamp. Unit (5): Earns 11 silver working in swamp (14,0) in Nema River. Unit (51): Unit (51) shares 10 silver [SILV] with Unit (52). -Unit (52): Studies longbow. -Unit (38): Studies pattern. +Unit (52): Studies longbow at a cost of 10 silver [SILV]. +Unit (38): Studies pattern at a cost of 100 silver [SILV]. Unit (38): Casts Random Gate Jump. Capacity: 10/15. Unit (38): Jumps through a Gate to jungle (3,5) in Kleptoatres Jungle. Unit (38): Gets 5 days of practice with pattern [PATT]. +Unit (5): Consumes 10 silver [SILV] for maintenance. +Unit (51): Consumes 80 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 90 silver [SILV] for maintenance. +Unit (61): Consumes 90 silver [SILV] for maintenance. +Unit (38): Consumes 50 silver [SILV] for maintenance. +Unit (52): Borrows 50 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (52) borrows 50 silver [SILV] for maintenance. Unit (65): Claims 10 silver for maintenance. Unit (67): Claims 10 silver for maintenance. Unit (62): Claims 10 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_12/report.1 b/snapshot-tests/neworigins_turns/turn_12/report.1 index 4b019baf..e02b15bf 100644 --- a/snapshot-tests/neworigins_turns/turn_12/report.1 +++ b/snapshot-tests/neworigins_turns/turn_12/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_12/report.3 b/snapshot-tests/neworigins_turns/turn_12/report.3 index 7b4c596e..52a3d2fb 100644 --- a/snapshot-tests/neworigins_turns/turn_12/report.3 +++ b/snapshot-tests/neworigins_turns/turn_12/report.3 @@ -94,14 +94,14 @@ Unit (65): Earns 13 silver working in forest (14,2) in Unit (67): Earns 12 silver working in forest (3,3) in Aoratalotos Forest. Unit (51): Unit (51) shares 10 silver [SILV] with Unit (52). -Unit (52): Studies longbow. +Unit (52): Studies longbow at a cost of 10 silver [SILV]. Unit (62): Earns 11 silver working in swamp (0,4) in Aoratalotos Swamp. Unit (70): Earns 12 silver working in swamp (2,4) in Dogmoeryx Marshes. Unit (63): Earns 12 silver working in plain (14,4) in Maranarenos Dale. -Unit (38): Studies pattern. +Unit (38): Studies pattern at a cost of 100 silver [SILV]. Unit (38): Completes study to level 2 in pattern. Unit (69): Earns 12 silver working in swamp (2,6) in Dogmoeryx Marshes. @@ -110,6 +110,21 @@ Unit (68): Earns 11 silver working in swamp (3,7) in Dogmoeryx Unit (38): Casts Random Gate Jump. Capacity: 10/15. Unit (38): Jumps through a Gate to jungle (3,5) in Kleptoatres Jungle. Unit (38): Gets 5 days of practice with spirit [SPIR]. +Unit (5): Consumes 10 silver [SILV] for maintenance. +Unit (65): Consumes 10 silver [SILV] for maintenance. +Unit (67): Consumes 10 silver [SILV] for maintenance. +Unit (51): Consumes 80 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 90 silver [SILV] for maintenance. +Unit (61): Consumes 90 silver [SILV] for maintenance. +Unit (62): Consumes 10 silver [SILV] for maintenance. +Unit (70): Consumes 10 silver [SILV] for maintenance. +Unit (63): Consumes 10 silver [SILV] for maintenance. +Unit (38): Consumes 50 silver [SILV] for maintenance. +Unit (69): Consumes 10 silver [SILV] for maintenance. +Unit (68): Consumes 10 silver [SILV] for maintenance. +Unit (52): Borrows 50 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (52) borrows 50 silver [SILV] for maintenance. Unit (71): Claims 10 silver for maintenance. Unit (74): Claims 10 silver for maintenance. Unit (73): Claims 10 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_13/report.1 b/snapshot-tests/neworigins_turns/turn_13/report.1 index f3c89c35..24abf9b7 100644 --- a/snapshot-tests/neworigins_turns/turn_13/report.1 +++ b/snapshot-tests/neworigins_turns/turn_13/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_13/report.3 b/snapshot-tests/neworigins_turns/turn_13/report.3 index e0b78912..0c3a5874 100644 --- a/snapshot-tests/neworigins_turns/turn_13/report.3 +++ b/snapshot-tests/neworigins_turns/turn_13/report.3 @@ -145,7 +145,7 @@ Unit (77): Earns 13 silver working in forest (1,3) in Aoratalotos Unit (67): Earns 12 silver working in forest (3,3) in Aoratalotos Forest. Unit (51): Unit (51) shares 10 silver [SILV] with Unit (52). -Unit (52): Studies longbow. +Unit (52): Studies longbow at a cost of 10 silver [SILV]. Unit (62): Earns 11 silver working in swamp (0,4) in Aoratalotos Swamp. Unit (70): Earns 12 silver working in swamp (2,4) in Dogmoeryx @@ -154,7 +154,7 @@ Unit (63): Earns 12 silver working in plain (14,4) in Maranarenos Dale. Unit (78): Earns 11 silver working in jungle (1,5) in Aoratalotos Jungle. -Unit (38): Studies spirit. +Unit (38): Studies spirit at a cost of 100 silver [SILV]. Unit (66): Earns 11 silver working in swamp (15,5) in Aoratalotos Swamp. Unit (69): Earns 12 silver working in swamp (2,6) in Dogmoeryx @@ -166,6 +166,31 @@ Unit (64): Earns 12 silver working in jungle (15,7) in Heteraskalos Unit (80): Earns 12 silver working in swamp (4,8) in Dogmoeryx Marshes. Unit (93): Earns 13 silver working in desert (3,9) in Dunham Sands. +Unit (5): Consumes 10 silver [SILV] for maintenance. +Unit (71): Consumes 10 silver [SILV] for maintenance. +Unit (85): Consumes 10 silver [SILV] for maintenance. +Unit (73): Consumes 10 silver [SILV] for maintenance. +Unit (72): Consumes 10 silver [SILV] for maintenance. +Unit (65): Consumes 10 silver [SILV] for maintenance. +Unit (77): Consumes 10 silver [SILV] for maintenance. +Unit (67): Consumes 10 silver [SILV] for maintenance. +Unit (51): Consumes 80 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 90 silver [SILV] for maintenance. +Unit (61): Consumes 90 silver [SILV] for maintenance. +Unit (62): Consumes 10 silver [SILV] for maintenance. +Unit (70): Consumes 10 silver [SILV] for maintenance. +Unit (63): Consumes 10 silver [SILV] for maintenance. +Unit (78): Consumes 10 silver [SILV] for maintenance. +Unit (38): Consumes 50 silver [SILV] for maintenance. +Unit (66): Consumes 10 silver [SILV] for maintenance. +Unit (69): Consumes 10 silver [SILV] for maintenance. +Unit (68): Consumes 10 silver [SILV] for maintenance. +Unit (64): Consumes 10 silver [SILV] for maintenance. +Unit (80): Consumes 10 silver [SILV] for maintenance. +Unit (93): Consumes 10 silver [SILV] for maintenance. +Unit (52): Borrows 50 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (52) borrows 50 silver [SILV] for maintenance. Unit (84): Claims 10 silver for maintenance. Unit (86): Claims 10 silver for maintenance. Unit (87): Claims 10 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_2/report.1 b/snapshot-tests/neworigins_turns/turn_2/report.1 index 90794c6e..879ecf60 100644 --- a/snapshot-tests/neworigins_turns/turn_2/report.1 +++ b/snapshot-tests/neworigins_turns/turn_2/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_2/report.3 b/snapshot-tests/neworigins_turns/turn_2/report.3 index e20678ad..d5e240cf 100644 --- a/snapshot-tests/neworigins_turns/turn_2/report.3 +++ b/snapshot-tests/neworigins_turns/turn_2/report.3 @@ -21,11 +21,12 @@ Apprentices: 0 (3) Events during turn: Unit (38): Claims $100. -Unit (38): Studies stealth. +Unit (38): Studies stealth at a cost of 50 silver [SILV]. Unit (38): Casts Random Gate Jump. Capacity: 10/15. Unit (38): Jumps through a Gate to swamp (13,3) in Philagotuspolisus Marshes, contains Hymnoalotos [village]. Unit (38): Gets 5 days of practice with pattern [PATT]. +Unit (38): Consumes 50 silver [SILV] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/snapshot-tests/neworigins_turns/turn_3/report.1 b/snapshot-tests/neworigins_turns/turn_3/report.1 index 697cdcd2..e7b059aa 100644 --- a/snapshot-tests/neworigins_turns/turn_3/report.1 +++ b/snapshot-tests/neworigins_turns/turn_3/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_3/report.3 b/snapshot-tests/neworigins_turns/turn_3/report.3 index 9f72f6f5..c5022f9d 100644 --- a/snapshot-tests/neworigins_turns/turn_3/report.3 +++ b/snapshot-tests/neworigins_turns/turn_3/report.3 @@ -32,9 +32,13 @@ Unit (51): Withdraws 10 swords [SWOR]. Unit (38): Teaches combat to Unit (51). Unit (38): Gets 5 days of practice with combat [COMB]. Unit (38): Unit (38) shares 100 silver [SILV] with Unit (51). -Unit (51): Studies combat and was taught for 30 days. +Unit (51): Studies combat and was taught for 30 days at a cost of 100 + silver [SILV]. Unit (38): Unit (38) shares 200 silver [SILV] with Unit (52). -Unit (52): Studies tactics. +Unit (52): Studies tactics at a cost of 200 silver [SILV]. +Unit (38): Consumes 50 silver [SILV] for maintenance. +Unit (51): Borrows 72 silver [SILV] from Unit (38) for maintenance. +Unit (38): Unit (51) borrows 72 silver [SILV] for maintenance. Unit (51): Claims 28 silver for maintenance. Unit (52): Claims 50 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_4/report.1 b/snapshot-tests/neworigins_turns/turn_4/report.1 index 2d403478..a33e76db 100644 --- a/snapshot-tests/neworigins_turns/turn_4/report.1 +++ b/snapshot-tests/neworigins_turns/turn_4/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_4/report.3 b/snapshot-tests/neworigins_turns/turn_4/report.3 index 491bf910..eddb0e85 100644 --- a/snapshot-tests/neworigins_turns/turn_4/report.3 +++ b/snapshot-tests/neworigins_turns/turn_4/report.3 @@ -31,10 +31,11 @@ Unit (52): Withdraws longbow [LBOW]. Unit (57): Withdraws 10 swords [SWOR]. Unit (38): Teaches combat to Unit (57). Unit (38): Gets 5 days of practice with combat [COMB]. -Unit (51): Studies combat. +Unit (51): Studies combat at a cost of 100 silver [SILV]. Unit (51): Completes study to level 2 in combat. -Unit (52): Studies longbow. -Unit (57): Studies combat and was taught for 30 days. +Unit (52): Studies longbow at a cost of 10 silver [SILV]. +Unit (57): Studies combat and was taught for 30 days at a cost of 100 + silver [SILV]. Unit (38): Claims 50 silver for maintenance. Unit (51): Claims 100 silver for maintenance. Unit (52): Claims 50 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_5/report.1 b/snapshot-tests/neworigins_turns/turn_5/report.1 index 208bcb5c..389069ec 100644 --- a/snapshot-tests/neworigins_turns/turn_5/report.1 +++ b/snapshot-tests/neworigins_turns/turn_5/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_5/report.3 b/snapshot-tests/neworigins_turns/turn_5/report.3 index be0167d3..21c0468e 100644 --- a/snapshot-tests/neworigins_turns/turn_5/report.3 +++ b/snapshot-tests/neworigins_turns/turn_5/report.3 @@ -29,13 +29,18 @@ Unit (60): Buys 10 gnolls [GNOL] at $39 each. Unit (60): Withdraws 10 swords [SWOR]. Unit (38): Teaches combat to Unit (60). Unit (38): Gets 5 days of practice with combat [COMB]. -Unit (57): Studies combat. +Unit (57): Studies combat at a cost of 100 silver [SILV]. Unit (57): Completes study to level 2 in combat. -Unit (60): Studies combat and was taught for 30 days. +Unit (60): Studies combat and was taught for 30 days at a cost of 100 + silver [SILV]. Unit (51): Earns 123 silver working in swamp (13,3) in Philagotuspolisus Marshes. Unit (52): Earns 12 silver working in swamp (13,3) in Philagotuspolisus Marshes. +Unit (51): Consumes 100 silver [SILV] for maintenance. +Unit (52): Consumes 12 silver [SILV] for maintenance. +Unit (38): Borrows 23 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (38) borrows 23 silver [SILV] for maintenance. Unit (38): Claims 27 silver for maintenance. Unit (52): Claims 38 silver for maintenance. Unit (57): Claims 100 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_6/report.1 b/snapshot-tests/neworigins_turns/turn_6/report.1 index dbf132ea..37f1a5ec 100644 --- a/snapshot-tests/neworigins_turns/turn_6/report.1 +++ b/snapshot-tests/neworigins_turns/turn_6/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_6/report.3 b/snapshot-tests/neworigins_turns/turn_6/report.3 index 06d7a33f..0c861862 100644 --- a/snapshot-tests/neworigins_turns/turn_6/report.3 +++ b/snapshot-tests/neworigins_turns/turn_6/report.3 @@ -30,15 +30,23 @@ Unit (61): Buys 10 gnolls [GNOL] at $39 each. Unit (61): Withdraws 10 swords [SWOR]. Unit (38): Teaches combat to Unit (61). Unit (38): Gets 5 days of practice with combat [COMB]. -Unit (60): Studies combat. +Unit (60): Studies combat at a cost of 100 silver [SILV]. Unit (60): Completes study to level 2 in combat. -Unit (61): Studies combat and was taught for 30 days. +Unit (61): Studies combat and was taught for 30 days at a cost of 100 + silver [SILV]. Unit (51): Earns 123 silver working in swamp (13,3) in Philagotuspolisus Marshes. Unit (52): Earns 12 silver working in swamp (13,3) in Philagotuspolisus Marshes. Unit (57): Earns 123 silver working in swamp (13,3) in Philagotuspolisus Marshes. +Unit (51): Consumes 100 silver [SILV] for maintenance. +Unit (52): Consumes 12 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (38): Borrows 23 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (38) borrows 23 silver [SILV] for maintenance. +Unit (38): Borrows 23 silver [SILV] from Unit (57) for maintenance. +Unit (57): Unit (38) borrows 23 silver [SILV] for maintenance. Unit (38): Claims 4 silver for maintenance. Unit (52): Claims 38 silver for maintenance. Unit (60): Claims 100 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_7/report.1 b/snapshot-tests/neworigins_turns/turn_7/report.1 index 481d6eef..c13b8f93 100644 --- a/snapshot-tests/neworigins_turns/turn_7/report.1 +++ b/snapshot-tests/neworigins_turns/turn_7/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_7/report.3 b/snapshot-tests/neworigins_turns/turn_7/report.3 index f26c45d5..ad354631 100644 --- a/snapshot-tests/neworigins_turns/turn_7/report.3 +++ b/snapshot-tests/neworigins_turns/turn_7/report.3 @@ -25,8 +25,8 @@ Apprentices: 0 (3) Events during turn: Unit (38): Claims $100. Unit (61): Claims $100. -Unit (38): Studies illusion. -Unit (61): Studies combat. +Unit (38): Studies illusion at a cost of 100 silver [SILV]. +Unit (61): Studies combat at a cost of 100 silver [SILV]. Unit (61): Completes study to level 2 in combat. Unit (51): Earns 123 silver working in swamp (13,3) in Philagotuspolisus Marshes. @@ -36,6 +36,18 @@ Unit (57): Earns 123 silver working in swamp (13,3) in Philagotuspolisus Marshes. Unit (60): Earns 123 silver working in swamp (13,3) in Philagotuspolisus Marshes. +Unit (51): Consumes 100 silver [SILV] for maintenance. +Unit (52): Consumes 12 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 100 silver [SILV] for maintenance. +Unit (38): Borrows 23 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (38) borrows 23 silver [SILV] for maintenance. +Unit (38): Borrows 23 silver [SILV] from Unit (57) for maintenance. +Unit (57): Unit (38) borrows 23 silver [SILV] for maintenance. +Unit (38): Borrows 4 silver [SILV] from Unit (60) for maintenance. +Unit (60): Unit (38) borrows 4 silver [SILV] for maintenance. +Unit (52): Borrows 19 silver [SILV] from Unit (60) for maintenance. +Unit (60): Unit (52) borrows 19 silver [SILV] for maintenance. Unit (52): Claims 19 silver for maintenance. Unit (61): Claims 100 silver for maintenance. diff --git a/snapshot-tests/neworigins_turns/turn_8/report.1 b/snapshot-tests/neworigins_turns/turn_8/report.1 index 1e84c56d..28da9863 100644 --- a/snapshot-tests/neworigins_turns/turn_8/report.1 +++ b/snapshot-tests/neworigins_turns/turn_8/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_8/report.3 b/snapshot-tests/neworigins_turns/turn_8/report.3 index 1a972788..c9d91997 100644 --- a/snapshot-tests/neworigins_turns/turn_8/report.3 +++ b/snapshot-tests/neworigins_turns/turn_8/report.3 @@ -173,7 +173,8 @@ Unit (51): Gets 5 days of practice with combat [COMB]. Unit (57): Gets 5 days of practice with combat [COMB]. Unit (60): Gets 5 days of practice with combat [COMB]. Unit (61): Gets 5 days of practice with combat [COMB]. -Unit (38): Studies phantasmal entertainment. +Unit (38): Studies phantasmal entertainment at a cost of 100 silver + [SILV]. Unit (51): Earns 98 silver working in swamp (13,3) in Philagotuspolisus Marshes. Unit (52): Earns 12 silver working in swamp (13,3) in @@ -184,6 +185,16 @@ Unit (60): Earns 110 silver working in swamp (13,3) in Philagotuspolisus Marshes. Unit (61): Earns 110 silver working in swamp (13,3) in Philagotuspolisus Marshes. +Unit (38): Consumes 26 silver [SILV] for maintenance. +Unit (51): Consumes 80 silver [SILV] for maintenance. +Unit (52): Consumes 38 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 90 silver [SILV] for maintenance. +Unit (61): Consumes 90 silver [SILV] for maintenance. +Unit (38): Borrows 24 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (38) borrows 24 silver [SILV] for maintenance. +Unit (52): Borrows 12 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (52) borrows 12 silver [SILV] for maintenance. Skill reports: diff --git a/snapshot-tests/neworigins_turns/turn_9/report.1 b/snapshot-tests/neworigins_turns/turn_9/report.1 index e9579214..a2ff4513 100644 --- a/snapshot-tests/neworigins_turns/turn_9/report.1 +++ b/snapshot-tests/neworigins_turns/turn_9/report.1 @@ -739,7 +739,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -970,7 +970,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2596,7 +2596,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2983,7 +2983,7 @@ camel [CAME], weight 50, walking capacity 20, riding capacity 20, battle at a skill level of 3. This ability will only target units mounted on horses [HORS]. This ability will not target creatures which are currently affected by spook, or spook. This ability does - between 1 and 0 riding attacks and each attack deals 1 damage. Each + between 1 and 0 riding attacks and each attack deals no damage. Each attack causes the target to be effected by spook (-1 to attack, -1 versus melee attacks, -1 versus riding attacks, -1 versus ranged attacks) for the rest of the battle. @@ -3031,7 +3031,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -3089,17 +3089,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unbelievably - aggressive and will attack player units on sight. This monster has 1 - melee attack per round and takes 1 hit to kill and each attack deals - 1 damage. This monster has a tactics score of 2, a stealth score of - 0, and an observation score of 2. This monster might have advanced - items and silver as treasure. This item cannot be given to other - units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unbelievably aggressive and will attack player units on sight. This + monster has 1 melee attack per round and takes 1 hit to kill and + each attack deals 1 damage. This monster has a tactics score of 2, a + stealth score of 0, and an observation score of 2. This monster + might have advanced items and silver as treasure. This item cannot + be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/neworigins_turns/turn_9/report.3 b/snapshot-tests/neworigins_turns/turn_9/report.3 index 455e3966..6bc57d8a 100644 --- a/snapshot-tests/neworigins_turns/turn_9/report.3 +++ b/snapshot-tests/neworigins_turns/turn_9/report.3 @@ -48,7 +48,16 @@ Unit (62): Walks from swamp (13,3) in Philagotuspolisus Marshes to Unit (5): Walks from swamp (13,3) in Philagotuspolisus Marshes to forest (14,2) in Philagotuspolisus Woods. Unit (51): Unit (51) shares 23 silver [SILV] with Unit (38). -Unit (38): Studies force. +Unit (38): Studies force at a cost of 100 silver [SILV]. +Unit (51): Consumes 80 silver [SILV] for maintenance. +Unit (52): Consumes 31 silver [SILV] for maintenance. +Unit (57): Consumes 100 silver [SILV] for maintenance. +Unit (60): Consumes 90 silver [SILV] for maintenance. +Unit (61): Consumes 90 silver [SILV] for maintenance. +Unit (38): Borrows 50 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (38) borrows 50 silver [SILV] for maintenance. +Unit (52): Borrows 19 silver [SILV] from Unit (51) for maintenance. +Unit (51): Unit (52) borrows 19 silver [SILV] for maintenance. Unit (5): Claims 10 silver for maintenance. Unit (62): Claims 10 silver for maintenance. diff --git a/snapshot-tests/rules/basic.html b/snapshot-tests/rules/basic.html index fb86110d..d22679d2 100644 --- a/snapshot-tests/rules/basic.html +++ b/snapshot-tests/rules/basic.html @@ -7109,7 +7109,7 @@
- Artem Trytiak took over the code maintainence at that point and has + Artem Trytiak took over the code maintenance at that point and has maintained it since along with a number of other contrubutors to the github project.
diff --git a/snapshot-tests/rules/fracas.html b/snapshot-tests/rules/fracas.html index 0b8a47f5..ad9cd1f1 100644 --- a/snapshot-tests/rules/fracas.html +++ b/snapshot-tests/rules/fracas.html @@ -7375,7 +7375,7 @@- Artem Trytiak took over the code maintainence at that point and has + Artem Trytiak took over the code maintenance at that point and has maintained it since along with a number of other contrubutors to the github project.
diff --git a/snapshot-tests/rules/havilah.html b/snapshot-tests/rules/havilah.html index b4cc4947..9d8b6bd0 100644 --- a/snapshot-tests/rules/havilah.html +++ b/snapshot-tests/rules/havilah.html @@ -7856,7 +7856,7 @@- Artem Trytiak took over the code maintainence at that point and has + Artem Trytiak took over the code maintenance at that point and has maintained it since along with a number of other contrubutors to the github project.
diff --git a/snapshot-tests/rules/kingdoms.html b/snapshot-tests/rules/kingdoms.html index d1ea15a2..93a98fff 100644 --- a/snapshot-tests/rules/kingdoms.html +++ b/snapshot-tests/rules/kingdoms.html @@ -7919,7 +7919,7 @@- Artem Trytiak took over the code maintainence at that point and has + Artem Trytiak took over the code maintenance at that point and has maintained it since along with a number of other contrubutors to the github project.
diff --git a/snapshot-tests/rules/neworigins.html b/snapshot-tests/rules/neworigins.html index 3b340d3e..551afe63 100644 --- a/snapshot-tests/rules/neworigins.html +++ b/snapshot-tests/rules/neworigins.html @@ -7816,7 +7816,7 @@- Artem Trytiak took over the code maintainence at that point and has + Artem Trytiak took over the code maintenance at that point and has maintained it since along with a number of other contrubutors to the github project.
diff --git a/snapshot-tests/rules/standard.html b/snapshot-tests/rules/standard.html index 3ce8a8ee..aa3c9d1f 100644 --- a/snapshot-tests/rules/standard.html +++ b/snapshot-tests/rules/standard.html @@ -7862,7 +7862,7 @@- Artem Trytiak took over the code maintainence at that point and has + Artem Trytiak took over the code maintenance at that point and has maintained it since along with a number of other contrubutors to the github project.
diff --git a/snapshot-tests/turns/turn_0/report.1 b/snapshot-tests/turns/turn_0/report.1 index cf6a6837..c804a4e1 100644 --- a/snapshot-tests/turns/turn_0/report.1 +++ b/snapshot-tests/turns/turn_0/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_1/report.1 b/snapshot-tests/turns/turn_1/report.1 index 8d980c2e..96bd0e65 100644 --- a/snapshot-tests/turns/turn_1/report.1 +++ b/snapshot-tests/turns/turn_1/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_10/report.1 b/snapshot-tests/turns/turn_10/report.1 index 9eba3495..487140f8 100644 --- a/snapshot-tests/turns/turn_10/report.1 +++ b/snapshot-tests/turns/turn_10/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_10/report.3 b/snapshot-tests/turns/turn_10/report.3 index 23fd436a..b44ec42f 100644 --- a/snapshot-tests/turns/turn_10/report.3 +++ b/snapshot-tests/turns/turn_10/report.3 @@ -28,6 +28,14 @@ King's Guards (167): Earns 686 silver working in plain (29,11) in Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King's Guards (167): Consumes 470 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 20 silver [SILV] from Ranchers (155) for + maintenance. +Ranchers (155): King (140) borrows 20 silver [SILV] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/snapshot-tests/turns/turn_11/report.1 b/snapshot-tests/turns/turn_11/report.1 index f481da50..34faf86f 100644 --- a/snapshot-tests/turns/turn_11/report.1 +++ b/snapshot-tests/turns/turn_11/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_11/report.3 b/snapshot-tests/turns/turn_11/report.3 index 829a9e06..8264464e 100644 --- a/snapshot-tests/turns/turn_11/report.3 +++ b/snapshot-tests/turns/turn_11/report.3 @@ -24,11 +24,19 @@ King's Guards (167): Earns 686 silver working in plain (29,11) in Koheda. Ranchers (155): Ranchers (155) shares 100 silver [SILV] with King (140). -King (140): Studies force. +King (140): Studies force at a cost of 100 silver [SILV]. King (140): Completes study to level 2 in force. Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +King's Guards (167): Consumes 470 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +Caravan (164): Consumes 10 silver [SILV] for maintenance. +King (140): Borrows 20 silver [SILV] from Ranchers (155) for + maintenance. +Ranchers (155): King (140) borrows 20 silver [SILV] for maintenance. Skill reports: diff --git a/snapshot-tests/turns/turn_12/report.1 b/snapshot-tests/turns/turn_12/report.1 index a2cd7dd6..0a5b1a52 100644 --- a/snapshot-tests/turns/turn_12/report.1 +++ b/snapshot-tests/turns/turn_12/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_12/report.3 b/snapshot-tests/turns/turn_12/report.3 index be4e23dc..e08952cb 100644 --- a/snapshot-tests/turns/turn_12/report.3 +++ b/snapshot-tests/turns/turn_12/report.3 @@ -26,6 +26,12 @@ Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. King (140): Earns 14 silver working in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +King's Guards (167): Consumes 470 silver [SILV] for maintenance. +Caravan (164): Consumes 10 silver [SILV] for maintenance. +King (140): Consumes 20 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/snapshot-tests/turns/turn_13/report.1 b/snapshot-tests/turns/turn_13/report.1 index e2063a42..a1d9c98c 100644 --- a/snapshot-tests/turns/turn_13/report.1 +++ b/snapshot-tests/turns/turn_13/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_13/report.3 b/snapshot-tests/turns/turn_13/report.3 index 06933cfd..8e721d14 100644 --- a/snapshot-tests/turns/turn_13/report.3 +++ b/snapshot-tests/turns/turn_13/report.3 @@ -23,10 +23,16 @@ Caravan (164): Walks from plain (29,11) in Koheda to plain (28,12) in Workers (152): Earns 162 silver working in plain (28,10) in Koheda. King's Guards (167): Earns 686 silver working in plain (29,11) in Koheda. -King (140): Studies fire. +King (140): Studies fire at a cost of 100 silver [SILV]. Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +King's Guards (167): Consumes 470 silver [SILV] for maintenance. +King (140): Consumes 20 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +Caravan (164): Consumes 10 silver [SILV] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/snapshot-tests/turns/turn_2/report.1 b/snapshot-tests/turns/turn_2/report.1 index e17825e9..8c5b2faf 100644 --- a/snapshot-tests/turns/turn_2/report.1 +++ b/snapshot-tests/turns/turn_2/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_2/report.3 b/snapshot-tests/turns/turn_2/report.3 index 46df5c32..286f9e74 100644 --- a/snapshot-tests/turns/turn_2/report.3 +++ b/snapshot-tests/turns/turn_2/report.3 @@ -18,6 +18,7 @@ Workers (152): Buys 10 nomads [NOMA] at $64 each. Unit (140): Walks from plain (28,10) in Koheda to plain (28,12) in Koheda. Workers (152): Earns 162 silver working in plain (28,10) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. Unit (140): Claims 20 silver for maintenance. Item reports: diff --git a/snapshot-tests/turns/turn_3/report.1 b/snapshot-tests/turns/turn_3/report.1 index c80ff108..5489d12a 100644 --- a/snapshot-tests/turns/turn_3/report.1 +++ b/snapshot-tests/turns/turn_3/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_3/report.3 b/snapshot-tests/turns/turn_3/report.3 index 1eee38c9..609fa8c7 100644 --- a/snapshot-tests/turns/turn_3/report.3 +++ b/snapshot-tests/turns/turn_3/report.3 @@ -19,9 +19,15 @@ King (140): Claims $100. Ranchers (155): Buys 10 plainsmen [PLAI] at $59 each. Workers (156): Buys 10 plainsmen [PLAI] at $59 each. Workers (152): Earns 162 silver working in plain (28,10) in Koheda. -King (140): Studies force. -Ranchers (155): Studies ranching. +King (140): Studies force at a cost of 100 silver [SILV]. +Ranchers (155): Studies ranching at a cost of 100 silver [SILV]. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 20 silver [SILV] from Workers (156) for + maintenance. +Workers (156): King (140) borrows 20 silver [SILV] for maintenance. Skill reports: diff --git a/snapshot-tests/turns/turn_4/report.1 b/snapshot-tests/turns/turn_4/report.1 index 6c7d9aa2..fcb0d3d7 100644 --- a/snapshot-tests/turns/turn_4/report.1 +++ b/snapshot-tests/turns/turn_4/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_4/report.3 b/snapshot-tests/turns/turn_4/report.3 index 0b2e95aa..01862803 100644 --- a/snapshot-tests/turns/turn_4/report.3 +++ b/snapshot-tests/turns/turn_4/report.3 @@ -24,6 +24,17 @@ Scout (164): Walks from plain (28,12) in Koheda to plain (29,11) in Workers (152): Earns 162 silver working in plain (28,10) in Koheda. King (140): Earns 14 silver working in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King (140): Consumes 14 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 6 silver [SILV] from Workers (156) for + maintenance. +Workers (156): King (140) borrows 6 silver [SILV] for maintenance. +Ranchers (155): Borrows 72 silver [SILV] from Workers (156) for + maintenance. +Workers (156): Ranchers (155) borrows 72 silver [SILV] for + maintenance. Ranchers (155): Claims 28 silver for maintenance. Declared Attitudes (default Neutral): diff --git a/snapshot-tests/turns/turn_5/report.1 b/snapshot-tests/turns/turn_5/report.1 index 9d47e7e2..3265fd65 100644 --- a/snapshot-tests/turns/turn_5/report.1 +++ b/snapshot-tests/turns/turn_5/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_5/report.3 b/snapshot-tests/turns/turn_5/report.3 index 8cb15469..aa750a7c 100644 --- a/snapshot-tests/turns/turn_5/report.3 +++ b/snapshot-tests/turns/turn_5/report.3 @@ -19,11 +19,20 @@ Ranchers (155): Sells 0 livestock [LIVE] at $23 each. King's Guards (167): Buys 25 high elves [HELF] at $58 each. Ranchers (155): Forgets ranching [RANC]. Workers (152): Earns 162 silver working in plain (28,10) in Koheda. -King's Guards (167): Studies combat. +King's Guards (167): Studies combat at a cost of 250 silver [SILV]. Scout (164): Earns 14 silver working in plain (29,11) in Koheda. -Ranchers (155): Studies farming. +Ranchers (155): Studies farming at a cost of 100 silver [SILV]. King (140): Earns 14 silver working in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King's Guards (167): Consumes 250 silver [SILV] for maintenance. +King (140): Consumes 14 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 6 silver [SILV] from Workers (156) for + maintenance. +Workers (156): King (140) borrows 6 silver [SILV] for maintenance. Skill reports: diff --git a/snapshot-tests/turns/turn_6/report.1 b/snapshot-tests/turns/turn_6/report.1 index d8993de6..834be4a3 100644 --- a/snapshot-tests/turns/turn_6/report.1 +++ b/snapshot-tests/turns/turn_6/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_6/report.3 b/snapshot-tests/turns/turn_6/report.3 index 5e0a08d8..b8da92cf 100644 --- a/snapshot-tests/turns/turn_6/report.3 +++ b/snapshot-tests/turns/turn_6/report.3 @@ -24,6 +24,19 @@ Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. King (140): Earns 14 silver working in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King's Guards (167): Consumes 250 silver [SILV] for maintenance. +King (140): Consumes 14 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 6 silver [SILV] from Workers (156) for + maintenance. +Workers (156): King (140) borrows 6 silver [SILV] for maintenance. +Ranchers (155): Borrows 86 silver [SILV] from Workers (156) for + maintenance. +Workers (156): Ranchers (155) borrows 86 silver [SILV] for + maintenance. +Ranchers (155): Consumes 2 livestock [LIVE] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/snapshot-tests/turns/turn_7/report.1 b/snapshot-tests/turns/turn_7/report.1 index fedccaaf..ad24f10e 100644 --- a/snapshot-tests/turns/turn_7/report.1 +++ b/snapshot-tests/turns/turn_7/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_7/report.3 b/snapshot-tests/turns/turn_7/report.3 index 704511d5..38162157 100644 --- a/snapshot-tests/turns/turn_7/report.3 +++ b/snapshot-tests/turns/turn_7/report.3 @@ -24,6 +24,15 @@ Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. King (140): Earns 14 silver working in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King's Guards (167): Consumes 250 silver [SILV] for maintenance. +King (140): Consumes 14 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 6 silver [SILV] from Ranchers (155) for + maintenance. +Ranchers (155): King (140) borrows 6 silver [SILV] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/snapshot-tests/turns/turn_8/report.1 b/snapshot-tests/turns/turn_8/report.1 index 632b1faa..e5ff3e67 100644 --- a/snapshot-tests/turns/turn_8/report.1 +++ b/snapshot-tests/turns/turn_8/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_8/report.3 b/snapshot-tests/turns/turn_8/report.3 index 16843a82..817e18ba 100644 --- a/snapshot-tests/turns/turn_8/report.3 +++ b/snapshot-tests/turns/turn_8/report.3 @@ -20,16 +20,25 @@ King's Guards (167): Collects $1250 in taxes in plain (29,11) in Ranchers (155): Sells 10 livestock [LIVE] at $23 each. Reinforcement (178): Buys 22 high elves [HELF] at $58 each. Workers (152): Earns 162 silver working in plain (28,10) in Koheda. -Reinforcement (178): Studies combat. +Reinforcement (178): Studies combat at a cost of 220 silver [SILV]. Scout (164): Earns 14 silver working in plain (29,11) in Koheda. King's Guards (167): Earns 365 silver working in plain (29,11) in Koheda. Ranchers (155): Ranchers (155) shares 100 silver [SILV] with King (140). -King (140): Studies fire. +King (140): Studies fire at a cost of 100 silver [SILV]. Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King's Guards (167): Consumes 250 silver [SILV] for maintenance. +Reinforcement (178): Consumes 220 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 20 silver [SILV] from Ranchers (155) for + maintenance. +Ranchers (155): King (140) borrows 20 silver [SILV] for maintenance. Skill reports: diff --git a/snapshot-tests/turns/turn_9/report.1 b/snapshot-tests/turns/turn_9/report.1 index 9b3c4098..b005579a 100644 --- a/snapshot-tests/turns/turn_9/report.1 +++ b/snapshot-tests/turns/turn_9/report.1 @@ -720,7 +720,7 @@ summon storm [SSTO] 1: A mage with this skill can cast summon storm in battle. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 100 times the skill level of the mage weather attacks and each attack - deals 1 damage. Each attack causes the target to be effected by + deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. In order to use this spell in combat, the mage should use the COMBAT order to set it as his combat spell. This skill requires @@ -941,7 +941,7 @@ create aura of fear [FEAR] 1: A mage with this skill can cast cause fear in battle. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 50 times the skill level of the mage - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. In order to use this spell in combat, the mage @@ -2406,7 +2406,7 @@ runesword [RUNE], weight 1. This is a armor-piercing weapon and each cast cause fear in battle at a skill level of 2. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between 2 and 100 - spirit attacks and each attack deals 1 damage. Each attack causes + spirit attacks and each attack deals no damage. Each attack causes the target to be effected by fear (-2 to attack, -2 versus melee attacks, -2 versus riding attacks, -2 versus ranged attacks) for the rest of the battle. @@ -2821,7 +2821,7 @@ storm giant [STGI], weight 200, walking capacity 50, moves 2 hexes per Monster can cast summon storm in battle at a skill level of 5. This ability will not target creatures which are currently affected by storm. This ability does between 2 and 500 weather attacks and each - attack deals 1 damage. Each attack causes the target to be effected + attack deals no damage. Each attack causes the target to be effected by storm (-2 to attack, -2 versus melee attacks) for the rest of the battle. This monster can lair in the Giant's Castle. The monster has no terrain preferences, and it can travel through any terrain. @@ -2879,17 +2879,17 @@ evil sorcerer [SORC], weight 10, walking capacity 5, moves 2 hexes per Monster can cast cause fear in battle at a skill level of 3. This ability will not target creatures which are currently affected by fear. This ability cannot target monsters. This ability does between - 2 and 150 spirit attacks and each attack deals 1 damage. Each attack - causes the target to be effected by fear (-2 to attack, -2 versus - melee attacks, -2 versus riding attacks, -2 versus ranged attacks) - for the rest of the battle. The monster has no terrain preferences, - and it can travel through any terrain. Monster is unfriendly, and - the player must be pretty unlucky to be attacked by this monster. - This monster has 1 melee attack per round and takes 1 hit to kill - and each attack deals 1 damage. This monster has a tactics score of - 2, a stealth score of 0, and an observation score of 2. This monster - might have advanced items and silver as treasure. This item cannot - be given to other units. + 2 and 150 spirit attacks and each attack deals no damage. Each + attack causes the target to be effected by fear (-2 to attack, -2 + versus melee attacks, -2 versus riding attacks, -2 versus ranged + attacks) for the rest of the battle. The monster has no terrain + preferences, and it can travel through any terrain. Monster is + unfriendly, and the player must be pretty unlucky to be attacked by + this monster. This monster has 1 melee attack per round and takes 1 + hit to kill and each attack deals 1 damage. This monster has a + tactics score of 2, a stealth score of 0, and an observation score + of 2. This monster might have advanced items and silver as treasure. + This item cannot be given to other units. evil magician [MAGI], weight 10, walking capacity 5, moves 2 hexes per month. This is a monster. This monster attacks with a combat skill diff --git a/snapshot-tests/turns/turn_9/report.3 b/snapshot-tests/turns/turn_9/report.3 index 45c31f02..ad19af7c 100644 --- a/snapshot-tests/turns/turn_9/report.3 +++ b/snapshot-tests/turns/turn_9/report.3 @@ -25,10 +25,18 @@ King's Guards (167): Earns 686 silver working in plain (29,11) in Koheda. Ranchers (155): Ranchers (155) shares 100 silver [SILV] with King (140). -King (140): Studies force. +King (140): Studies force at a cost of 100 silver [SILV]. Ranchers (155): Produces 10 livestock [LIVE] in plain (28,12) in Koheda. Workers (156): Earns 149 silver working in plain (28,12) in Koheda. +Workers (152): Consumes 100 silver [SILV] for maintenance. +Scout (164): Consumes 10 silver [SILV] for maintenance. +King's Guards (167): Consumes 470 silver [SILV] for maintenance. +Ranchers (155): Consumes 100 silver [SILV] for maintenance. +Workers (156): Consumes 100 silver [SILV] for maintenance. +King (140): Borrows 20 silver [SILV] from Ranchers (155) for + maintenance. +Ranchers (155): King (140) borrows 20 silver [SILV] for maintenance. Declared Attitudes (default Neutral): Hostile : none. diff --git a/standard/rules.cpp b/standard/rules.cpp index 95a2ee4f..7383c910 100644 --- a/standard/rules.cpp +++ b/standard/rules.cpp @@ -78,7 +78,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 20, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */ diff --git a/unittest/rules.cpp b/unittest/rules.cpp index b4dafe8f..5ac49bfd 100644 --- a/unittest/rules.cpp +++ b/unittest/rules.cpp @@ -77,7 +77,7 @@ static GameDefs g = { 10, /* MAINTENANCE_COST */ 20, /* LEADER_COST */ - 0, /* MAINTAINENCE_MULTIPLIER */ + 0, /* MAINTENANCE_MULTIPLIER */ GameDefs::MULT_NONE, /* MULTIPLIER_USE */ 33, /* STARVE_PERCENT */