1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Commit Graph

286 Commits

Author SHA1 Message Date
7ffe014d6b Remove allowed artifacts list from arthandler
1. Handlers should not contain non-const game state data
2. This field was duplicating same field in CMap
3. Due to removal of VLC serialization, this field is not updated on map
load leading to issues with artifact randomization
2023-12-11 15:06:04 +02:00
560a1231a6 Fix loading of maps with Grail or Diplomat Suit placed on map 2023-11-27 14:08:49 +02:00
abad4b01ce Remove explicit convesion to int in operators 2023-11-15 15:55:19 +02:00
0842f5afee Removed remaining usages of std::vector<bool> 2023-11-15 15:55:18 +02:00
0691dfef3b Moved stateful artifact randomization logic to gamestate from handler 2023-11-08 21:27:05 +02:00
04aeea9b68 use toEnum instead of getNum for switch'es 2023-11-03 19:20:25 +02:00
2b9c362d5b Explicitly convert identifier to underlying enumeration 2023-11-03 16:03:29 +02:00
7e6ab5e87b fix test & fix build & suggested changes 2023-10-29 17:46:14 +02:00
61fc236d79 ArtifactLocation now use ID for artHolder identification part1 2023-10-29 17:46:13 +02:00
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
b394158dc9 Bonus Source ID now uses metaidentifier 2023-10-22 16:55:18 +03:00
a1a5bc28c2 convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00
aa0b064154 Fixed randomization of artifacts on some custom maps 2023-10-16 00:12:38 +03:00
bcce4c68e5 Artifacts placement fixed 2023-10-05 15:17:02 +03:00
b21a361b99 Merge pull request #2814 from SoundSSGood/arts-counter-impovements
Artifacts counter impovements
2023-10-01 17:53:51 +03:00
a83f290e13 bulk move artifacts only equipped, only backpack 2023-09-19 13:31:42 +03:00
82eb2f8a2b Artifact assembling changes 2023-09-12 19:17:35 +03:00
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
e54287ea5d Converted remaining identifier to new system 2023-08-25 13:38:02 +03:00
62fddca21e Split massive CModHandler class/file into multiple parts:
- IdentifierStorage is now a separate handler in VLC
- Renamed ModHandler::Incompatibility exception to ModIncompatibility
- Extracted ModScope namespace from ModHandler
- Extracted ModUtilities namespace from ModHandler
- Split CModHandler.cpp on per-class basis
- Replaced some direct members with unique_ptr to reduce header includes
2023-07-30 22:17:47 +03:00
025b0814c8 + Handled banning spells and artifacts
+ Rename allowedSpell => allowedSpells
2023-07-17 17:21:28 +02:00
37f3560b9c Fix build in debug mode 2023-07-11 15:21:31 +03:00
9b5f6ec7cf CArtifact getters setters 2023-07-05 15:48:08 +03:00
fd9c7352a0 suggested changes 2023-07-03 22:54:03 +03:00
060aecc61c CArtifact refactoring 2023-06-30 19:41:26 +03:00
d44821e733 CArtifactInstance moved to own file 2023-06-30 19:41:19 +03:00
58fc2efd41 CGrowingArtifactInstance 2023-06-30 19:41:12 +03:00
f8023ad283 CScrollArtifactInstance 2023-06-30 19:41:04 +03:00
07c811dd67 CCombinedArtifactInstance refactoring 2023-06-30 19:40:57 +03:00
b135045dcd cosmetic fixes 2023-06-24 19:01:42 +03:00
8751d9ab8b CArtifactInstance::putAt, CArtifactInstance::removeFrom, CArtifactInstance::move interface unified. Small optimization. 2023-06-24 19:01:36 +03:00
20d86edbd1 crash fixed 2023-06-24 19:01:25 +03:00
f86133705e Fix loading of allowed artifacts from hota h3m 2023-06-20 19:37:27 +03:00
f6c2d5cba7 hotfix 2023-06-07 13:08:04 +03:00
1e9eea30e1 Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop 2023-06-05 18:53:17 +03:00
d6a357fd17 Split some map object files into smaller files. Reduced includes usage. 2023-06-02 21:47:37 +03:00
1366825f08 final fixup 2023-05-24 16:10:06 +03:00
1175990724 fixup 2023-05-19 01:55:11 +03:00
5b281e6a9e setNewArtSlot 2023-05-17 17:02:58 +03:00
f0feeeac6e putArtifact, removeArtifact 2023-05-17 17:01:22 +03:00
021f94a579 artifact utils 2023-05-17 17:00:31 +03:00
05eccbc2bb vcmi: split bonus to enumerator and HeroBonus.h 2023-05-03 18:01:06 +03:00
4aa232a60a Merge pull request #2055 from SoundSSGood/cartifactholder-rework
Artifact related code refactoring part2 (client CArtifactHolder)
2023-05-01 02:33:08 +03:00
881c434833 Fix list of treasures getting overwriteen leading to weird bugs
... such as having Grail in crypts or getting relics as starting
artifact
2023-04-27 23:40:56 +03:00
1f4897e841 CArtifactSet::getSlotByInstance 2023-04-23 14:48:04 +03:00
4bb4d7e7a5 Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
Artifact related code refactoring part1 (initial)
2023-04-19 15:31:11 +03:00
a1e8d95028 vcmi: rework CArtHandler 2023-04-17 12:32:47 +03:00
7a5775a9f9 vcmi: use std::optional 2023-04-17 00:43:13 +03:00
9a838598a6 arts refactoring part1 2023-04-15 00:10:39 +03:00