Andrii Danylchenko
c93bb0a502
nkai: fixes and skill rewards
2023-07-31 22:01:11 +03:00
Andrii Danylchenko
69ceee5dd6
NKAI: penalty for extra chains
2023-07-31 22:01:11 +03:00
Andrii Danylchenko
0fd118d3ce
NKAI: gold reward
2023-07-31 22:01:11 +03:00
Andrii Danylchenko
b19ac01bf9
Fuzzy rework, added more defence and gather army routines
2023-07-31 22:01:10 +03:00
Andrii Danylchenko
b1ca663eb6
Fuzzy rework
2023-07-31 22:01:10 +03:00
Ivan Savenko
d9e7a8f88a
Merge pull request #2446 from IvanSavenko/bugfixing
...
(1.3.0) Bugfixing
2023-07-31 16:21:43 +03:00
Ivan Savenko
986c8799a8
Move checkboxes 2 slots above to avoid overflowing below window border
2023-07-31 13:31:44 +03:00
Ivan Savenko
5776e171c4
Fix list of possible resources given by some objects, e.g. windmills
2023-07-30 12:31:35 +03:00
Ivan Savenko
6c52293dd9
Merge pull request #2425 from IvanSavenko/fix_combat_replay
...
Attempt to fix combat replay queries
2023-07-29 00:03:44 +03:00
heroesiiifan
648f7344c7
Update mod.json
2023-07-28 00:34:28 +00:00
heroesiiifan
ddfeeb152d
Update settings.json
2023-07-28 00:33:42 +00:00
Ivan Savenko
aed8c411fc
Minor rework & cleanup of combat replays
2023-07-27 19:25:55 +03:00
Dydzio
e4303c63ce
Add json entries for missing bonuses
2023-07-25 17:13:02 +02:00
krs
4ce774a380
Wrong placement of onlyOnWaterMap in spells schema.
2023-07-22 13:42:57 +03:00
Ivan Savenko
8456f92bf7
Merge pull request #2292 from IvanSavenko/radial_wheel_garrison
...
Radial wheel for army management
2023-07-21 20:54:49 +03:00
DjWarmonger
377bec277d
Merge pull request #2350 from vcmi/ban_stuff_on_water_maps
...
Ban objects on maps without water
2023-07-21 15:48:13 +02:00
Ivan Savenko
6cd219738b
Added option to disable radial wheel in config (no UI)
2023-07-21 15:47:42 +03:00
Ivan Savenko
cefbe5152e
Merge pull request #2359 from IvanSavenko/crashfixing
...
Fix crashes from 1.2.1 statistics on Google Play
2023-07-21 15:44:37 +03:00
Ivan Savenko
3c6839722a
Merge pull request #2362 from IvanSavenko/banks_guard_preview
...
Implemented support for showing amount of guards in banks
2023-07-21 15:44:11 +03:00
Ivan Savenko
f320d88ce7
Merge pull request #2361 from dydzio0614/missing-setting-label
...
Add missing label for new setting
2023-07-19 14:46:29 +03:00
Ivan Savenko
ddda46a7fd
Merge pull request #2358 from dydzio0614/persistent-hero-info-window
...
Add option for persistent hero info window as in HD mod
2023-07-19 14:46:16 +03:00
Ivan Savenko
07a8c75bec
Merge pull request #2305 from dydzio0614/unlimited-autosave
...
Ability to change autosave limit + set autosave prefix
2023-07-19 14:45:51 +03:00
Ivan Savenko
7f1b982264
Implemented support for showing amount of guards in banks
2023-07-19 13:17:50 +03:00
Tomasz Zieliński
ad5081f9fe
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
2023-07-19 12:05:30 +02:00
Tomasz Zieliński
147f0bce8a
Fix description
2023-07-19 08:27:43 +02:00
Dydzio
d18e5b3351
Add missing label for new setting
2023-07-18 22:35:45 +02:00
Tomasz Zieliński
f3d2a50d2e
Update schemas with new properties
2023-07-18 19:24:45 +02:00
Ivan Savenko
f520043c46
Fix typo
2023-07-18 17:31:21 +03:00
Ivan Savenko
317183e00d
Merge branch 'develop' into info-box-army-management
2023-07-18 16:05:09 +03:00
Ivan Savenko
e0977693b0
Merge pull request #2336 from IvanSavenko/left_button_map_drag
...
Left button map drag
2023-07-18 16:03:05 +03:00
Tomasz Zieliński
03b3771f19
Ban Navigation on maps without water
2023-07-18 10:54:36 +02:00
Dydzio
48a72f90f7
Add option for persistent hero info window as in HD mod
2023-07-17 23:25:16 +02:00
Tomasz Zieliński
025b0814c8
+ Handled banning spells and artifacts
...
+ Rename allowedSpell => allowedSpells
2023-07-17 17:21:28 +02:00
Dydzio
5882cbae78
Merge branch 'develop' into unlimited-autosave
2023-07-16 15:19:04 +02:00
Dydzio
fe26ab4501
Add settings entry, immediately refresh info bar on setting toggle
2023-07-16 14:52:43 +02:00
heroesiiifan
b09e50f29a
adding missing lang to mod.json
2023-07-16 09:13:32 +00:00
heroesiiifan
4b4b73d374
added missing lang in settings.json
2023-07-16 09:10:32 +00:00
Ivan Savenko
61750d30c2
Implemented dragging map via left mouse click (off by default)
2023-07-16 12:00:40 +03:00
Dydzio
ea0ee87299
Interactable hero status - alternative infobox component
2023-07-15 23:14:59 +02:00
Ivan Savenko
d931ff75fc
Fixed positioning of units in tight formation to match H3
2023-07-15 16:09:44 +03:00
Ivan Savenko
8a92941681
Allow merging stack on recruitment to give place for recruited unit
2023-07-15 16:09:44 +03:00
Ivan Savenko
57e7db7fdf
Add missing language entry
2023-07-15 16:09:44 +03:00
Ivan Savenko
f61cc4c8f6
Change battle speed settings from 400/800 to 300/600
2023-07-15 16:09:44 +03:00
Ivan Savenko
cc6e8e8c7e
Fix corrupted artifact lock slot in Polish version of H3
2023-07-15 16:09:44 +03:00
Dydzio
ad66acdd79
End turn autosave support + making it default
2023-07-13 22:07:42 +02:00
Dydzio
bcb061b58f
Merge branch 'develop' into unlimited-autosave
2023-07-13 20:53:10 +02:00
Ivan Savenko
b30db5fc1f
Merge pull request #2301 from Laserlicht/haptic_feedback
...
Haptic feedback
2023-07-13 12:56:54 +03:00
Michael
11bcedc2bf
Update config/widgets/settings/generalOptionsTab.json
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-12 22:56:23 +02:00
Ivan Savenko
78415c573b
Merge pull request #2289 from IvanSavenko/resolution_fixes
...
Fix issues with changing game resolution
2023-07-11 14:35:07 +03:00
Dydzio
fbf0bf78d6
Configurable autosave limit and prefix - ingame handling
2023-07-08 23:04:01 +02:00
Michael
70b7f992de
fix
2023-07-08 20:34:11 +02:00
Michael
ff51b8f46b
Setting for haptic feedback
2023-07-08 18:47:38 +02:00
heroesiiifan
108e768ae2
fix language syntax error
2023-07-07 22:59:40 +00:00
Ivan Savenko
0c83e34093
Implemented reserved area for iOS notch / cutout
2023-07-07 14:29:03 +03:00
Ivan Savenko
fa4a0004b2
Merge pull request #2291 from IvanSavenko/terrain_animations_config
...
Moved hardcoded terrain palette-cycling animations to config
2023-07-07 14:28:39 +03:00
DjWarmonger
f9e1a70ab8
Merge pull request #2278 from vcmi/rmg_factions
...
Rmg factions
2023-07-06 22:15:36 +02:00
Tomasz Zieliński
fcf7a29f45
Update schemat for RMG template
2023-07-06 17:39:09 +02:00
Ivan Savenko
3bce245780
Moved hardcoded terrain palette-cycling animations to config
2023-07-05 22:07:20 +03:00
Ivan Savenko
02f23086b6
Updated according to review
2023-07-03 14:34:53 +03:00
Ivan Savenko
8ac56f06b0
Added Hungarian
2023-07-03 14:34:53 +03:00
Ivan Savenko
4b366e1fe8
Added new languages: Czech, Italian, Korean
2023-07-03 14:34:53 +03:00
Ivan Savenko
21c45bd84f
Added new settings to Launcher:
...
- UI Scaling selection
- Allied AI selection
- Separate main/secondary mod repo
2023-07-03 14:34:53 +03:00
Mike
75820c3bdf
Fixed overlapped text display in adventure map settings
2023-06-25 16:27:00 -07:00
Ivan Savenko
e0ea994656
Moved some pathfinding options to game settings
2023-06-25 17:42:36 +03:00
Ivan Savenko
f7b27da00e
Implemented support for "coast visitable" objects:
...
- objects marked as coast visitable can be visited from land even when
placed in water
- added isBlockedVisitable and isCoastVisitable method to
CGObjectInstance
- implemented json config for these properties in banks
2023-06-25 17:42:33 +03:00
krs
afe0146021
Renamed settings option to reflect that same option is used for both ranges.
2023-06-23 19:50:39 +03:00
Ivan Savenko
56680e102d
Merge pull request #2245 from IvanSavenko/platform_settings
...
Allow defining default values of settings per platform
2023-06-23 13:32:30 +03:00
Ivan Savenko
69dc95c3c8
Merge pull request #2235 from IvanSavenko/hota_h3m_support
...
Hota h3m support
2023-06-23 13:32:10 +03:00
Mike
fe535ec470
Updated settings.json
...
Corrected comma related formatting errors
2023-06-21 16:05:29 -07:00
Ivan Savenko
8f602b2ef6
Allow defining default values of settings per platform
2023-06-21 10:55:30 +03:00
Ivan Savenko
ffdac314e9
Added selection of long touch duration
2023-06-20 19:58:05 +03:00
Ivan Savenko
d1917898a9
Update validation schemas
2023-06-20 19:37:27 +03:00
Ivan Savenko
3913b8e98c
Heroes placed on water in map will be automatically given boat
2023-06-20 19:37:27 +03:00
Ivan Savenko
d4728f78ce
Support for hota victory conditions
2023-06-20 19:37:27 +03:00
Ivan Savenko
c43783db58
Use string ID's instead of raw strings for win/loss conditions
2023-06-20 19:37:27 +03:00
Ivan Savenko
5118a642bc
Fix duplicated randomResource object
2023-06-16 18:00:19 +03:00
Ivan Savenko
77b58bc66d
Cleaned up object constructors to reduce duplicated code
2023-06-16 17:59:50 +03:00
Ivan Savenko
4d947be287
Adventure map shipyard nwo has configurable boat type
2023-06-16 17:59:50 +03:00
Ivan Savenko
487f441f47
Implemented boat selection for town shipyards
2023-06-16 17:59:49 +03:00
Ivan Savenko
a94b68e6aa
Hill fort upgrade costs are now loaded from json
2023-06-16 17:59:10 +03:00
Ivan Savenko
2e7c382612
Moved creature upgrade logic to CGObjectInstance inheritors
2023-06-16 17:59:10 +03:00
Ivan Savenko
fc190b14bb
Spell shrines can now be configured in json
2023-06-16 17:59:10 +03:00
Ivan Savenko
8614419954
Merge pull request #2208 from IvanSavenko/obstacles_foreground
...
Implemented foreground/background obstacles
2023-06-14 15:49:08 +03:00
DjWarmonger
3be7720868
Merge pull request #2218 from vcmi/pregenerate_treasures
...
Okay, merging this for PvP feedback.
2023-06-13 20:46:34 +02:00
krs
9496cb4058
rangedFullDamageLimitHighlightOnHover is now turned off by default
2023-06-11 19:36:46 +03:00
krs
5158a5f7db
Fix After Merge
2023-06-11 19:31:50 +03:00
krs
d622bc613a
Fix after options merge.
2023-06-11 18:42:58 +03:00
krs
c0591573bf
Working Version
2023-06-11 18:40:47 +03:00
Tomasz Zieliński
f4dc8e6529
Limit morale / bonusing objects to one per zone
2023-06-10 14:58:50 +02:00
Tomasz Zieliński
6ed1dab3fb
Add random resource to RMG pool
2023-06-08 19:04:44 +02:00
Ivan Savenko
428fb832c6
Implemented foreground/background obstacles:
...
- obstacles now have "foreground" field
- if "foreground" field set, obstacle will appear on top of other
objects, such as units
- if "foreground" is not set, obstacle will appear below units
- updated schema and cleared up obstacles config
2023-06-06 15:53:14 +03:00
Ivan Savenko
18105aa96d
Minor fixes for settings window
2023-06-05 21:19:10 +03:00
Ivan Savenko
238a02eb5e
It is now possible to cancel attack-via-swiping by moving finger away
2023-06-05 19:20:20 +03:00
Ivan Savenko
6283329aeb
Added option to disable edge scrolling
2023-06-05 19:20:20 +03:00
Ivan Savenko
a08ff1e6ef
Removed no longer used touchscreen option
2023-06-05 19:20:08 +03:00
Ivan Savenko
b20109c830
Test version of swipe gesture for in-combat attacks
2023-06-05 19:20:08 +03:00
Ivan Savenko
70155b48e1
Only show touchscreen options on systems that have one
2023-06-05 19:20:08 +03:00
Ivan Savenko
2c7b94d17f
Remove unused map swipe option
2023-06-05 19:20:08 +03:00
Ivan Savenko
526ce1b546
Merge pull request #2177 from krs0/feature/Move_battle_fake_lables_into_separate_group
...
Move battle fake labels into separate group, and small fixes
2023-06-05 18:56:38 +03:00
Ivan Savenko
3519fd8302
Added view patterns for hota terrains
2023-05-31 23:18:39 +03:00
Ivan Savenko
952708e865
Basic version of object templates mapping
2023-05-31 23:18:39 +03:00
Ivan Savenko
ffd7144df8
Implemented identifiers mapping for town buildings
2023-05-31 23:01:57 +03:00
Ivan Savenko
927fcc7d45
Removed hota objects desription, will be added to hota mod instead
2023-05-31 23:01:57 +03:00
Ivan Savenko
daaaf84392
Icon index for map format is now defined in config
2023-05-31 23:01:57 +03:00
Ivan Savenko
fb55719671
Map format support status can now be loaded from gameSettings
2023-05-31 23:01:57 +03:00
Ivan Savenko
eff6551f80
Merge pull request #2171 from krs0/feature/schema_updates
...
Rearranging Schemas
2023-05-29 15:37:50 +03:00
DjWarmonger
c99aa74434
Merge pull request #2053 from vcmi/parellel_rmg
...
Okay, let's merge this.
2023-05-29 13:50:02 +02:00
krs
6daa933aa2
Fixed errors and added a line after CreatureNumbersToggleGroup to separate them visually from next element.
2023-05-24 20:16:49 +03:00
krs
a7606010ee
Moved creatureInfo into a group for easier calculations
2023-05-24 20:16:49 +03:00
Tomasz Zieliński
0e37c7b7d0
By deafult use multithreaded RMG
2023-05-24 18:16:04 +02:00
Ivan Savenko
d18b240d6d
Added separate borderless & exclusive fullscreen options
2023-05-19 22:43:52 +03:00
Ivan Savenko
f2dfd6de42
Updated settings window to use new layouts & library
2023-05-19 22:43:52 +03:00
Ivan Savenko
7cbfd8117e
Implemented simple layout to simplify widget json definitions
2023-05-19 22:43:52 +03:00
Ivan Savenko
7cd898a87a
Implemented "customTypes" in UI json to reduce duplicated definitions
2023-05-19 22:43:52 +03:00
krs
289a6da3d7
Merge fix for battlefield
2023-05-19 21:23:08 +03:00
krs
105dcf5a9f
Fixed white spaces
2023-05-19 21:14:01 +03:00
krs
2e6cae80a9
Schemas rearranged
...
Artifact Schema rearranged
Battlefield schema rearanged
Bonus schema rearranged
Faction Schema rearanged
Hero Schema rearranged
HeroClass schema rearranged
MapHeader schema updated, something fishy in events
Mod schema updated. Settings not complete
Object schema rearranged
Object schema rearranged
object type schema rearranged
obstacles schema rearranged
Rivers schema updated
roads schema updated
script schema updated
skill schema updated
spell schema updated
template schema update
terrain schemas updated
town buildings schema update
town siege schema updated
town structure schema updated
2023-05-19 21:04:47 +03:00
Ivan Savenko
805721f8d7
Add missing check for file presence
2023-05-16 21:58:09 +03:00
Ivan Savenko
c45d4f8d22
Few more fixes to building ordering
2023-05-15 22:22:54 +03:00
Ivan Savenko
ca19fc7fcc
Backported minor z-ordering fixes from hota mod
2023-05-15 22:22:54 +03:00
Ivan Savenko
5e3a0a1a75
Fixed json validation
2023-05-15 22:22:54 +03:00
Ivan Savenko
b9f18288f9
Fix duplicated widget name in settings window
2023-05-12 22:58:36 +03:00
Ivan Savenko
edd5d11734
Fix issues discovered by self-review
2023-05-09 13:10:33 +03:00
Ivan Savenko
7228b08d1d
Implemeted runtime generation of player-colored background texture
2023-05-09 13:10:33 +03:00
Ivan Savenko
342ea138f9
Fix remaining graphical artifacts on switching from world view
2023-05-09 13:10:33 +03:00
Ivan Savenko
8e320d8454
Fixed world view mode
2023-05-09 13:10:33 +03:00
Ivan Savenko
5ae507505a
Fixed toggleable buttons (sleep/wake & subterra/surface)
2023-05-09 13:10:33 +03:00
Ivan Savenko
a0f1bf3928
Implemented user-selectable UI scaling mode
2023-05-09 13:10:33 +03:00
Ivan Savenko
97426a3f7c
Implemented disabling of buttons based on condition
2023-05-09 13:10:33 +03:00
Ivan Savenko
d4098059b8
Proper support for player-colored buttons in UI
2023-05-09 13:10:33 +03:00
Ivan Savenko
019d7b6811
Integrated shortcuts into adventure window configuration
2023-05-09 13:10:33 +03:00
Ivan Savenko
63a1efbdc2
Fixed system options window
2023-05-09 13:10:33 +03:00
Ivan Savenko
a4b102e46f
Implemented UI scaling (non-selectable option for now)
2023-05-09 13:10:33 +03:00
Ivan Savenko
d96edd9f56
Added larger town list for higher resolutions
2023-05-09 13:10:33 +03:00
Ivan Savenko
4958190e82
Fixed visibility of corner gems
2023-05-09 13:10:33 +03:00
Ivan Savenko
a015bf6507
Initial part of dynamically-sized adventure map:
...
- removed no longer used CConfigHandler
- remove no longer use resolutions.json
- moved widget management from adventure map to a separate class
- adventure map layout is now loaded from config
2023-05-09 13:10:33 +03:00
Konstantin P
057a33c508
SpellSchool: use identifier instead of int
...
Needs redifinition of MAGIC_SCHOOL_SKILL in all mods
2023-05-07 20:37:32 +03:00
Konstantin P
9e1cdc410f
vcmi: replace school bonuses to unified ones
...
Except immunity now
2023-05-05 21:30:45 +03:00
Konstantin
b0d2787e86
vcmi: remove DIRECT_DAMAGE_IMMUNITY bonus
...
Replace by SPELL_DAMAGE_REDUCTION bonus with 100 value
2023-05-05 18:57:40 +03:00
Ivan Savenko
4c93b8f3f2
Use separate json for vcmi-1.3
2023-05-04 19:38:36 +03:00
Konstantin
05eccbc2bb
vcmi: split bonus to enumerator and HeroBonus.h
2023-05-03 18:01:06 +03:00
Ivan Savenko
916b41d9a7
Merge pull request #2078 from IvanSavenko/shortcuts
...
Basic shortcuts system
2023-05-01 21:45:52 +03:00
nordsoft
b6270fae49
Remove deprecated from config
2023-05-01 21:49:37 +04:00
nordsoft
eb577a03b5
Deprecating enum constants
2023-05-01 21:49:37 +04:00
nordsoft
32277a007d
Fix compilation after merge
2023-05-01 21:49:37 +04:00
nordsoft
68fa7aaf35
Remove limitations for amount of skills
2023-05-01 21:49:37 +04:00
nordsoft
a4fd6c1c92
Move trading window title to config
2023-05-01 21:49:37 +04:00
nordsoft
193cf6676a
Adjust config for markets
2023-05-01 21:49:37 +04:00
Ivan Savenko
e9e5355af0
Added commented-out wog campaigns set
2023-05-01 18:00:35 +03:00
Ivan Savenko
6c637dd8e6
Integrated hotkeys with InterfaceObjectConfigurable
2023-05-01 17:59:21 +03:00
Ivan Savenko
832e56e005
Implementation of (very basic) shortcuts system
...
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
2023-05-01 17:58:17 +03:00
nordsoft
9dbac414fc
Remove tmg limits
2023-04-20 20:44:25 +04:00
nordsoft
008db447e7
Minor changes
2023-04-19 02:11:24 +04:00
nordsoft
d1dacd45e2
Animations from config
2023-04-19 00:14:15 +04:00
Ivan Savenko
e3ed728193
Merge pull request #1932 from rilian-la-te/proper-teleport
...
VCMI: teleport redesign
2023-04-16 22:52:01 +03:00
Ivan Savenko
ac8952d6cf
Added list of H3 objects for reference
2023-04-15 17:20:38 +03:00
Ivan Savenko
44b83b2e11
Merge master -> develop
2023-04-14 16:51:35 +03:00
Ivan Savenko
beb9069f78
Do not allow targeting enemy corpses for Demon summon
2023-04-13 19:07:46 +03:00
Konstantin P
384ee99834
vcmi: configurable teleport v2
...
1. Redesign wall and teleport penalty using shortest path
This will avoid OH3 exploits with teleport inside walls
2. Teleport is now configurable
2023-04-13 11:24:19 +03:00
Konstantin
198df21ae3
vcmi: remove old landmine property
2023-04-13 11:24:19 +03:00
Nordsoft91
3951bbb395
Merge pull request #1108 from Nordsoft91/battle-dialog
...
[HDMod features] Quick combat
2023-04-11 21:18:04 +04:00
Ivan Savenko
dfa2e2a349
Merge beta into develop
2023-04-11 19:37:35 +03:00
nordsoft
bfc75ccd39
Merge remote-tracking branch 'upstream/develop' into battle-dialog
2023-04-11 02:22:42 +04:00
Konstantin
b82374c4a9
config: Orb of Vulnerability should block all resistances
...
Just set MAGIC_RESISTANCE and SPELL_RESISTANCE_AURA to 0
by INDEPENDENT_MIN, will work.
2023-04-10 22:07:22 +03:00
Ivan Savenko
e2d0cd37e4
Merge pull request #1910 from IvanSavenko/beta_fixes
...
Fixes for 1.2 branch
2023-04-09 20:09:03 +03:00
Ivan Savenko
a6ce99573c
Added fallback identifiers for reading older vcmi maps
2023-04-09 12:27:33 +03:00
krs
709a8a6eb3
movementHighlightOnHover is now saved with settings
2023-04-08 20:42:16 +03:00
krs
1644cab938
Added combat option Highlight Movement on Hover
2023-04-08 20:40:30 +03:00
Ivan Savenko
454168897e
Fix handling of invalid hotkeys in configurable UI
2023-04-08 19:53:13 +03:00
nordsoft
52b53ab307
Feature and setting implemented
2023-04-08 01:49:59 +04:00
nordsoft
ece8a2a41f
Merge branch 'battle-dialog' into battle-dialog2
...
# Conflicts:
# AI/BattleAI/BattleAI.h
# AI/StupidAI/StupidAI.h
# client/CPlayerInterface.cpp
# client/CPlayerInterface.h
# client/Client.cpp
# client/NetPacksClient.cpp
# client/battle/CBattleInterface.cpp
# client/battle/CBattleInterface.h
# client/battle/CBattleInterfaceClasses.cpp
# client/battle/CBattleInterfaceClasses.h
# config/schemas/settings.json
# lib/CGameInterface.h
# lib/IGameEventsReceiver.h
# lib/NetPacks.h
# lib/NetPacksLib.cpp
# lib/battle/BattleInfo.cpp
# server/CGameHandler.cpp
# server/CQuery.h
2023-04-06 19:53:52 +04:00
Ivan Savenko
307065a633
Merge beta into develop
2023-04-04 16:06:20 +03:00
Ivan Savenko
d6cb513374
Merge pull request #1858 from IvanSavenko/sliders_fix
...
Allow defining active areas for sliders.
2023-04-04 11:21:45 +03:00
Andrii Danylchenko
10bf9bc7a0
Merge pull request #1678 from vcmi/nkai-fix-build
...
NKAI: more fixes to defense and pandora
2023-04-03 22:39:11 +03:00
Ivan Savenko
191959ae05
Fixed moat identifiers requests - will now always request spells
2023-04-03 15:15:12 +03:00
Konstantin
76bddf97bd
gameConfig.json: add missing comma
2023-04-02 23:53:47 +03:00
Ivan Savenko
507d8bf7fd
Allow defining active areas for sliders. Fixes settings window.
2023-04-02 22:24:07 +03:00
Ivan Savenko
efbc5cf581
Merge pull request #1815 from IvanSavenko/beta_fixes
...
Beta fixes
2023-04-02 20:02:41 +03:00
Andrii Danylchenko
88fb532d90
NKAI: more fixes to defense and pandora
2023-04-02 10:02:33 +03:00
Ivan Savenko
cfe4cad8cb
Merge pull request #1818 from rilian-la-te/beta-fixes
...
config: CATAPULT_EXTRA_SHOTS should be hidden
2023-04-01 23:09:38 +03:00
Konstantin
766f599e41
config: CATAPULT_EXTRA_SHOTS should be hidden
2023-04-01 00:21:34 +03:00
Ivan Savenko
220f4531a1
Changed default mod repository path
2023-03-31 23:18:45 +03:00
Ivan Savenko
e3b1b0fbd6
Removed hardcoded texts
2023-03-31 23:18:45 +03:00
Konstantin
d8a237ba46
vcmi: add getTrigger method to obstacles
...
Fixes advanced remove obstacle spell
2023-03-31 01:01:26 +03:00
Konstantin
82a6d94fd0
moats: indentation
2023-03-31 01:01:26 +03:00
Konstantin
ecae600563
effects: Moat now includes battlefield bonus
...
This is an implementation which works exactly like in H3
2023-03-31 01:01:25 +03:00
Konstantin
f704a17e1a
vcmi: add a last hex setting
...
I consider this behaviour as H3 bug, but this is H3.
So, added a setting to disable this behaviour.
2023-03-31 01:01:25 +03:00
Konstantin
c4d5a7a2d6
vcmi:towns now can choose if moat render is needed
...
Using invalid points. Also removed unused variable.
2023-03-31 01:01:25 +03:00
Konstantin
a639bd2606
spells: rework isMagical()
...
Now it is a flag of a spell, and not a target condition.
This fixes resistance to bind effect
2023-03-31 01:01:25 +03:00
Konstantin
aab5b47038
vcmi: setup moats using MoatAbility
...
Setup moats using moat ability, need playtest for now.
-3 to defence not added for now.
2023-03-31 01:01:25 +03:00
Konstantin
50dab1f049
vcmi: convert fireWall and landMine
...
convert fireWall and landMine to new
trigger system. Now landmines correctly removed
after exploding
2023-03-31 01:01:25 +03:00
Ivan Savenko
4f703df4ac
Removed old bonuses data
2023-03-31 00:16:27 +03:00
Konstantin
57c35f39ca
WIP: Moat placer
2023-03-30 14:41:40 +03:00
Ivan Savenko
9e75568574
Fixed Roland's specialty to use Swordsmen instead of Griffins
2023-03-30 12:19:31 +03:00
Ivan Savenko
8a3e1b0230
Merge pull request #1789 from IvanSavenko/beta_fixes
...
Fixes for 1.2 release
2023-03-30 00:09:51 +03:00
Ivan Savenko
be52d46981
Fix Whirlpool sounds
2023-03-28 19:05:38 +03:00
Ivan Savenko
6d04c0b4db
Fix affinities of Dungeon heroes
2023-03-28 18:58:30 +03:00
Ivan Savenko
21ea50ca1e
Check obstacle image for existance in schema
2023-03-28 17:02:18 +03:00
Ivan Savenko
b3b2426b19
Updated mod.json schema
2023-03-27 22:33:36 +03:00
Ivan Savenko
b2f5042942
Merge pull request #1783 from vcmi/beta
...
Merge beta -> develop
2023-03-27 21:21:25 +03:00
Ivan Savenko
d1f6497bc8
Merge pull request #1768 from vcmi/default_ai
...
Make NKAI default AI
2023-03-27 21:20:01 +03:00
Ivan Savenko
b875da108b
Merge pull request #1717 from SoundSSGood/backpack-limit-size
...
Introducing backpack size limit functionality
2023-03-27 17:17:49 +03:00
Konstantin
a75ff91a50
vcmi: remove old string from config
2023-03-26 21:17:58 +03:00
Ivan Savenko
7fd0d0beb1
Made English first language so invalid values would reset to it
2023-03-25 23:54:51 +02:00
Ivan Savenko
a0bd46c9dd
Fix teleport animation speed
2023-03-25 23:54:51 +02:00
Tomasz Zieliński
ab57941f0a
Make NKAI default AI.
2023-03-25 12:17:35 +01:00
SoundSSGood
96e8a1f21c
Backpack limit part1 (move, disassemble)
2023-03-21 12:14:33 +02:00
Konstantin
895572df02
vcmi: fix first aid regression
2023-03-19 19:20:08 +03:00
Konstantin
a1f3dd31e8
fix commander jousting
2023-03-17 21:03:47 +03: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
Konstantin
77ebe05491
defaultMods: comment army movement
2023-03-16 17:58:46 +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
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
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
930955f268
vcmi: deprecated bonus converter
...
It converts almost all sorts of deprecated bonuses from mods
when loading json. It can print to console correct new variant
or bonus.
Also removed a bunch of deprecated bonuses from list.
It will break saves!!!
2023-03-16 16:46:41 +03:00
Konstantin
95503d0623
vcmi: unify movement
...
1. Now there is only one bonus: MOVEMENT, with 2 subtypes: 0 is sea, 1 is land
For movement value on land depends on creature speed we use a new
ARMY_MOVEMENT updater with global bonus. If we does not like such
dependency, we can just remove this updater from json.
2. All specialities and secondary skills for movement moved to new
system AFAIK
2023-03-16 16:46:41 +03:00
Konstantin
20a9332a3f
vcmi: translate wisdom
...
Make wisdom as separate bonus. It will be enough for now. But
next is should be done as IsLearnable for each spell.
2023-03-16 16:46:41 +03:00
Konstantin
ddcff9dc36
vcmi: convert magic schools to MAGIC_SCHOOL_SKILL
...
It is already used by battlefields.
2023-03-16 16:46:41 +03:00
Konstantin
64ad7558c6
vcmi: skill-agnostic artillery
...
Now it should work for any creature and with any damage percentage.
2023-03-16 16:46:41 +03:00
Konstantin
9205ef2c91
vcmi: skill-agnostic ballistics
...
Made ballistics by using spell action and more code is shared now.
2023-03-16 16:46:41 +03:00
Konstantin
84f53485e2
vcmi: skill-agnostic first aid
...
Now first aid is passive battle spell, and skill just bumps
specific spell power for this spell. Everything about healing
is handled into Heal spell effect.
2023-03-16 16:46:41 +03:00
Konstantin
a0987313ba
vcmi: convert intelligence
...
Intelligence is converted to both global effect and skill bonus
Bonus name HERO_MANA_PER_TEN_KNOWLEDGE is a little weird, but works
like old SECONDARY_SKILL_PREMY bonus
2023-03-16 16:46:41 +03:00
Konstantin
a86e12cd42
vcmi: convert necromancy
...
Now it is 3 bonuses to cover necromancy.
1. IMPROVED_NECROMANCY = possible creatures raized (affected by cloak)
2. UNDEAD_RAISE_CHANCE = raise chance (affected by artifacts)
3. UNDEAD_RAISE_POWER = helper to select creature from first
2023-03-16 16:46:41 +03:00
Konstantin
84eece1d8b
vcmi: convert mysticism to MANA_REGENERATION
...
With PERCENT_TO_TARGET_TYPE it was easy.
2023-03-16 16:46:41 +03:00
Konstantin
f641ed2015
vcmi: convert learning to global effect
...
Now hero experience is a global effect, and secondary
skill gives exactly same bonus. Can be modified by
PERCENT_TO_TARGET_TYPE.
2023-03-16 16:46:41 +03:00
Konstantin
a85f3b63ec
vcmi: reuse SPELL_DAMAGE for sorcery
...
Now there is no need for specific spell bonus, and
we need to simply reuse SPELL_DAMAGE, and by using
PERCENT_TO_TARGET_TYPE speciality will work.
2023-03-16 16:46:41 +03:00
Konstantin
6b987275eb
vcmi: use global bonuses for sight radius and mana
...
We do not need to hardcode constants for there. We can just
use default bonuses.
2023-03-16 16:46:41 +03:00
Konstantin
5d4bcb3c78
vcmi: fix scouting bonus spelling error
...
With fallback for old mods.
2023-03-16 16:46:41 +03:00
Konstantin
f264c541fb
vcmi: skill-agnostic tactics
...
Tactics is split to 2 bonuses, and it is now possible to
block tactics without having tactics itself. But tactics
for two sides is not implemented, because it is huge rework
and not high priority for me now, I want to do basic
secondary skill rework first.
2023-03-16 16:46:41 +03:00
Konstantin
300a8a15ba
vcmi: remove estates bonus
...
Now it is handled by GENERATE_RESOURCE::GOLD.
2023-03-16 16:46:41 +03:00
Konstantin
c64d05c419
vcmi: skill-agnostic diplomacy
...
This is simple and will work.
2023-03-16 16:46:41 +03:00
Konstantin
34a26580a7
vcmi: skill-agnostic resistance
...
Uses exiting bonus and new PERCENT_TO_TARGET_TYPE value type
2023-03-16 16:46:41 +03:00
Konstantin
6e4372176a
vcmi: skill-agnostic pathfinding
...
For now, works exactly as in VCMI and H3.
I think we should add some BONUS_TERRAIN_DISCOUNT_PERCENT bonus
to discount by percent, like written in pathfinding description
2023-03-16 16:46:41 +03:00
Konstantin
9ffd18c914
vcmi: skill-agnostic armorer
...
This is a skill-agnostic armorer, which can be used same as
armorer before.
2023-03-16 16:46:41 +03:00
Konstantin
43f09dd2e4
vcmi: convert scholar to new bonus
...
Convert scholar to new skill-agnostic bonus. Now works only for any
school (not from specific). In all schools form identical to
past's SECONDARY_SKILL_PREMY::SCHOLAR
2023-03-16 16:46:41 +03:00
Konstantin
0ed89e77d4
vcmi: replace archery and offence to new bonus
...
Add PERCENTAGE_DAMAGE_BOOST bonus, which will work exactly as old
archery or offence. Subtype is actually boolean which select
ranged (1) and melee (0)
2023-03-16 16:46:41 +03:00
Konstantin
4a89418ada
vcmi: replace SecondarySkillPremy:EAGLE_EYE
...
Replace this bonus to new ArcaneIntuition bonus, which
will work independently from the rest of skill bonuses.
Proof of concept for other skills.
2023-03-16 16:46:41 +03:00
Konstantin
496c1def12
vcmi: remove FULL_HP_REGENERATION bonus
...
Just set HP_REGENERATION to high number
(in OH3 doubled stack health is sufficient)
2023-03-16 16:46:41 +03:00
Konstantin
62e579f672
vcmi: replace KINGx bonuses to one KING bonus
...
val = level of slayer which require to affect.
Can break saves.
2023-03-16 16:46:41 +03:00
Konstantin
f26fac5562
vcmi: move obligatory marker to CSkillHandler
...
It is working, now it is possible to
define other obligatory skills than wisdom or magic schools,
but only 2 types of obligatory skills exists - like wisdom and
like magic school
2023-03-16 16:46:41 +03:00
Konstantin
9280d70819
vcmi: remove deprecated "specalties" node
...
Use new bonus system format
2023-03-16 16:46:41 +03:00
Konstantin
d9496dd9f7
vcmi: remove vector speciality format
...
It is deprecated and will not be used anymore.
2023-03-16 16:46:41 +03:00