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

1192 Commits

Author SHA1 Message Date
Frank Zago
872a057aa7 Fixed bad prototype. 2011-01-29 19:07:49 +00:00
Michał W. Urbańczyk
f52d4f7cd6 Merged changes from trunk. 2011-01-15 02:35:46 +00:00
mateuszb
56ec829049 * minor refactoring
* minor improvements in battle interface
2011-01-09 17:41:46 +00:00
Michał W. Urbańczyk
c1bd81abdd Mostly fixed battle animations.
Added proper ending for duel mode.
2011-01-08 19:38:42 +00:00
Michał W. Urbańczyk
a53ec23556 Stupid AI is capable of winning / losing battle. 2011-01-08 18:33:40 +00:00
mateuszb
957f1764d7 * some progress in StupidAI
* refactoring of battle handling
WARNING: strange crash on entering battle
2011-01-07 10:48:31 +00:00
Michał W. Urbańczyk
471c23ba71 Compile fixes, more work on new artifact system. 2010-12-26 14:34:11 +00:00
mateuszb
b3fd14b524 * splitted CGameState into general game state and battle game state
* added missing fields to serialize in CHero
2010-12-25 19:23:30 +00:00
Michał W. Urbańczyk
a82469a205 Ooops. Some obvious corrections to previous commit. 2010-12-25 01:48:02 +00:00
Michał W. Urbańczyk
2cf6729eee Towards duel support. 2010-12-25 01:43:40 +00:00
Ivan Savenko
3d9dc0642d - gcc compile fixes
- corrected projectiles for some units
2010-12-24 15:37:48 +00:00
mateuszb
4929cf9782 * enum for secondary skills
* THex for battle positions
* towards removal of battleGetStackByID

TODO:
investigate the necessity of putting implementation of BattleAction CGlobalAI::activeStack( const CStack * stack ) in CGeniusAI.cpp
2010-12-23 20:18:10 +00:00
Michał W. Urbańczyk
2fe8b07f4f Little more development for duel mode. 2010-12-23 00:33:48 +00:00
Michał W. Urbańczyk
cde0e8933f Moved StupidAI to AI/ subfolder. 2010-12-22 22:23:19 +00:00
mateuszb
49083c4e5a * ConstTransitive CGI more or less done
* hch contents distributed to more appropriate folders
2010-12-20 21:22:53 +00:00
Michał W. Urbańczyk
e677cd5b07 Merged r1880. 2010-12-11 20:30:33 +00:00
Michał W. Urbańczyk
69b97e0a51 Little more changes. 2010-12-09 23:10:28 +00:00
mateuszb
ad48681d91 * cleanup 2010-12-08 20:17:05 +00:00
Michał W. Urbańczyk
f020562570 Merged changes from trunk. 2010-12-05 23:26:56 +00:00
Michał W. Urbańczyk
848a00bc6f Stacks #4 -> giving creatures still needs to be fixed. 2010-12-05 23:10:02 +00:00
mateuszb
6f56b5bb30 * a few more consts 2010-12-04 19:44:23 +00:00
mateuszb
efedb1a55a * minor cleanup 2010-12-04 19:15:20 +00:00
DjWarmonger
ea03273c8e Some work towards useful AI:
-It is possible to toggle adventure AI on / off typing "ai" in the console (default is true)
-General cleaning and formatting of code
-Some minor optimizations
-Teal console log for AI

AI tends to hang in the maze of mutexes and current player interface, further investigation is needed.

