DjWarmonger
0763b9a758
- Implemented object per zone limit
...
- Various tweaks for Travis & repo
2014-07-15 22:33:51 +02:00
DjWarmonger
090abf41e8
Fixed sealing off parts of zones.
2014-07-15 19:52:58 +02:00
DjWarmonger
128b63a285
Fixed tiles around unguarded objects -> denser zones, less misplaced guards.
2014-07-15 19:10:03 +02:00
DjWarmonger
e8580229dc
RMG will now actually use all the settings from pregame. Till now it did not.
2014-07-15 16:44:07 +02:00
DjWarmonger
ca7fe822eb
Removed treacherous randomized constructor.
2014-07-15 15:41:53 +02:00
DjWarmonger
be8c9c8378
Correct strength of zone guards. Logs for guard strength.
2014-07-15 14:38:05 +02:00
DjWarmonger
173111955e
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-07-15 12:27:59 +02:00
DjWarmonger
3a19bf964a
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2014-07-15 11:50:50 +02:00
Ivan Savenko
92d22bae63
Merge branch 'feature/creatureWindow' into refactoring/guiClasses
2014-07-14 17:23:24 +03:00
Michael Pavlyshko
f7d8faa540
install only .dll (without .dll.a)
2014-07-11 17:27:50 +03:00
Michael Pavlyshko
bad7050096
spaces -> tabulation
2014-07-11 11:01:03 +03:00
Michael Pavlyshko
c25ccc2acb
Rename: vcmi.dll -> VCMI_lib.dll, vcmilauncher.exe -> VCMI_launcher.exe
2014-07-11 01:09:00 +03:00
Michael Pavlyshko
c935193558
disable WIN32 flag for executables, fix previous commit
2014-07-10 00:47:22 +03:00
DjWarmonger
966873181f
Do not let monsters or treasures spawn near already placed monsters.
2014-07-09 22:09:06 +02:00
DjWarmonger
6c0a396094
Corrected y-axis orientation, now object placement is correct.
2014-07-09 16:39:17 +02:00
DjWarmonger
492b866806
- Fixed crash caused by randomShuffle
...
- Banned Magic Spring as it has 2 visitable positions
2014-07-09 14:27:12 +02:00
DjWarmonger
8d58ce08aa
Correct position of blocked tiles.
2014-07-09 12:05:14 +02:00
DjWarmonger
927e16d9f5
Almost correct placement of all objects.
2014-07-09 11:38:16 +02:00
DjWarmonger
2a8ae6310e
Better object placement and accessibility.
2014-07-09 09:22:50 +02:00
Michael Pavlyshko
3443ba5bb3
fix libvcmi linking
2014-07-09 01:43:13 +03:00
DjWarmonger
22d26db694
Correct placement of non-overlapping objects.
2014-07-08 20:13:51 +02:00
DjWarmonger
8a8cda950d
Fix for previous commit.
2014-07-08 13:17:47 +02:00
DjWarmonger
b9a01fbffe
Make sure main town is accessible.
2014-07-08 12:28:50 +02:00
DjWarmonger
d3f97829a1
Prevent RoE elemental dwellings from spawning.
2014-07-08 11:57:02 +02:00
DjWarmonger
82ccf240f0
Fixed fractalize algorithm - better treasure density.
2014-07-08 11:28:55 +02:00
DjWarmonger
3fb498713a
Fixed placement of large obstacles.
2014-07-08 08:59:13 +02:00
Michael Pavlyshko
820eceb8ad
Add VCMI_DLL flag for libvcmi
2014-07-08 01:50:44 +03:00
DjWarmonger
866cd6f540
Allow underground zones to connect more easily. Regression: Obstacles spawn at zone boundaries.
2014-07-07 18:01:15 +02:00
DjWarmonger
ced3d32f3f
Scale dwelling / pandora with creatures value according to number of native zones.
2014-07-07 16:20:48 +02:00
DjWarmonger
4cea0a2973
Zone dwellings will now match first town.
2014-07-07 11:29:16 +02:00
Ivan Savenko
aaf314baf4
Source ID from bonusing objects is not object index but object type. Fixes at least partially #1822
2014-07-07 08:29:07 +03:00
DjWarmonger
f65239b51f
- Added faction-specific dwellings
...
- Fixed generation of terrain-specific objects
2014-07-06 22:14:37 +02:00
DjWarmonger
f3ccdc8a21
Even distribution for surface / underground zones.
2014-07-06 10:43:30 +02:00
DjWarmonger
cbd2d74292
Generate random Pandora boxes.
2014-07-06 07:15:52 +02:00
DjWarmonger
0782557814
- Place all standard visitable objects
...
- Fixed some constructors
2014-07-05 19:36:12 +02:00
DjWarmonger
9cfbbb2048
Merge underground maps with develop. There is a serious issue with rendering rock tiles, which may cause crash.
2014-07-05 15:22:53 +02:00
DjWarmonger
d942858ef9
Throw exception when there are not enough two-way monoliths available.
2014-07-04 14:46:02 +02:00
DjWarmonger
05c2a4e716
Better gravity-based algorithm.
2014-07-04 11:51:28 +02:00
Ivan Savenko
20f7071d11
Implemented stack experience/commander experience display for window
2014-07-04 12:48:09 +03:00
DjWarmonger
5fb07ded38
Correct underground terrains. More improvements for connection placement.
2014-07-04 10:45:00 +02:00
DjWarmonger
d4d3f1a568
More tweaks.
2014-07-04 09:54:55 +02:00
DjWarmonger
ab748ae221
Somewhat better gate placement, attempt to add rocky tiles to underground zones.
2014-07-03 23:11:24 +02:00
DjWarmonger
d118fbffe8
Correct placement of subterranean gates.
2014-07-03 17:24:28 +02:00
DjWarmonger
60a5c764b8
Correct zone placement & sizing for underground maps.
2014-07-03 12:28:51 +02:00
DjWarmonger
cc8d484775
Refacoring, tweaks.
2014-07-03 09:39:26 +02:00
AlexVinS
9797372dbe
Implement Unicode support for ingame console
2014-07-02 19:16:05 +04:00
AlexVinS
195eae48ca
Merge branch 'develop' into SDL2
...
Conflicts:
client/CPlayerInterface.cpp
2014-07-02 17:15:12 +04:00
DjWarmonger
abd6fe73dd
Version 0.96 release.
2014-07-01 19:32:31 +02:00
DjWarmonger
cc294b3ae7
Version 0.96 release.
2014-07-01 19:30:31 +02:00
Ivan Savenko
cc349fa64f
Fixed Faerie Ring bonus, removed unused code
2014-07-01 18:19:51 +03:00
Ivan Savenko
c956b3f02a
Fixed #1820 , better detection of object below cursor that uses same logic as renderer
2014-07-01 17:19:08 +03:00
DjWarmonger
bae9f2083f
Workaround for hero & town issue. Game still crashes elsewhere, though.
2014-07-01 12:07:53 +02:00
DjWarmonger
54390ea81c
Merge branch 'develop' into RMG
2014-07-01 08:25:53 +02:00
DjWarmonger
bda71bed83
Uploading misc tweaks.
2014-07-01 07:07:40 +02:00
Ivan Savenko
db221829aa
Modding-related bugfixes:
...
- hero classes will be loaded correctly
- objects without index will have correctly assigned ID's
2014-06-30 17:13:01 +03:00
AlexVinS
50dfe05cd1
[C::B] Small projects fix
2014-06-30 11:19:55 +04:00
DjWarmonger
a556ef64e9
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-30 06:45:35 +02:00
Ivan Savenko
a1fff864e6
Fixed missing names for dwellings and creature banks
2014-06-30 00:16:45 +03:00
Ivan Savenko
f01ab0d48f
Fixed rest of reported on forums bugs in rewardables
2014-06-29 20:13:25 +03:00
Ivan Savenko
1157111fcf
More bugfixing:
...
- Fixed compile in VCAI (precompiled headers should not include VCMI headers)
- Fixed crash on visiting observatories, including shroud of darkness
2014-06-29 17:23:06 +03:00
DjWarmonger
7dbe2f5c40
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-28 16:31:06 +02:00
Ivan Savenko
917b1ffca8
Bugfixing:
...
- Added missing types for serialization
- Fixed possible crash in removable objects (campfire)
- Fixed typo in bank config
2014-06-28 17:21:38 +03:00
DjWarmonger
920f56969b
Create random obstacles that match terrain.
2014-06-28 09:46:32 +02:00
DjWarmonger
7aa8213cd5
Tweaked templates to allow all map sizes.
...
To be released as 0.95c.
2014-06-27 21:48:17 +02:00
DjWarmonger
90b72a7856
Workaround with Obelisks. Kill me later.
2014-06-27 20:28:21 +02:00
DjWarmonger
383280f72a
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 18:26:43 +02:00
Ivan Savenko
f01e30a3b1
Added random objects to configs. For now as separate "random handlers", should be merged into main handlers later
2014-06-27 19:15:47 +03:00
DjWarmonger
ccb475b699
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-27 06:24:05 +02:00
Ivan Savenko
bac83d8bd0
Compatiblity for last version of Cove (and likely any other town mods)
2014-06-27 00:07:09 +03:00
DjWarmonger
57fa905a2b
Something that compiles.
2014-06-26 22:05:27 +02:00
DjWarmonger
e51e2190fd
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-26 20:12:37 +02:00
AlexVinS
aea5a7ba75
add comment. no code changes.
2014-06-26 20:49:18 +04:00
AlexVinS
c28b5f6633
fix mingw build
2014-06-26 20:41:27 +04:00
Ivan Savenko
00b6232ff6
Replaced usage of DLL_LINKAGE with ELF_VISIBILITY in netpacks. Please make sure that compilation now works on all platforms
2014-06-26 18:34:54 +03:00
Haryaalcar
ce6940e272
build fix for mac os:
...
1) type_info visibility for CatapultAttack
2) using IObjectInfo::CArmyStructure in min_element : operator< should be const
2014-06-26 01:24:48 +03:00
Ivan Savenko
955552488e
- H3M parser will create objects that don't have data in map file via
...
object handler.
- Added large number of missing objects to config
2014-06-25 20:26:47 +03:00
Ivan Savenko
32240da34e
Reduced number of #include's in headers. May break compilation on Win
...
since some net packs now need DLL_LINKAGE
2014-06-25 17:11:07 +03:00
Ivan Savenko
3b0ecee678
Ugly workaround for DLL_LINKAGE issue. Should be removed once I figure
...
out what's triggering it.
2014-06-25 00:37:33 +03:00
Ivan Savenko
a0689fa377
Refactoring of hoverText from objects:
...
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
2014-06-24 20:39:47 +03:00
Ivan Savenko
ad632d1e8a
Moved FoW management from CGObjectInstance to callback
2014-06-24 20:39:47 +03:00
Ivan Savenko
5ebc0e8614
First part of object instance API cleanup
...
- removed passability() method in favour of passableFor(PlayerColor)
- moved operator < code to map handler
- updated class documentation
2014-06-24 20:39:47 +03:00
AlexVinS
4e4ba6654c
fix Eye of magi, also fix #1608
...
Conflicts:
lib/CObjectHandler.cpp
2014-06-24 18:20:28 +04:00
AlexVinS
c7772aa5a4
Merge branch 'develop' into SDL2
...
Conflicts:
lib/NetPacks.h
lib/NetPacksLib.cpp
2014-06-24 18:19:57 +04:00
AlexVinS
c7dc4c05b8
fix mingw build
...
(?) does this brake *nix build?
2014-06-24 18:17:25 +04:00
AlexVinS
b371c7ef74
fix build
2014-06-24 15:23:37 +04:00
AlexVinS
3b8d0e44d4
Merge branch 'develop' into SDL2
2014-06-24 14:09:44 +04:00
Ivan Savenko
13bc4cb24f
Added -fvisibility=hidden parameter for gcc.
...
Should help a bit with endless missing DLL_LINKAGE attributes and
(according to gcc docs) help a bit with library loading times.
2014-06-24 00:05:53 +03:00
DjWarmonger
79036484dd
Trying to sort out project changes and compile issues.
2014-06-23 19:58:19 +02:00
Ivan Savenko
db49798b4d
Fixed random artifact selection
2014-06-23 20:47:09 +03:00
Ivan Savenko
7c52db923a
Removed mods compatibility code from 0.95
2014-06-23 20:47:09 +03:00
Ivan Savenko
06d17f709d
fixed compatibility code for resource-granting buildings
2014-06-23 20:47:09 +03:00
AlexVinS
46d92f11cb
Project update, fix build
...
(!) register types as usual too huge
2014-06-23 10:24:49 +04:00
Ivan Savenko
c605e2d10c
Gcc compile & warning fixes
2014-06-22 17:26:08 +03:00
DjWarmonger
901188e2e1
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-22 14:53:51 +02:00
DjWarmonger
3ac306f501
Merge pull request #19 from vcmi/feature/mapObjects
...
Feature/map objects
2014-06-22 14:49:42 +02:00
Ivan Savenko
ab475195ac
Banks now use new scheme as well
...
- Implemented Bank Constructor object.
- Merged Pyramid object into common Bank class. Banks can now grant
spells as part of their reward.
- Move bank config code to config/objects/creatureBanks.json. Note: WoG
banks are not updated yet, should be moved to WoG mod.
- Updated AI code so it can correctly evaluate bank danger (should be
generic enough for use with other objects)
- New files JsonRandom.* that contain routines for loading random
objects from Json (still WiP but should be stable)
2014-06-22 13:39:40 +03:00
DjWarmonger
d3134a1290
Add free tiles around unguarded objects.
2014-06-18 10:31:08 +02:00
DjWarmonger
f84e25fa78
Somewhat better algorithm for paths, helps balance object distribution.
2014-06-18 09:57:36 +02:00
Ivan Savenko
0a71e89f58
Created large number of missing objects in configs
...
Minor bugfixes in code
2014-06-17 14:57:47 +03:00
Ivan Savenko
09d595e385
- Implemented "mapObject" entry for hero classes
...
- Updated schemas
- Some bugfixing
2014-06-16 19:27:26 +03:00
Ivan Savenko
89b89ff85d
Bugfixing. Game seems to be working without major bugs.
2014-06-15 23:25:10 +03:00
DjWarmonger
60df94a3f5
Placing towns according to template.
2014-06-15 21:23:53 +02:00
DjWarmonger
8e66b7168a
Corrected paths & guard for large objects.
2014-06-15 19:56:58 +02:00
Ivan Savenko
836c466f81
- Implementation of overrides for towns
...
- Converted dwellings.json into new format
- Implemented "mapObject" entry in town format
- Removed capital/fort/village fields from town in favor of overrides
2014-06-15 19:43:01 +03:00
DjWarmonger
01355a77d8
Added "monster strength" info to templates.
2014-06-15 11:08:06 +02:00
DjWarmonger
890f29fa7e
Improved guard placement for large objects.
2014-06-15 09:39:30 +02:00
DjWarmonger
aa54803c50
Refactoring, clearing logs.
2014-06-15 08:48:46 +02:00
DjWarmonger
79da7b92ce
Templates now contain info about mines.
2014-06-14 20:05:19 +02:00
Ivan Savenko
7cfd9a0903
First part of implementation of some type-specific handlers.
...
TODO:
- merge dwellings.json into object configs
- proper implementation of overrides for towns
- fully connect new API to RMG/H3M
2014-06-14 18:42:13 +03:00
DjWarmonger
93b44de63c
Handling "terrain type" and "match terrain to town" options.
2014-06-14 17:14:59 +02:00
DjWarmonger
6cbcfbf0a9
Sealed-off treasure piles will be discarded and filled with obstacles.
2014-06-13 12:04:17 +02:00
DjWarmonger
edd46d87c1
Treasure pile entrance/guard will always be aimed at the center of the zone.
2014-06-13 08:00:26 +02:00
AlexVinS
56c74bc46a
+More build target to support both SDL1 and SDL2 builds
2014-06-13 07:55:48 +04:00
AlexVinS
bbd0312b45
Tweak configuration
2014-06-13 07:55:47 +04:00
Ivan Savenko
6205d07223
Re-enabled video player, should now work with SDL 2
2014-06-13 07:55:46 +04:00
Ivan Savenko
8eb661461c
- vcmi compiles with SDL2 on Linux, video player is disabled for now
2014-06-13 07:55:45 +04:00
AlexVinS
ac2896da42
Implemented SDL2 unicode input. Hotkeys are sill broken.
2014-06-13 07:55:42 +04:00
AlexVinS
30fd9987cf
change minizip.cbp, VCMI_lib.cbp to new externals layout
...
* static link with zlib for now - I don`t want to mix with SDLs zlib
2014-06-13 07:55:37 +04:00
DjWarmonger
2c1001f8e0
Making sure that treasure piles and other objects will always be accessible from the center of zone.
2014-06-12 21:51:16 +02:00
DjWarmonger
236b3ec807
Zones will get random network of passable paths inside them. Treasures will try to fill all remaining fields.
2014-06-12 21:10:43 +02:00
DjWarmonger
1a34297c33
Rearranged treasure pile info.
2014-06-08 14:35:41 +02:00
DjWarmonger
c82bfd0f3e
- Fixed guard generation
...
- Added Jebus template for comparison
2014-06-08 08:42:29 +02:00
DjWarmonger
fed2821a94
Fixed behaviour with extreme treasure values.
2014-06-07 22:27:36 +02:00
DjWarmonger
81a64a8e67
Templates can now use multiple configurations of treasure piles.
2014-06-07 15:51:03 +02:00
DjWarmonger
b3a39f4920
Misc improvements & tests.
2014-06-07 14:02:57 +02:00
DjWarmonger
dd5c94fa1e
Fixed overlaping of treasure piles.
2014-06-07 10:47:38 +02:00
DjWarmonger
b68f16e89e
Make sure that non-removable objects have their visitable tile accessible.
2014-06-07 10:13:59 +02:00
DjWarmonger
743d8dcf9f
Treasure piles won't be placed at free tiles.
2014-06-07 09:09:50 +02:00
Ivan Savenko
44742814cd
More cleanup:
...
- moved SoundBase.h to lib since it contains shared data
- added RMG info to object format. Note that data is not yet imported in
configs
- slightly updated API of object handlers
2014-06-05 23:51:24 +03:00
DjWarmonger
e4ea6727b7
Treasure piles should always be accessible.
...
Boosted treasure value for better overview.
2014-06-05 21:37:39 +02:00
DjWarmonger
1746ab8c12
Added spell scrolls to the mix.
2014-06-05 20:19:42 +02:00
Ivan Savenko
b2e8c92383
Cleanup:
...
- removed commented-out #includ'es
- renamed some files to match name of class
2014-06-05 20:26:50 +03:00
Ivan Savenko
76bf5351c6
Line endings are now unix-style
2014-06-05 19:57:43 +03:00
Ivan Savenko
652ceb2bde
Finally shattered CObjectHandler.cpp into tiny bits
...
- This file is now split into multiple smaller files in mapObjects
directory
- CObjectHandler itself now contains only core classes (Handler itself,
CGObject and interfaces)
- Cleaned up excessive #include's through whole project
2014-06-05 19:52:14 +03:00
DjWarmonger
e54c816c92
Treasure piles can now cover several tiles.
2014-06-05 17:19:11 +02:00
Ivan Savenko
0afdfa529c
Moved all object-related files to lib/mapObjects directory.
...
Renamed some classes to more readable names
2014-06-05 14:19:47 +03:00
Ivan Savenko
1d5d4e3248
Fixed broken in some cases behavior of "base" entries.
...
Maps with new objects seems to be working correctly now, objects are
correctly initialized with base values even with null input
2014-06-04 22:59:28 +03:00
DjWarmonger
c470b9606b
Obstacles won't be generated around unguarded objects.
2014-06-04 20:59:01 +02:00
Ivan Savenko
971a93b4f1
Fixed missing serialization of new types
2014-06-04 20:43:54 +03:00
DjWarmonger
464ffc4afa
Implemented (hopefully) original treasure randomization algorithm.
2014-06-04 19:08:04 +02:00
DjWarmonger
fe05de9aff
Fixed copying zone settings.
2014-06-04 15:41:32 +02:00
DjWarmonger
fdb81f4d5c
Reading treasure values from config.
2014-06-04 15:16:23 +02:00
Ivan Savenko
e9b41cd3c6
Minor fixes, no more missing objects & templates
2014-06-04 14:15:58 +03:00
Ivan Savenko
7e057b6df8
Bugfixing, game can finally load to main menu without crash
2014-06-04 11:25:13 +03:00
DjWarmonger
62e9f13b08
- Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426
...
- Some primitive way to randomize treasures
2014-06-04 10:16:08 +02:00
Ivan Savenko
32b6568b65
Merged changes from upstream and fixed compilation caused by API changes
2014-06-03 22:45:18 +03:00
Ivan Savenko
dc7f820161
Implemented object schema. Commiting current progress before sync with
...
upstream.
2014-06-03 21:43:33 +03:00
DjWarmonger
6221f4ac2c
- Corrected guard types
...
- Corrected town positions
2014-06-03 08:57:20 +02:00
DjWarmonger
2aa53e9568
Corrected guard calculation to match OH3.
2014-06-02 15:38:42 +02:00
DjWarmonger
7db06e6bd0
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-01 21:53:00 +02:00
DjWarmonger
37463a3e45
Zone position will be moved to its center of mass.
2014-06-01 21:01:18 +02:00
DjWarmonger
7f31b7dddb
- Zone guards will now match template settings.
...
- Added guards for monoliths.
2014-06-01 16:31:49 +02:00
DjWarmonger
3c5a65af3d
- Random monsters will have proper strength.
...
- Fixed blocking of tiles under objects
2014-06-01 14:10:44 +02:00
DjWarmonger
aee748d8d6
- Added monoliths between remote zones
...
- Fixed land connections between zones, now they're generated correctly.
2014-06-01 12:02:43 +02:00
DjWarmonger
e97933035c
Randomized connections placement (?)
2014-06-01 10:15:03 +02:00
AlexVinS
f212c8221d
[RMG]Fix gcc build, remove some unused variables
2014-05-31 16:11:20 +04:00
DjWarmonger
3c6a1fb715
Large objects will not spawn at blocked tiles.
2014-05-31 12:26:59 +02:00
DjWarmonger
8e8b27087a
Ground connections between adjacent zones.
2014-05-31 10:56:14 +02:00
DjWarmonger
8ab2a8df86
Zone borders.
2014-05-30 21:23:41 +02:00
DjWarmonger
8c24ea0bfb
Introduced 3-value logic for free, blocked and possibly occupied tiles. Refactoring.
2014-05-30 16:50:06 +02:00
DjWarmonger
8ea175ce95
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-05-30 07:33:32 +02:00
beegee1
72b2e1b8fe
- fixed bug when generating random map and adding player info data
2014-05-29 17:34:46 +02:00
beegee1
40ab89e179
- copy of campaign heroes can be done later (at the point where it's clear if they will be replaced)
2014-05-29 17:07:21 +02:00
Ivan Savenko
1d17d60449
gcc update:
...
- removed support for 4.6
- compilation fixes for 4.7
2014-05-29 13:42:05 +03:00
DjWarmonger
690f4a650a
Even better zone shapes.
2014-05-28 21:11:10 +02:00
DjWarmonger
c627aa608a
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-05-28 19:34:12 +02:00
karol57
6a65802f22
Removed hardcoded value
2014-05-26 11:52:27 +02:00
karol57
5907735676
All inline functions are now part of definition.
2014-05-26 10:37:04 +02:00
karol57
dd33fd51a8
int3 dist2d microoptimization
2014-05-25 20:42:25 +02:00
karol57
df8cce0d61
Declarations and definitions are now separated.
...
Added explicit int3(si32) c-tor.
Operators like += now return reference to object.
Operator != has now own implementation.
Added dist2SQ for optimization proposes.
areNeighbours now uses dist2SQ
Removed unnecessary comments
2014-05-25 20:12:53 +02:00
DjWarmonger
8f033a7834
Golden ratio for smoother zone shapes.
2014-05-25 13:30:47 +02:00
AlexVinS
c40c79fa94
Make gcc happy
2014-05-25 13:02:15 +04:00
DjWarmonger
69457dbd75
- Implemented some really nice gravity-based algorithm
...
- Fixed zones placed outside the map (causing various bugs)
2014-05-25 06:20:02 +02:00
DjWarmonger
b9de3875d9
- Attempt to move zones away from map boundaries
...
- Tweaking algorithm parameters
- Refactorings
2014-05-24 18:39:58 +02:00
Ivan Savenko
67f11b1a01
- First part of objects configuration
...
- split objects into 3 files (for now)
- integrated object class handler into mod handler
2014-05-24 15:45:29 +03:00
DjWarmonger
021c6b9af3
All zones will be painted with terrain. Removed unused code.
2014-05-24 14:33:22 +02:00
DjWarmonger
d2fd71d087
Zone shapes & terrains work nicely.
2014-05-24 14:06:08 +02:00
DjWarmonger
27dcf70b1a
Randomized center positions of zones.
2014-05-24 12:42:06 +02:00
Ivan Savenko
7f276185bd
Moving files:
...
- new config for objects (config/objects/generic.json)
- renamed lib/CDefObjectHandler to lib/CObjectClassesHandler
2014-05-24 02:07:54 +03:00
Ivan Savenko
6bd6be0835
Object class handler is now a proper "handler"
...
- Some changes in interfaces
- Fixed some missing fields in serialization
- Moved object names to new handler
2014-05-24 01:56:51 +03:00
DjWarmonger
3a6f748fb5
Paint native terrain in zones.
2014-05-23 21:43:33 +02:00
DjWarmonger
75cea9206d
- Fixed uninitialized guarding creature positions
...
- Fix for guard placement
2014-05-23 19:45:17 +02:00
DjWarmonger
35d6215b7b
jfhs patch integration is now complete:
...
Lots of fixes for object placement.
Fixed blocked paths on generated maps.
2014-05-23 19:14:33 +02:00
DjWarmonger
4ea9810831
First version that works:
...
- Covered RMG with exceptions
- Fixes for object randomization & placement
2014-05-23 17:12:31 +02:00
DjWarmonger
342aec0700
More rollback.
2014-05-23 13:23:03 +02:00
DjWarmonger
5b0b152aa3
Trying to restore recent type of mapGenOptions.
2014-05-23 11:56:51 +02:00
DjWarmonger
eae7e5c51f
Rolled back some incorrect values.
2014-05-23 09:22:22 +02:00
DjWarmonger
67793a2db4
Some more.
2014-05-22 21:40:34 +02:00
DjWarmonger
2d8cd1c5b5
Some more.
2014-05-22 21:06:26 +02:00
DjWarmonger
aead8da54f
Fixed some obvious bugs with random map options.
2014-05-22 20:50:24 +02:00
DjWarmonger
1e1dce20a8
Something that compiles, but crashes when launching RMG map.
2014-05-22 19:25:17 +02:00
DjWarmonger
88f962d6d5
Taken jfhs code as it is.
...
http://forum.vcmi.eu/viewtopic.php?p=10040#10040
2014-05-22 16:27:13 +02:00
AlexVinS
8a3b997fa5
fix a few comments. No code changes.
2014-05-21 13:02:20 +04:00
AlexVinS
6f65d2484b
Extract battleStackIsImmune from battleIsImmune
...
This fix possible problems with rising spells as now immunty is handled on stack level not on hex level
* battleIsImmune in now protected - only used in canCastThisSpellHere
2014-05-19 13:44:38 +04:00
AlexVinS
eff801f39a
Extract "inherit node" function
2014-05-19 02:28:44 +04:00
AlexVinS
2fc16b231f
Implemented inheritance semantic for spell level configuration.
...
This allows more simplification.
2014-05-18 21:16:10 +04:00
AlexVinS
f2b61f7e69
Spell configuration: introduce simplifaction mechanism for level conficuration
...
* also aviable for other handlers
2014-05-18 18:47:18 +04:00
AlexVinS
950ca1156a
Use absoluteLimit
...
* all "old" limits are now absolute
2014-05-18 17:55:26 +04:00
AlexVinS
b6b12ad8f6
Merge and simplify resistance calculation
2014-05-18 17:03:01 +04:00
AlexVinS
7cf64a0628
Made onlyAlive flag a part of TargetInfo
2014-05-18 17:03:01 +04:00