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

10430 Commits

Author SHA1 Message Date
Andrey Filipenkov
21463f1c0e fix movement cost with Fly 2023-03-19 11:26:55 +03:00
Andrey Filipenkov
43e89523a9
Merge pull request #1716 from rilian-la-te/tw-fix
TotalValue: fix typo
2023-03-19 11:25:48 +03:00
Tomasz Zieliński
dd3803b111 Don't place shipyard or boats at very small lakes
(cherry picked from commit 1d2913bea0)
2023-03-18 22:05:25 +01:00
Tomasz Zieliński
1dc96d6844 Fix shipyard border calculation for RMG 2023-03-18 20:12:36 +01:00
Konstantin
54b1b49f5a totalValue: fix overflow
Fixes #1715
2023-03-18 22:08:21 +03:00
Tomasz Zieliński
23a5a32756 Add fallback for empty terrain types. Still it's a workaround and does not solve the root cause. 2023-03-18 17:00:50 +01:00
Andrii Danylchenko
d9fac6d6fb
Merge pull request #1713 from vcmi/fix_weekly_growth
Fix all stacks being capped at 10 units
2023-03-18 15:09:58 +02:00
Konstantin
b07f4fb383 TotalValue: fix typo 2023-03-18 15:45:32 +03:00
Konstantin
5462a92930 Fix #1688 again 2023-03-18 01:19:41 +03:00
Tomasz Zieliński
eabcbfc25a Fix all stacks being capped at 10 units 2023-03-17 22:32:05 +01:00
Ivan Savenko
f24ca6fbcf
Merge pull request #1699 from rilian-la-te/fix-ignissa
Rewardable: always initialize numbers
2023-03-17 22:15:28 +02:00
Ivan Savenko
dfd6998a9e
Merge pull request #1702 from IvanSavenko/disable_client_state_load
Disable loading of client save game
2023-03-17 22:15:18 +02:00
Ivan Savenko
e7f8ef7627
Merge pull request #1703 from Adriankhl/fix_auto_fighting
Prevent crashing when pressing auto-combat button on enemy turn
2023-03-17 22:15:11 +02:00
Ivan Savenko
95d56d3f2a
Merge pull request #1705 from rilian-la-te/convert-scouting
HeroBonus: add scouting to converter
2023-03-17 22:14:54 +02:00
Ivan Savenko
bb331409cc
Merge pull request #1707 from rilian-la-te/fix-commander-jousting
Fix commander jousting
2023-03-17 22:14:46 +02:00
Konstantin
a1f3dd31e8 fix commander jousting 2023-03-17 21:03:47 +03:00
Konstantin
6de042657c fix Ignissa bug the old way 2023-03-17 20:09:18 +03:00
Konstantin
b4fe7908a4 HeroBonus: add scouting to converter 2023-03-17 18:50:57 +03:00
Adriankhl
4718396f5f Prevent crashing when pressing auto-combat button on enemy turn 2023-03-17 15:40:14 +01:00
Ivan Savenko
a3059033f2 Fixes broken client state, e.g. movement. Effectively reverts #1663 2023-03-17 16:00:47 +02:00
Ivan Savenko
02b5edd32d
Merge pull request #1653 from IvanSavenko/changelog_update
Changelog update: Added changes from PR's made in February
2023-03-16 21:48:59 +02:00
Ivan Savenko
8a6c51a9e6 Fix uninitialized pointer dereference 2023-03-16 20:48:37 +02:00
Ivan Savenko
e64aed371b Updated changelog to include new changes 2023-03-16 20:48:18 +02:00
Ivan Savenko
d6b3b6ca61 Added changes from PR's made in February 2023-03-16 19:29:25 +02:00
Ivan Savenko
ecbbbeda9b
Merge pull request #1693 from IvanSavenko/game_settings_overrides
Game settings overrides
2023-03-16 19:28:22 +02:00
Ivan Savenko
fbb9810c49 Fix regression - uninitialized pointer 2023-03-16 19:25:26 +02:00
Ivan Savenko
921c5d647e Fix Spanish translation 2023-03-16 18:42:47 +02:00
Ivan Savenko
21407b26dd Fix minimap redraw on fow reveal 2023-03-16 18:36:31 +02:00
Ivan Savenko
aea2a1e22e Fixed loading of settings from mods 2023-03-16 18:11:36 +02:00
Ivan Savenko
2207c0dfb2 Clear up comments 2023-03-16 18:11:36 +02:00
Ivan Savenko
a0e9e01b48 Renamed & reorganized all game mechanics settings names 2023-03-16 18:11:35 +02:00
Ivan Savenko
383387ef29 Integrated defaultMods into mod system 2023-03-16 17:55:09 +02:00
Ivan Savenko
2353137c74
Merge pull request #1586 from rilian-la-te/modernize-rest
vcmi: modernize rest of lib
2023-03-16 17:38:20 +02:00
Konstantin
77ebe05491 defaultMods: comment army movement 2023-03-16 17:58:46 +03:00
Konstantin
4c4498b22a vcmi: modernize rest of lib 2023-03-16 17:55:20 +03:00
Ivan Savenko
17520b70ce
Merge pull request #1518 from rilian-la-te/arcane-intuition
Skills rework: separate bonus for each skill - part 1
2023-03-16 16:12:42 +02:00
Konstantin
7f805768f0 battle: fixup siege crash 2023-03-16 16:47:06 +03:00
Konstantin
4eb248b5e2 vcmi: bump serialization version
Saves from this branch are incompatible with generic ones
2023-03-16 16:47:05 +03:00
Konstantin
580268bfd4 vcmi: fix logistics specialist movement regression
There was incorrect calculations introduced earlier.
2023-03-16 16:46:42 +03:00
Konstantin
0adffc824f vcmi: allow to configure army movement counter
It is not hardcoded now. MOVEMENT.TXT is still not read,
but ARMY_MOVEMENT updater parameters can be specified in json.
There is a 4 parameters:
1. Base - base value (firstly lowest speed is multiplied by it)
2. Divider - base value is integrally divided by it
3. Multiplier - result value will be multiplied by it
4. Max - maximum allowed movement from army.