Fixed #580
minor tweaks
2010-11-28 16:39:13 +00:00
Michał W. Urbańczyk
7c3f3d20c3 Stacks #2 -> towards new system of stack operations. 2010-11-27 01:46:19 +00:00
Michał W. Urbańczyk
32ce20af15 Moving stack system to pointers, part #1 2010-11-22 00:34:46 +00:00
Michał W. Urbańczyk
9250cc8adf Separated CStack and CStackInstance. 2010-11-20 17:36:02 +00:00
DjWarmonger
67baa3d8e4 I hope that's final shape of universal Expert System, now it's time to add some functionality. 2010-11-13 19:25:21 +00:00
DjWarmonger
e2f4a60c4b A bit more metamagic for expert system. 2010-11-12 15:20:44 +00:00
DjWarmonger
6da5c8ee56 A framework for generic expert system, currently aimed at Bonus processing. 2010-11-11 21:01:35 +00:00
Frank Zago
e252c2d06c Build files update. 2010-08-21 00:41:40 +00:00
Frank Zago
fdad7e34e1 Remove line break in comment. 2010-08-04 03:33:10 +00:00
Frank Zago
006a7d1f11 serialID is gone. 2010-08-04 03:32:24 +00:00
mateuszb
54496ddee1 * player's serialID removed (save format broken, new game seems to work)
* building bonus (campaigns) supported
2010-08-03 11:36:52 +00:00
DjWarmonger
695c862638 Support for creature damage bonus.
TODO: display it in a creature window
2010-07-16 06:18:41 +00:00
mateuszb
71b73bad53 * mostly working hero flying and water walking; support for artifacts:
- Angel's Wings
- Boots of levitation
and spells
- fly
- water walk
2010-05-16 13:42:19 +00:00
Frank Zago
df151cceba Various compile and warning fixes. 2010-05-12 02:32:56 +00:00
Michał W. Urbańczyk
a14606f32d New bonus system. Unified HeroBonus and StackFeature. Still early version, will need improvements and development.
If you encounter any new crashes / bugs / unacceptable slowdowns, please PM me.
2010-05-02 18:20:26 +00:00
Michał W. Urbańczyk
993036e4a1 New non battle stack class. (Base for future improved bonus system, stack exp / arts)
Fixed #443
2010-04-02 02:07:40 +00:00
mateuszb
ac7bc76b7b * implemented first aid kit including first aid secondary ability 2010-03-07 17:40:33 +00:00
Michał W. Urbańczyk
0a950c508b Grail digging and construction.
Minor fixes.
2010-02-24 13:03:36 +00:00
Michał W. Urbańczyk
e6f31b7500 Compilation fixes for VC10.
Changes towards hot-seat support.
2010-02-20 13:24:38 +00:00
Frank Zago
3ec6cfd115 (linux) Meved version to 0.75 (at last) and regenerated the makefiles. 2010-01-25 03:19:55 +00:00
Michał W. Urbańczyk
eb6f7fffc9 Support for smart pointer serialization. Fixed creature banks serialization. Minor fixes. 2009-12-29 01:07:17 +00:00
Michał W. Urbańczyk
01831e912a Fixes for adventure AI: battles where AI is the attacker should work, fixed drawing AI heroes under FoW.
Restructured thread structure: no new thread on yourturn, instead of that introduced update() method called by thread dispatching GUI events. 

