games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-23 12:08:45 +02:00
Code Issues Releases Activity

- Compile fix

Browse Source 
- Fixed Basilisk spawning at Hive
- Fixed double-shot of Marksman
This commit is contained in:
DjWarmonger 2013-02-11 17:23:55 +00:00
parent 6ff7d61b91
commit b554af25d3
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/EmptyAI/CEmptyAI.cpp
View File

@ -5,7 +5,7 @@ void CEmptyAI::init(CCallback * CB)
{ {
cb = CB; cb = CB;
human=false; human=false;
playerID=cb->getMyColor(); playerID = *cb->getMyColor();
std::cout << "EmptyAI initialized." << std::endl; std::cout << "EmptyAI initialized." << std::endl;
} }
void CEmptyAI::yourTurn() void CEmptyAI::yourTurn()

2
config/bankconfig.json
View File

@ -286,7 +286,7 @@
{ {
"chance": 30, "chance": 30,
"guards": [ { "number": 30, "id": 105} ], "guards": [ { "number": 30, "id": 105} ],
"upgrade_chance": 30, "upgrade_chance": 0,
"combat_value": 154, "combat_value": 154,
"reward_creatures": [ { "number": 4, "id": 108 } ], "reward_creatures": [ { "number": 4, "id": 108 } ],
"value": 3200, "value": 3200,

7
config/creatures/castle.json
View File

@ -69,6 +69,13 @@
"id": 3, "id": 3,
"level": 2, "level": 2,
"faction": "castle", "faction": "castle",
"abilities": [
{
"type": "ADDITIONAL_ATTACK",
"val" : 1,
"effectRange": "ONLY_DISTANCE_FIGHT"
}
],
"graphics" : "graphics" :
{ {
"animation": "CHCBOW.DEF", "animation": "CHCBOW.DEF",

2
lib/BattleState.cpp
View File

@ -883,6 +883,8 @@ void CStack::postInit()
assert(type); assert(type);
assert(getParentNodes().size()); assert(getParentNodes().size());
//FIXME: the following should take into account ONLY_ENEMY_ARMY bonus range
firstHPleft = MaxHealth(); firstHPleft = MaxHealth();
shots = getCreature()->valOfBonuses(Bonus::SHOTS); shots = getCreature()->valOfBonuses(Bonus::SHOTS);
counterAttacks = 1 + valOfBonuses(Bonus::ADDITIONAL_RETALIATION); counterAttacks = 1 + valOfBonuses(Bonus::ADDITIONAL_RETALIATION);