1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Commit Graph

17276 Commits

Author SHA1 Message Date
Xilmi
cf338e04ad Update Nullkiller.cpp
AI can now also buy resources that it has income for.
2024-09-06 21:40:23 +02:00
Xilmi
35d8705fea Update Nullkiller.cpp
prioOfTask-variable-usage bound to trace-level as otherwise a warning will ensue.
2024-09-06 17:20:12 +02:00
Xilmi
d4ee899565 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-06 17:04:34 +02:00
Xilmi
e43492d8b5 Update PriorityEvaluator.cpp
Fixed affordabilitycheck not being negated.
2024-09-06 00:12:44 +02:00
Xilmi
db2416cb6b Update Nullkiller.cpp
Readded prioOfTask because it's needed in trace-messages.
2024-09-05 23:41:05 +02:00
Xilmi
5488a0a29c Removed the "GATHER"-priorityTier
There was no real need for it to be a separated tier from Hunter_gather.
2024-09-05 19:35:47 +02:00
Xilmi
581a142a20 HeroStrengthForCampaign
Make sure to take our magic-specialist to the next campaign-mission even if he's totally out of mana.
2024-09-05 17:38:27 +02:00
Xilmi
7c42e43fe5 Update CCreatureSet.cpp
Use getMarketValue instead of getCost.
2024-09-05 17:16:06 +02:00
Xilmi
d9fe8d7fa0 Update BuyArmyBehavior.cpp
Removed pointless check for hero-army being more valuable than buying army directly as it was never the case anyways.
2024-09-05 16:50:22 +02:00
Xilmi
b3115f65c5 Update BuildingBehavior.cpp
Use std::numeric_limits<uint8_t>::max(); instead of  UINT8_MAX; and remove some leftover-trace-messages from debugging.
2024-09-05 16:45:45 +02:00
Xilmi
d5d9f3cb7d Merge branch 'develop' of https://github.com/xilmi/vcmi into develop 2024-09-05 16:40:21 +02:00
Xilmi
dafc9cd8a8 Update PriorityEvaluator.cpp
Replace float-comparisons with zero by vstd::isAlmostZero
2024-09-05 16:40:06 +02:00
Xilmi
c186de2d52
Update AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
Avoid checking float against an exact value.

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-09-05 16:36:07 +02:00
Xilmi
20cfe712c9 Update ResourceSet.h
Rename income to availableFunds
2024-09-05 16:34:42 +02:00
Xilmi
044dc272c2
Update lib/CCreatureSet.h
Use a better name and add a comment to explain what it does.

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-09-05 16:31:44 +02:00
Xilmi
79531c8596 Update ResourceSet.h
Use a more descriptive method name and add comment of what it does.
2024-09-05 16:30:15 +02:00
Xilmi
51b9d16291 Merge branch 'develop' of https://github.com/xilmi/vcmi into develop 2024-09-05 16:22:30 +02:00
Xilmi
23cd54c998 Preparations for merge
No longer using FuzzyEngine just to create a log-message. It's now only used when isUseFuzzy is set.
Also:
Removed < operator and instead use already existing "canAfford"-Method.
2024-09-05 16:22:25 +02:00
Ivan Savenko
6179521364
Merge pull request #4556 from IvanSavenko/town_building_visit
Implemented explicitly visitable town buildings, e.g. hota mana vortex
2024-09-05 17:21:21 +03:00
Xilmi
07afb2d649
Update lib/ResourceSet.h
Use suggestion.

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-09-05 16:20:15 +02:00
Ivan Savenko
fc89a564fd
Merge pull request #4525 from altiereslima/develop
Update Portuguese Translation
2024-09-05 17:15:23 +03:00
Ivan Savenko
a72715ad31
Merge pull request #4563 from SoundSSGood/vcmiScrolls
Improvements to the artifact creation
2024-09-05 17:10:13 +03:00
Xilmi
b32c9615ed Update Nullkiller.cpp
Removed unused variable.
2024-09-05 15:59:09 +02:00
Xilmi
dd5a34d994 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-05 15:54:03 +02:00
SoundSSGood
7466d7452d vcmiscrolls 2024-09-05 15:51:45 +03:00
Ivan Savenko
042d3c0265
Merge branch 'develop' into develop 2024-09-05 15:08:21 +03:00
Ivan Savenko
624607caae
Merge pull request #4555 from IvanSavenko/xbrz_fonts
Improvements for fonts when xbrz is in use
2024-09-05 15:06:25 +03:00
Ivan Savenko
a87ab4e4d7
Merge pull request #4557 from utzuro/fix/rmg-road-type-not-saving
RMG: Enable only those roads, that are enabled in persistentStorage.json
2024-09-05 15:06:15 +03:00
Ivan Savenko
5fae99279e
Merge pull request #4558 from ToRRent1812/patch-1
Update polish.json
2024-09-05 15:05:58 +03:00
Ivan Savenko
2566576c95
Merge pull request #4565 from kaja47/one-loop-less
avoid one loop in BonusList::totalValue()
2024-09-05 15:05:48 +03:00
Ivan Savenko
c52533a961
Merge pull request #4543 from Laserlicht/chronicles_installer
Chronicles support
2024-09-05 15:04:13 +03:00
K
a6c7fda649 avoid one loop in BonusList::totalValue() 2024-09-04 23:10:54 +02:00
Ivan Savenko
6565b1d249
Merge pull request #4564 from IvanSavenko/stream_regressions_fix
Fixes for regressions found on stream
2024-09-04 23:37:15 +03:00
Ivan Savenko
44fdb71933 Machine Factory and Refugee Camp can't be owned 2024-09-04 19:46:58 +00:00
Ivan Savenko
dae9e1e316 Implement IOwnableObject interface for shipyard 2024-09-04 19:46:36 +00:00
Ivan Savenko
7a0726bcff Apply x2 bonus only to creature growth of affected creature on new month 2024-09-04 19:46:15 +00:00
SoundSSGood
30fa2846aa ArtifactUtils::createArtifact ArtifactUtils::createNewArtifactInstance unified 2024-09-04 21:25:55 +03:00
Ivan Savenko
b09d9d501b Pass pointer to actual caller in showBlockingDialog callWith
Fixes activation of all rewardable buildings in town on blocking dialog
answer
2024-09-04 15:14:56 +00:00
Ivan Savenko
d34b4a141e Split map object visit from town building visit. Removes side effects
from building visit
2024-09-04 14:54:09 +00:00
Xilmi
db16a9d234 A bit of clean-up for merge
Set back trace level to 0
Removed EvaluationContexts that weren't used
Encapsulated many debug-messages behinde trace-levels
2024-09-04 16:41:47 +02:00
Ivan Savenko
81af66d35b Move visit query to a separate class, remove no longer needed Cast.h 2024-09-04 14:32:36 +00:00
Ivan Savenko
29f87d6407 pass object/hero parameters directly instead of passing query 2024-09-04 14:17:22 +00:00
SoundSSGood
b06426ac43 CMap removed from CArtifactSet level 2024-09-04 15:12:40 +03:00
Łukasz Zając
a19e320c41
oops
missing comma
2024-09-04 13:40:01 +02:00
Łukasz Zając
93ce34af5d
Update polish.json
translated statistics + new bonus
2024-09-04 01:46:05 +02:00
void
de4f63da90 RMG: Enable only those roads, that are enabled in persistentStorage.json 2024-09-04 08:37:45 +09:00
Xilmi
d0aefdfbe6 Update RecruitHero.cpp
Removed a A
2024-09-03 21:17:06 +02:00
Xilmi
9361278f81 Merge remote-tracking branch 'upstream/develop' into develop 2024-09-03 21:16:01 +02:00
Ivan Savenko
4108b5d71f
Merge pull request #4551 from vcmi/fix-battle-ai
BattleAI: avoid standing in moat
2024-09-03 21:59:37 +03:00
Xilmi
dfa992951b Revert "Merge branch 'fix-battle-ai' into develop"
This reverts commit b489816d29, reversing
changes made to 5ee7061ab7.
2024-09-03 20:57:05 +02:00