Further changes are planned.
2009-12-28 04:08:24 +00:00
Michał W. Urbańczyk
7f97a56a28 Fixed crash on casting spell. Fixed giving resources from towns. Version set to 0.74c. Incremented save format version.
Disabled adventure AI. Will be released as dev build.
2009-11-28 01:42:08 +00:00
red1939
f7a1b74092 Next batch of code clearing. 2009-11-01 20:13:12 +00:00
red1939
3f3c019784 Next part of AI code cleaning/reformatting. 2009-10-28 16:28:52 +00:00
red1939
ed9b75b447 First part of reformatting the code, renaming variables, rewriting tricky part. Basically making the code more readable, maintainable and ready for further additions. 2009-10-22 22:04:42 +00:00
Frank Zago
1609b8fdb9 Made all paths dependent on DATA_DIR, USER_DIR, BIN_DIR or LIB_DIR. Data access can now be separated from saved games and binaries.
Fixed a file handle leak.
Bumped revision to 0.74b (linux).
Reworked the build system to remove uneeded dependencies (linux).
Removed use of PATHSEPARATOR since Windows can use / too.
2009-10-04 02:02:45 +00:00
Michał W. Urbańczyk
4c458a7e47 Bumped version, restored AI and Cage. 2009-10-01 22:18:37 +00:00
Michał W. Urbańczyk
5073365eb9 Disable AI and Cage of Warlorlds for release (crashes) 2009-10-01 22:13:11 +00:00
Michał W. Urbańczyk
307c20e7dc * fixed crash on clicking on the map frame
* battle settings will be stored
* fixed calculating battle casualties
* fixed crash when clicking on enemy stack without moving mouse when we receive action
* fixed issue when splitting stack to the hero with only one creatures
2009-09-24 13:23:52 +00:00
Michał W. Urbańczyk
a424032ec3 Bumped version to 0.73d, restored AI. 2009-09-20 13:22:47 +00:00
Michał W. Urbańczyk
ee3c318ed9 Version for development release 0.73c
* version set to 0.73c, bumped save format version, updated changelog
* new stack queue for higher resolutions (needs new graphics!)
* improved stack ordering during battle
* many minor fixes
* temporarily disabled AI
2009-09-20 12:47:40 +00:00
mateuszb
1a08772bc8 * reading of creature banks' names 2009-09-17 11:05:50 +00:00
mateuszb
c8ac6cf914 * certain improvements for animations in battles
* obstacles won't be placed on battlefield when creature bank is attacked
2009-09-11 12:46:26 +00:00
Frank Zago
a9617b3dfd Fixed prototype. 2009-09-10 14:06:28 +00:00
OnionKnight
3d2ab9c753 * Garrison dialogs for garrisons. Required a bit restructuring of the code to take removable units into account. All showGarrisonDialog methods and the GarrisonDialog struct now takes it as a parameter. Visiting ally towns would benefit from this other than garrisons.
* Garrison right-click information shown, but not taking detailed info into account.
* Town info dialogs centered around cursor.
2009-09-09 17:49:03 +00:00
Michał W. Urbańczyk
956a87f264 * redone stack queue algorithm
* recalculating paths only after finished movement / switching selection
* moving hero uses "new" pathfinder
* moving hero by arrow keys / numpad
* VCMI window should start centered
* fixed pairing Subterranean Gates
* fixed issues with creatures sounds after loading
* several minor changes and improvements
2009-09-07 02:29:44 +00:00
mateuszb
a4df8e8831 * partial support for arrow turrets 2009-09-04 14:11:42 +00:00
Frank Zago
f92b6fc2b6 Depending on the distros, ffmpeg headers aren't always installed in the same directory. Fix from Szpak. 2009-08-29 15:52:29 +00:00
Michał W. Urbańczyk
1f0a1bd771 More fixes. 2009-08-28 19:34:08 +00:00
Frank Zago
90c31d5cd5 Typo. 2009-08-28 00:27:25 +00:00
DjWarmonger
82ddb607e6 1.blocked critical AI call
2.Yet another chapter of epic battle with creature banks
2009-08-24 14:59:24 +00:00
Michał W. Urbańczyk
66dd31fd8a * attacking and capturing towns
* r-click popups on selected town/hero.bonus and teams in pregame
* disabled music due to bugs in SDL_mixer and smpeg (probably it was the source of reported random crashes / hangups)
* minor fixes
2009-08-22 13:59:15 +00:00
Trevor Standley
f4743d2fc6 Various fixes. Temporarily replaced neural network's output with random number. 2009-08-21 18:18:52 +00:00
Trevor Standley
af1a55e063 More AI stuff. 2009-08-19 10:18:14 +00:00
Frank Zago
81109b3897 Added missing headers. 2009-08-19 05:01:25 +00:00
Frank Zago
a7b7b0a431 Add new files to makefiles. 2009-08-19 04:45:33 +00:00
Trevor Standley
a3b6bb4892 AI loads .brain file which contains a list of objects to visit and what features are necessary to determine how valuable that objective is.
AI creates random neural networks and assumes that their outputs are trained values.
2009-08-18 07:37:45 +00:00
mateuszb
49a142b92e * minor changes 2009-08-17 13:08:05 +00:00
DjWarmonger
dd91e7e406 1. Support for Pandora Box
2. Improved functions handling experience. Now it works with values over 65K, but still didn't with event giving 99M exp
I have no idea what it has to do with AI though
2009-08-16 15:39:18 +00:00
Frank Zago
69217ff217 Compile fix for g++. 2009-08-12 02:08:59 +00:00
Frank Zago
575840f641 Use amin instead of min. 2009-08-08 06:13:56 +00:00
Trevor Standley
3d93e0acf0 AI doesn't try to visit itself. AI doesn't try to visit OPW/OPH objects that have been visited. Soon AI will be able to learn priorities. 2009-08-07 08:41:40 +00:00
Trevor Standley
184676d7c4 AI now performs almost all basic operations.
-builds buildings
-recruits creatures/heroes
-upgrades creatures
-moves heroes to random destinations.
-passes units to heroes/upgrades heroes' units
-attacks weaker parties
-and more.
2009-08-06 09:59:33 +00:00
Trevor Standley
cd4d3e6db3 2009-08-06 09:52:07 +00:00
Frank Zago
9aca713050 Compile fixes. 2009-08-06 05:08:17 +00:00
mateuszb
507597301f * new spells: resurrection, animate dead
* a lot of minor fixes in battles
* resolution & depth in settings.txt reverted to 800x600 and 24bpp
2009-08-05 12:46:08 +00:00
Michał W. Urbańczyk
64f098017b Fixed linker problems. 2009-08-05 12:24:31 +00:00
Trevor Standley
48581962ab More AI changes. Minor associated fixes. 2009-08-05 09:46:55 +00:00
Michał W. Urbańczyk
310c369265 Fixed two possible block-ups in AI. Fixed possible problems with picking hero available to recruit (no more duplicates hopefully). 2009-08-05 00:05:37 +00:00
mateuszb
1872c2d575 * new spell: cure
* minor changes
2009-08-04 17:05:49 +00:00
Trevor Standley
07828ab335 2009-08-04 09:40:57 +00:00
Trevor Standley
45d311a9f5 AI now attacks randomly. 2009-08-04 08:56:38 +00:00
Michał W. Urbańczyk
de1ed92379 * version set 0.73b
* config entry for 1600x1200 resolution
* several fixes
* http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=3185#3185
2009-08-03 23:53:18 +00:00
Trevor Standley
b987f02cb0 AI heroes move to random safe objects.
AI recruits heroes.
2009-08-03 22:15:13 +00:00
mateuszb
048ab62530 * some changes in code handling movement of wide creatures in battles. It could solve a few bugs but I'm not sure 2009-08-02 14:21:18 +00:00
Trevor Standley
3cdff92e42 AI walks around randomly until movement is almost out. Battle causes crash. 2009-08-01 02:57:50 +00:00
Michał W. Urbańczyk
2f73b6cd1e * pressing enter or escape close spellbook
* spellbook shows adventure spells when opened on adventure map
* removed redundant quotation marks from skills description
* erasing path after picking objects with last movement point
2009-07-03 19:57:14 +00:00
Frank Zago
a11ea59418 Video player compilation. 2009-06-20 01:40:52 +00:00
ambtrip
8ecabaa041 GeniusAI:
* UML project (can be viewed and edited in BOUML). The aim of this UML documentation is to help to share ideas and to make good AI logic.
2009-05-12 21:01:42 +00:00
Frank Zago
788343dd1d Typo: cast is an irregular verb. 2009-05-12 03:35:51 +00:00
Frank Zago
c1eea72fce Support for new source files. 2009-05-11 04:58:50 +00:00
mateuszb
3c50890d16 * msvc compilation fix
* fixed problem with maximal spell level checking reported by ubuntux
2009-05-10 13:00:15 +00:00
ambtrip
1906060bc6 GeniusAI:
* project was reorganized - now there is possibility to work simultaneously on battle AI and general AI
2009-05-10 08:15:30 +00:00
Frank Zago
8172493467 Updated autoconf generated files. 2009-05-07 04:52:40 +00:00
Frank Zago
81d2a36df6 Autoconf rework. 2009-05-07 04:45:59 +00:00
mateuszb
b0e2d13b4e * new spells:
- precision
- slayer
* refactoring
2009-05-01 13:42:41 +00:00
mateuszb
621400ac85 * small refactoring 2009-04-30 14:59:30 +00:00
Michał W. Urbańczyk
df25dd7efb Sound patches from Ubuntux #7 - #10:
* Some sound code cleanups
* Renamed soundBase::soundNames into soundBase::soundID
* Add a music handler destructor
* Add Archdevil and vampire pre and post movement sounds