Vanilla values is in defaultMods.json

Fixes: https://bugs.vcmi.eu/view.php?id=3209
2023-03-16 16:46:42 +03:00
Konstantin
b91d7418dd vcmi: remove ONLY_ENEMY_ARMY range
It should be used directly instead of alias, propagation updater
also can be useful for any other updaters can be added.
2023-03-16 16:46:42 +03:00
Konstantin
af2cb61077 vcmi: directly specify ONLY_ENEMY_ARMY instead of alias 2023-03-16 16:46:42 +03:00
Konstantin
ff5f828031 vcmi: remove SELF_LUCK bonus
This bonus also now handled by LUCK bonus with INDEPENDENT_MAX of 1
2023-03-16 16:46:42 +03:00
Konstantin
c7e197e1ff vcmi: remove SELF_MORALE bonus
It is easily handled by MORALE bonus with INDEPENDENT_MAX

Harmless due to converter.
2023-03-16 16:46:42 +03:00
Konstantin
ebbc8cf208 vcmi: remove BLOCK_LUCK bonus
To block a luck, just set both INDEPENDENT_MAX and INDEPENDENT_MIN
to 0 of LUCK bonus
2023-03-16 16:46:42 +03:00
Konstantin
ae535384f7 vcmi: fix hourglass of the evil hour
It also should block only positive luck, according
to HOTA description. So, use LUCK with INDEPENDENT_MIN
2023-03-16 16:46:42 +03:00
Konstantin
c07e74250b vcmi: remove BLOCKS_MORALE bonus
To block morale, just set INDEPENDENT_MAX and INDEPENDENT_MIN
to 0, there is no need for separate bonus.
2023-03-16 16:46:42 +03:00
Konstantin
ba2a35464a vcmi: fix spirit of oppression
According to discussion on https://bugs.vcmi.eu/view.php?id=2841
2023-03-16 16:46:42 +03:00
Konstantin
1e7875cb36 vcmi: selector-based target conditions
For now, allows us to define target conditions by selector and even
by minimal and maximal value of bonuses. Convert Bonus condition
to Selector condition.
Allow structures inside TargetCondition struct.
2023-03-16 16:46:42 +03:00
Konstantin
0540e1531d vcmi: allows parsing selectors from JSON
Supports anyOf, allOf, noneOf,
and all selectors from Selector namespace.
Can be useful to define selectors in JSON when required
2023-03-16 16:46:42 +03:00