games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor

Browse Source 
# Conflicts:
#	launcher/settingsView/csettingsview_moc.ui
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.cpp
#	lib/mapping/CMapEditManager.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h
#	lib/serializer/CSerializer.h
This commit is contained in:
nordsoft 2022-09-09 11:59:19 +04:00
commit e64641cf01
7 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/windows/CCreatureWindow.cpp
View File

@ -324,6 +324,11 @@ CStackWindow::ButtonsSection::ButtonsSection(CStackWindow * owner, int yOffset)
upgradeBtn->addOverlay(std::make_shared<CAnimImage>("CPRSMALL", VLC->creh->objects[upgradeInfo.info.newID[buttonIndex]]->iconIndex)); upgradeBtn->addOverlay(std::make_shared<CAnimImage>("CPRSMALL", VLC->creh->objects[upgradeInfo.info.newID[buttonIndex]]->iconIndex));
if(buttonsToCreate == 1) // single upgrade avaialbe
{
upgradeBtn->assignedKeys.insert(SDLK_u);
}
upgrade[buttonIndex] = upgradeBtn; upgrade[buttonIndex] = upgradeBtn;
} }
} }

12
config/creatures/conflux.json Normal file → Executable file
View File

@ -31,6 +31,12 @@
"type" : "MORE_DAMAGE_FROM_SPELL", "type" : "MORE_DAMAGE_FROM_SPELL",
"subtype" : "spell.chainLightning", "subtype" : "spell.chainLightning",
"val" : 100 "val" : 100
},
"armageddonVulnerablity" :
{
"type" : "MORE_DAMAGE_FROM_SPELL",
"subtype" : "spell.armageddon",
"val" : 100
} }
}, },
"upgrades": ["stormElemental"], "upgrades": ["stormElemental"],
@ -523,6 +529,12 @@
"type" : "MORE_DAMAGE_FROM_SPELL", "type" : "MORE_DAMAGE_FROM_SPELL",
"subtype" : "spell.chainLightning", "subtype" : "spell.chainLightning",
"val" : 100 "val" : 100
},
"armageddonVulnerablity" :
{
"type" : "MORE_DAMAGE_FROM_SPELL",
"subtype" : "spell.armageddon",
"val" : 100
} }
}, },
"graphics" : "graphics" :

2
config/creatures/inferno.json Normal file → Executable file
View File

@ -315,7 +315,7 @@
"fireShield" : "fireShield" :
{ {
"type" : "FIRE_SHIELD", "type" : "FIRE_SHIELD",
"val" : 30 "val" : 20
} }
}, },
"graphics" : "graphics" :

7
config/heroes/conflux.json Normal file → Executable file
View File

@ -46,8 +46,9 @@
] ]
}, },
"bonuses" : { "bonuses" : {
"health" : { "damage" : {
"type" : "STACK_HEALTH", "type" : "CREATURE_DAMAGE",
"subtype" : 0,
"val" : 5 "val" : 5
}, },
"attack" : { "attack" : {
@ -173,7 +174,7 @@
] ]
}, },
"bonuses" : { "bonuses" : {
"health" : { "damage" : {
"type" : "CREATURE_DAMAGE", "type" : "CREATURE_DAMAGE",
"subtype" : 0, "subtype" : 0,
"val" : 5 "val" : 5

2
launcher/settingsView/csettingsview_moc.ui
View File

@ -648,7 +648,7 @@
<item row="17" column="7"> <item row="17" column="7">
<widget class="QPushButton" name="updatesButton"> <widget class="QPushButton" name="updatesButton">
<property name="text"> <property name="text">
<string>Updates</string> <string>Check for updates</string>
</property> </property>
</widget> </widget>
</item> </item>

5
lib/CPathfinder.cpp
View File

@ -620,10 +620,11 @@ void LayerTransitionRule::process(
destination.blocked = true; destination.blocked = true;
} }
} }
else if(source.node->accessible != CGPathNode::ACCESSIBLE && destination.node->accessible != CGPathNode::ACCESSIBLE) else if(destination.node->accessible != CGPathNode::ACCESSIBLE)
{ {
/// Hero that fly can only land on accessible tiles /// Hero that fly can only land on accessible tiles
destination.blocked = true; if(!destination.isGuardianTile && destination.nodeObject)
destination.blocked = true;
} }
break; break;

5
lib/HeroBonus.cpp
View File

@ -957,7 +957,10 @@ void CBonusSystemNode::getAllBonusesRec(BonusList &out) const
auto updated = b->updater auto updated = b->updater
? getUpdatedBonus(b, b->updater) ? getUpdatedBonus(b, b->updater)
: b; : b;
out.push_back(updated);
//do not add bonus with same pointer
if(!vstd::contains(out, updated))
out.push_back(updated);
} }
} }