I've applied minor change to fix CMusicHandler - GeniusAI conflict: moved sounds bimap to the .cpp file.

(vcmi_sounds_cleanup.diff
vcmi_sounds_cleanup2.diff
vcmi_sounds_cleanup3.diff
vcmi_add_sounds.diff)
2009-04-30 10:53:06 +00:00
Michał W. Urbańczyk
ade4b46edd Sound patch from Ubuntux #2
(vcmi_sounds.diff)
2009-04-22 18:48:56 +00:00
mateuszb
408411d8c3 * next ubuntux's patch 2009-04-19 15:01:33 +00:00
mateuszb
aa87e1ff16 * next ubuntux's patch 2009-04-15 10:20:47 +00:00
mateuszb
049b4de2b2 * next ubuntux's patches 2009-04-14 10:46:42 +00:00
mateuszb
4d3808cfa0 * applied ubuntux's patches
* fixed AmptyAI (it builds now)
2009-04-13 18:52:20 +00:00
Michał W. Urbańczyk
f9aebcc4bd * Started making support for garrison window. Leaving guardians in flagged mines. 2009-04-12 00:58:41 +00:00
Michał W. Urbańczyk
d72d988a9c * fixed crash on closing application
* unified yes/no and selection dialog interface calls
* VCMI won't anymore be always giving all three stacks in the starting armies
* fix for drawing starting army creatures count
* support for School of Magic
* support for School of War
* support for Pillar of Fire
* minor changes
2009-04-11 01:32:50 +00:00
mateuszb
b74b6ecc01 * minor bugfixes 2009-04-07 17:51:50 +00:00
Michał W. Urbańczyk
2710017049 * First Aid Tent won't get move
* presumably fixed crash occurring sometimes on battle end
* fixed problems when attacking with two-hex creature another two-hex creature, when tile before our destination was blocked
* minor changes
2009-03-31 20:47:53 +00:00
Michał W. Urbańczyk
d3246cc6de * Fixed ReFixed Redwood Observatory problem
* Updated changelog
2009-03-28 20:13:26 +00:00
Michał W. Urbańczyk
b2c4f3e0fd * fixed crash on saving when some objects havebeen removed
* support for multi-target attacks/spells in the protocol
* version bumped to 0.7d
2009-03-21 12:49:58 +00:00
mateuszb
a08aaba29d * probably fixed problem with displaying corpses on battlefield
* fixed buy troops window
* workaround for a problem with GeniusAI
* some magic numbers are removed
2009-03-12 18:06:02 +00:00
Michał W. Urbańczyk
e9ebc7de5b wrong1 2009-03-06 22:25:19 +00:00
Michał W. Urbańczyk
99aef852be * probably fixed Bind effect
* reverted unwanted part of r730
* project files will now have relative paths to libs/includes
* more checkings on startup
2009-02-14 15:00:29 +00:00
Michał W. Urbańczyk
9dbe9bd277 Reverted r731 2009-02-14 14:37:13 +00:00
mateuszb
96a7e1600b ?!? 2009-02-14 13:51:21 +00:00
Michał W. Urbańczyk
b2924064ee * new movement cost calculation.
* fixed crashes on loading maps with flag all mines/dwelling victory condition
* minor changes
2009-02-12 14:44:58 +00:00
Michał W. Urbańczyk
a113a8d289 * patch update from Dikamilo 2009-02-08 16:36:53 +00:00
Michał W. Urbańczyk
dd36cfce50 Patch from Dikamilo:
* compatibility fixes for MinGW
* Code::Blocks project files
2009-02-08 15:39:26 +00:00
ambtrip
d794a83444 GeniusAI:
* code refactoring
 * some problems were fixed
2009-02-07 18:52:55 +00:00
Michał W. Urbańczyk
131c220685 * fixed r-click on tavern hero crash
* fixed removing one-week bonuses
* added keybindings for components in selection window (eg. for treasure chest dialog)
* HANDLE_EXCEPTIONC macro will rethrow exception after logging
2009-02-07 13:28:23 +00:00
mateuszb
0070c93888 * more support for attacking stacks for back by two hex stacks
* minor typo fixed
2009-02-05 14:44:27 +00:00
Vadim Glazunov
a560e9069a AI dynamic library load in linux. Autoconf/automake project updated, to recompile use autoreconf -f -i; automake; ./configure 2009-01-31 02:36:44 +00:00
ambtrip
fb0aad5edf * AI should be a bit more intelligent
* some problems with double-wide creatures were fixed
2009-01-29 20:01:57 +00:00
Łukasz Wychrystenko
b356524aee corrected that missclick! hope so 2008-12-26 01:15:47 +00:00
ambtrip
584eced759 Several improvements. 2008-12-15 21:37:22 +00:00
Michał W. Urbańczyk
c4bcf7b880 * better support for non-800x600 resolutions
* Merged CPreGameTextHandler into CGeneralTextHandler and moved to VCMI_Lib.dll (update your project files)
* Genius AI will be used as a default AI
* more code for save/load
2008-11-28 01:36:34 +00:00
Michał W. Urbańczyk
aeb1f6d012 Uploaded Genius AI by Ambtrip. 2008-11-25 18:51:44 +00:00
Michał W. Urbańczyk
b89c951d09 * version set to 0.62
* almost redone treasure chest
* working gaining levels for heroes (including dialog with skill selection)
* corrected another typo i cr_shots
2008-08-13 00:44:31 +00:00
Michał W. Urbańczyk
62b0365e70 Improvements for netcode. AI is working. Townlist won't crash. Moving hero is wrong but won't crash. Giving starting hero is working properly. Town defs are wrong but displayed. 2008-07-27 17:07:37 +00:00
Michał W. Urbańczyk
a729484dde * battle funcs added to ICallback
* initing visiting heroes
* merging stacks in town screen
* available creature amount handled
2008-04-13 11:05:39 +00:00
Michał W. Urbańczyk
fe5bcc19cf * redone def info handling
* redone randomization (mam nadziemę, że będzie toto działać)
* no more cheating pathfinder
* minor improvements
* version changed to 0.52
2008-02-05 03:56:45 +00:00
Michał W. Urbańczyk
d3f5a1c1e7 Finished drawing selection window for treasure chest.
(trzeba dorobic jego zamykanie, zwrocenie infa, zwrot pamieci)
2007-12-27 00:11:46 +00:00
Michał W. Urbańczyk
01c996591a More stuff for selection window. 2007-12-25 16:25:53 +00:00
mateuszb
58f1a2169f faster FoW in minimap, does not work, compiler errors 2007-12-06 18:55:58 +00:00
Michał W. Urbańczyk
c8c0d0eaaf Bugfixes for AI, Callback Interface, logging macrodefs. 2007-12-06 18:32:06 +00:00
Michał W. Urbańczyk
e1b2ae0df1 Several bugfixes and half-done things. 2007-12-01 12:50:33 +00:00
Michał W. Urbańczyk
556311c9ab Partially done object scripting and interactions.
Most of 0.4 ;)
2007-11-18 22:58:28 +00:00
Michał W. Urbańczyk
8440ffb39b Probably last bugfixes for 0.3 2007-10-22 17:01:00 +00:00
Michał W. Urbańczyk
04985fce2f * added #45, #44, #43 2007-10-21 16:45:13 +00:00
Michał W. Urbańczyk
97f4fbcce8 First EmptyAI. It's not used yet, but it can be compiled.
Support for AIs I'll soon after infoboxes for towns (if there won't anything urgent)
2007-10-16 22:41:45 +00:00