games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity
3,044 Commits 20 Branches 62 Tags 110 MiB
6ff7d61b91
Commit Graph

363 Commits

Author SHA1 Message Date
DjWarmonger
8c2dd9fdce More mechanics for creature spells. 2011-10-04 13:12:29 +00:00
DjWarmonger
07b8f87fb7 Partial support for Daemon Summoning. 
It freezes for unknown reason, but still.

Minor fixes.
 2011-10-02 07:16:34 +00:00
Frank Zago
01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +00:00
Michał W. Urbańczyk
9621cbcaa7 * fixed crash on calculating dmg dealt by stack under Curse 
* fixed crash on sea battles (obstacles data got corrupted during conversion)
* fixed crash when StupidAI had a catapult
* minor fixes and refactorings (typename for bonus list under shared ptr)
 2011-09-06 13:59:26 +00:00
DjWarmonger
e3a8a41063 Fixed #804. 
Phoenix won't upgrade to Centaur Captain ;)

Minor tweaks.
 2011-09-05 06:37:24 +00:00
Frank Zago
34698eee4d Fix description. 2011-09-04 02:40:46 +00:00
Frank Zago
76268fac46 Created spell_info.json from spell_info.txt. 2011-09-04 02:26:56 +00:00
Frank Zago
35350aeeff Created hall.json from hall.txt. 2011-09-04 02:02:20 +00:00
Frank Zago
2787830c00 Created buildings5.json from buildings5.txt. 2011-09-03 20:45:27 +00:00
Frank Zago
eff17aa850 Created campaign_regions.json from campaign_regions.txt. 2011-09-03 19:51:45 +00:00
Frank Zago
00adba18c9 Created battleStartpos.json from battleStartpos.txt. 2011-09-03 19:25:37 +00:00
Frank Zago
c03a5eb4d2 Created bankconfig.json from bankconfig.txt. 2011-09-03 18:32:37 +00:00
Frank Zago
1568e58029 Fixed malformed json file. 2011-09-03 16:14:31 +00:00
Frank Zago
11b50ca176 Created ressources.json from resources.txt. 2011-09-03 14:26:39 +00:00
Frank Zago
029b77e7c4 Created dwellings.json from cregens.txt. 2011-09-03 14:14:43 +00:00
Frank Zago
bcce343b6c Created terrains.json from native_terrains.txt and TERCOSTS.TXT. 2011-09-02 03:39:49 +00:00
Frank Zago
f9b14ba282 Created puzzle_map.json from puzzle_map.txt. 2011-09-02 02:46:18 +00:00
Frank Zago
3cb92baf18 Created obstacles.json from obstacles.txt. 2011-09-02 02:12:55 +00:00
Frank Zago
99000866bc Moved the notUsedMonsters values into creatures.json. 2011-09-01 03:48:58 +00:00
Frank Zago
2c26b9be96 Merge cr_abils.txt into creatures.json. Force loading of data from ZCRTRAIT.TXT (was controlable before, but switch was in an inconvenient place). 2011-09-01 03:39:53 +00:00
Frank Zago
d49058049e Created towns_defs.json from townsDefs.txt. 2011-09-01 00:11:34 +00:00
Frank Zago
35622913f9 Convert ERMU_to_picture.txt into ERMU_to_picture.json. 2011-08-31 23:27:33 +00:00
Ivan Savenko
3fc42134b7 - fixed #586, #757, #758 
- fixed spinning projectiles for some creatures
 2011-08-31 12:11:34 +00:00
Frank Zago
e5349c58cd Created wall_pos.json from wall_pos.txt. 2011-08-31 04:11:44 +00:00
Frank Zago
71b1eef6b6 Merged AC_desc.txt into battles_graphics.json. 2011-08-31 03:27:18 +00:00
Frank Zago
68090a4ec6 Created battles_graphics.json from battleBack.txt and battleHeroes.txt. 2011-08-31 01:11:41 +00:00
Frank Zago
0a58d1f2cf Created town_pictures.json from townPics.txt. 2011-08-31 00:35:04 +00:00
Frank Zago
21f72c61b1 Created creature_backgrounds.json from cr_bgs.txt. 2011-08-31 00:12:02 +00:00
Frank Zago
6826826e87 Reintroduced partial patch from r2327 (sex->female) + typo fix. 2011-08-30 23:10:01 +00:00
Michał W. Urbańczyk
835bd1fbeb Reverting r2327 
http://forum.vcmi.eu/viewtopic.php?t=410
 2011-08-30 06:19:07 +00:00
Ivan Savenko
33719696d8 - added default values to JsonNode 
- small cleanup to heroes.json
 2011-08-27 21:17:45 +00:00
Frank Zago
2a0fef0e4d Merged specials.txt into heroes.json. 2011-08-27 17:33:07 +00:00
Frank Zago
9594058157 Merged hero_spells.txt into heroes.json. 2011-08-27 16:13:44 +00:00
Frank Zago
fc9282fd50 Created heroes.json from heroes_sec_skills.txt. 2011-08-27 15:53:45 +00:00
Frank Zago
cb66e1b69b Fixed many typos. 2011-08-27 01:27:02 +00:00
Frank Zago
e3e2e45777 Merged requirements.txt into buildings.json. Plus a few cleanups in buildings.json. 2011-08-27 01:17:23 +00:00
Michał W. Urbańczyk
a8a437ccb0 Don't behave so dramatically when Heroes3-cd2.snd is missing. 
Fixed a few typos in buildings.json.
 2011-08-26 22:52:02 +00:00
Frank Zago
74620dc685 Merged mageLevel.txt into buildings.json. 2011-08-26 04:12:46 +00:00
Frank Zago
e997b25583 Merged building_horde.txt into buildings.json. 2011-08-26 03:58:07 +00:00
Frank Zago
584e7e3c46 Merged creatures_upgr.txt and basicCres.txt into buildings.json. 2011-08-26 03:43:43 +00:00
Frank Zago
b114047738 Integrate buildings4.txt into buildings.json. It's ligthly tested because I can't find what this file is supposed to define. 2011-08-26 02:39:58 +00:00
Frank Zago
06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +00:00
Frank Zago
839c437fbc Moved the resolution configurations in their own json files. Lots of C++ voodoo going away. Yay! 2011-08-24 02:19:53 +00:00
Frank Zago
16fcd025a7 Converted bonusnames.txt to a json file. 2011-08-20 22:31:59 +00:00
Frank Zago
b853df76ba Consolidated crerefnam.txt, monsters.txt, cr_factions.txt, cr_upgrade_list.txt, CREDEFS.TXT, cr_shots.txt and cr_to_turret.txt into creatures.json 2011-08-20 21:53:03 +00:00
Frank Zago
81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +00:00
Frank Zago
233ce7d6e3 Merge buildings3.txt into buildings.json. 2011-08-20 16:03:27 +00:00
Ivan Savenko
7eb82278d9 - minor fixes to JSON 
- music will resume correctly after battles
 2011-08-20 11:27:09 +00:00
Frank Zago
8fa540b4da Add building blit priorities in the json building file. Reorganized building coordinates processing code a little. 2011-08-20 06:08:48 +00:00
Frank Zago
6bbccaa76d Convert the buildings coordinates into a json file. 2011-08-20 04:48:23 +00:00
Frank Zago
b3a3cabd5b Moved the starting ressources into a json file. 2011-08-20 02:53:57 +00:00
Frank Zago
3519cca2c9 Moved the spell sounds into a json file. 2011-08-20 01:57:03 +00:00
Frank Zago
cf1d179acf Store battle fields sounds in a json file instead of a text file. 2011-08-20 01:15:37 +00:00
DjWarmonger
da83f0fcde For dev release 0.85b 
Quick fix for #762
 2011-07-21 14:16:45 +00:00
DjWarmonger
16e7241fbd Support for WoG's Defense bonus. 2011-07-16 16:40:38 +00:00
DjWarmonger
79a453f442 Support for WoG "cast before attack" bonus. Minor fixes. 2011-07-16 06:42:44 +00:00
DjWarmonger
a7577ccb6b More details for Rebirth ability. 2011-07-10 09:03:46 +00:00
DjWarmonger
5269e845fd handling of Rebirth ability for Phoenix. 
However, I've got no idea how to restore its animation to alive state.
 2011-07-08 14:54:20 +00:00
DjWarmonger
1bf9bb4d94 Flexible handling of creature spell power. 2011-07-08 13:17:05 +00:00
DjWarmonger
f33fbdc43b Support for Thunderbolt (Thunderbirds). 
General framework for handling creatures casting spells with arbitrary spell power.
 2011-07-08 07:00:11 +00:00
DjWarmonger
c53c226820 Support for Titan's Thunder (creating Spellbook) & Titan's Lightning Bolt. 2011-07-06 14:25:12 +00:00
DjWarmonger
6e492e4e4b Another missing file. 2011-07-02 17:42:15 +00:00
DjWarmonger
4f24501cae Missing file 2011-07-02 16:52:57 +00:00
beegee1
cef16ccc74 * Fixed battle positions bugs: #174, #172, #400 
* Turret creatures have no longer a standing animation
* Turret creatures get cut at a certain y position(lower part of shooters are hidden)
 2011-06-27 17:11:17 +00:00
DjWarmonger
e7bbfb615c Removed odd "no shoting penalty" bonus. It seems to be confused with No Distance Penalty. 2011-06-20 06:42:53 +00:00
DjWarmonger
27f9a20d2b Fioxed #748 2011-06-01 04:54:18 +00:00
beegee1
7962a9bc47 * Fixed #30 
* Fixed several shooting animation bugs
* Improved XY position of double wide creatures
 2011-05-26 14:47:45 +00:00
Michał W. Urbańczyk
8e57dba850 Fixed #658 and #699. 
Checking for water availability won't cause spurious warnings. New creature window enabled for testing.
 2011-05-25 14:48:49 +00:00
DjWarmonger
0adc4235f2 Display of immunities and similar effects. 2011-05-21 16:10:14 +00:00
DjWarmonger
db386915d1 Spell_levels are not necessary in the end. 
Fixes. Game won't crash when displaying info for war machines. However, they should be handled as regular stacks during battle.
 2011-05-13 14:33:48 +00:00
DjWarmonger
515ab7e7c1 Support for Acid Breath (both effects are now separate). 
Minor fixes.
 2011-05-13 09:02:16 +00:00
Michał W. Urbańczyk
aca90abd38 Settings.txt with info for 1920x1080 resolution. The package with graphics can be obtained from http://forum.vcmi.eu/download.php?id=380 
The new resolution has been prepared by Plush.
 2011-05-03 03:10:05 +00:00
beegee1
36d29424f0 * Turrets, keep and turret covers can be now be placed by altering wall_pos.txt 
* Fixed recruitment slider bug
* Fixed #271
* Improved color management
 2011-04-30 19:52:35 +00:00
DjWarmonger
a73a1c2724 Battle log messages for new abilities. 
Lots of fixes.
 2011-04-26 07:57:26 +00:00
DjWarmonger
a4d845688a Support for Poison, Age, Disease 
Partial support for Stone Gaze, Paralyze, Mana drain
Partial fix for #134 - animation triggers only for our own stacks, not enemy's
Lots of tweaks & fixes.
 2011-04-25 09:03:13 +00:00
DjWarmonger
1973241c1e One more file. 2011-04-23 17:12:11 +00:00
DjWarmonger
7591d06b05 Support for Death Stare. 
Some tweaks are still needed. Level 0 spell-like abilities won't work correctly.
 2011-04-23 17:10:54 +00:00
DjWarmonger
7e9033c44f Fixed #668 and #718. 
Hero is now properly attached to his special.

Compile fix for ERM Parser.
 2011-04-23 09:57:51 +00:00
DjWarmonger
f12aeb7fa4 More tweaks. 2011-04-10 10:31:42 +00:00
mateuszb
7874d84c4e * basic structure of ERM interpreter 
* SHOW_FPS moved to settings.txt
* minor changes
 2011-04-06 20:30:59 +00:00
Ivan Savenko
c6f1d87ede - fix for #95 and #602 
- implemented animation for new town buildings
 2011-03-22 13:19:07 +00:00
DjWarmonger
bc51c0006f Support for creature skill icons. Several fixes for creature abilities. 2011-03-20 08:45:05 +00:00
DjWarmonger
d0e9049161 Fixed #704. 
Magic Resistance tweak.
 2011-03-08 07:53:09 +00:00
DjWarmonger
043700f310 Fixes for Hate ability, minor tweaks. 2011-03-06 14:22:54 +00:00
DjWarmonger
4e70dddb71 Minor fix. 2011-03-06 12:23:40 +00:00
DjWarmonger
b9f301b600 Better implementation of creature window, minor fixes. 
Check forum for new graphics.
 2011-03-06 12:12:22 +00:00
mateuszb
3ed607e1f6 * fixed bug 673 2011-02-24 15:54:45 +00:00
Michał W. Urbańczyk
cab8f9e11d AI for neutral creatures and battles and player AIs can be different. StupidAI will handle neutrals by default. 
Fixes for issues with deserialization and handling Tactics secondary skill.
 2011-02-23 03:57:45 +00:00
Michał W. Urbańczyk
4c9edd3f06 Many fixes around bonus system. Some basic propagation mechanism (not clever but works). 2011-02-21 04:13:00 +00:00
DjWarmonger
454beba90c Backup of last modifications in stack experience. 2011-02-09 14:58:15 +00:00
DjWarmonger
f96b394b01 Threat level texts are now stored in separate config file. 2011-02-07 14:39:17 +00:00
DjWarmonger
c11f7c2020 Some more work on bonus-to-string feature. 2011-02-02 18:49:48 +00:00
DjWarmonger
094bb6fd8f Moving some work in progress from one computer to another. It shall not explode. 
Fixed video issue from #670.
 2011-02-01 18:10:43 +00:00
Ivan Savenko
b8f65697ca - fixes for several bugs: #639 #656 #135 #646 #638 #94 #629 
- re-enabled console on Linux to allow disabling AI
 2011-01-01 20:26:39 +00:00
Ivan Savenko
3d9dc0642d - gcc compile fixes 
- corrected projectiles for some units
 2010-12-24 15:37:48 +00:00
DjWarmonger
4696d89d2e Last part of hero specialities - support for peculiar enchants. 2010-08-31 08:39:32 +00:00
DjWarmonger
bfe266a377 Moved battle effects to bonus system. May be buggy. 
Moved creature damage to bonus system, simplified its handling. Some changes and tweaks.

Support for Adela's bless.
 2010-08-30 18:06:17 +00:00
Ivan Savenko
88fd213e87 - LodHandler now will ignore file extensions. 
Special case: MSK\MSG files (they have same names as def) can be accessed as file#msk or file#msg
- some fixes
 2010-08-28 15:10:37 +00:00
mateuszb
fc79b9b6cf * partial implementation of hero crossover 
* minor fixes to resolution handling
* other minor fixes and changes
 2010-08-28 14:52:20 +00:00
Ivan Savenko
dc2f3cf181 - some fixes for town events 
- #190 - InfoWindow components adjusted vertically
- #194 - correct sex for heroes in battles
 2010-08-25 14:57:58 +00:00
mateuszb
6b8718b046 * partially done support for resolutions smaller than 800x600 by screen scrolling 2010-08-23 15:16:40 +00:00
Ivan Savenko
8319e5e703 - town events implemented 
- merged CustomImagecComponent into SComponent
- moved some subID-related code from CastleInterface
 2010-08-18 14:24:30 +00:00
DjWarmonger
3f31f6d33d Pyramid fixes: #287, #403, #572, #575. It's config is now stored in bankconfig.txt 2010-08-18 13:42:46 +00:00
DjWarmonger
cbc215fa38 Fixed #445 2010-08-15 07:59:44 +00:00
Ivan Savenko
520d40cc59 - uploaded config/settings.txt from 0.82 (fix for #605) 
- fixes for #604 and #364
- ally support is mostly done:
-- exchange between heroes
-- exchange between hero\town
-- finishing the game
 2010-08-12 15:54:25 +00:00
mateuszb
ec5fa1dc22 * Mutare's special ability 
* implemented vial of dragon blood

* problems with teams discovered:
maps with noncontinuous player occupancy (e.g. only red and teal) crash on loading. hideTiles has obvious bugs - loop goes through teams and team numbers, but fw.player is set to team number, as is the 4th argument to getTielsInRange.
 2010-08-06 10:46:40 +00:00
mateuszb
3361126c55 * partially done building bonus (campaigns) 
* ERMU -> picture name mapping by Ivan (thanks)
 2010-08-02 14:29:30 +00:00
mateuszb
c06de1f1ce * improved campaign handling - bonus selection screen is mostly functional 
* preliminary support for giving campaign bonuses (resources and spells, artifacts, skills for generated hero are given)
* differing the amount of resources given to AI and human players
* minor changes
 2010-07-31 13:55:05 +00:00
Ivan Savenko
e025a43cb0 - some fixes for Castle Gate and Hill Fort 
- removed unavailable in Hill Fort upgrades from cr_upgrade_list.txt
- fixed bug in upgrading creatures
- workaround to make VCMI work with Russian language files (possibly fixed 289)
 2010-07-26 23:20:21 +00:00
Ivan Savenko
a00e5cc177 - implemented scholar skill 
- fixed some remaining building issues (#361)
- Portal of Summoning will now be present in fort window
- some fixes for Thieves Guild window (partial #386)
 2010-07-25 22:47:59 +00:00
Michał W. Urbańczyk
cedf6d812c Half-done Altar of Sacrifice. (Sacrificing creatures should work) 2010-07-20 06:05:45 +00:00
DjWarmonger
91b0340540 Support for level-dependent spell bonuses (Deemer) 
TODO: Bonuses for Resurrection, Animate Dead and probably other non-direct damage spells.
 2010-07-17 13:49:58 +00:00
DjWarmonger
115b626cfd Support for damage bonus (Ciele, Luna). Creeps won't grow on first day. 2010-07-17 13:11:12 +00:00
DjWarmonger
112ac29fc0 Support for special upgrades (like Gelu). 2010-07-17 06:49:16 +00:00
DjWarmonger
23d2dec3e5 Further support for specialities - fixed creature bonuses. Minor fixes. 2010-07-15 19:38:15 +00:00
DjWarmonger
24b47ce006 General tweaking of specialities for general consistency. 
Values now grow with level. Warning: they affect entire hero himself, not the specific type of creature.
 2010-07-08 19:10:26 +00:00
DjWarmonger
742e80b168 Preliminary distribution of hero specials. Sir Mullich actually works fine. 2010-07-06 07:32:40 +00:00
Ivan Savenko
2a99bc76da - part of castle gate handling (need to make server-client interaction) 
- minor fixes ( 361, 507, 466 )
 2010-06-26 10:01:26 +00:00
mateuszb
054672aff1 * fixed bug #117 2010-05-11 17:18:21 +00:00
mateuszb
adf7c1f561 Changes as described by http://bugs.vcmi.eu/view.php?id=423#c759 ( note 759 in #423 ) 2010-05-08 13:13:44 +00:00
mateuszb
bf9b8ff578 Fixed #423 2010-05-08 13:06:08 +00:00
mateuszb
ac7bc76b7b * implemented first aid kit including first aid secondary ability 2010-03-07 17:40:33 +00:00
mateuszb
c4ae0c4cf2 * KING1 / KING2 / KING3 support 
* ability 78 support
 2010-03-03 11:18:08 +00:00
mateuszb
336b260d8a * fixed #396 2010-03-02 10:37:52 +00:00
mateuszb
3a76d72b69 * support for increasing / decreasing luck / morale for allies / enemies 
* support for spell 77 (thunder-sth)
 2010-02-24 18:11:08 +00:00
mateuszb
5b0d646ddb * support for SPELL_AFTER_ATTACK, including most of spell 77 support 2010-02-23 15:39:31 +00:00
mateuszb
db755622b3 * next part of campaign support 2010-02-18 12:34:44 +00:00
mateuszb
968148c4dc * next part of bonus selection screen (including Ivan's config) 2010-02-16 17:28:56 +00:00
Michał W. Urbańczyk
0fdbe787dc * New file: lib/HeroBonus.cpp - updated project files for MSVC 
* Updated changelog
* Support for Lighthosues and Obelisks
* Bonus system extended on players 
* Army speed won't affect movement points when sailing
* Picking grail position (digging not implemented though, puzzle map only partially)
* Minor improvements
 2010-02-10 02:56:00 +00:00
Frank Zago
090cc602b6 Fixed buildings parsing. 2010-02-06 18:46:25 +00:00
Ivan Savenko
fa735b6a67 - partial implementation of scholar skill (spell exchange works, but no message) 
- some fixes
 2010-02-06 13:27:58 +00:00
Ivan Savenko
3aefb896fe - Created config file for true type fonts (disabled by default) 
- Implemented buildings with bonuses for defending hero (glyphs of fear, fountain of fortune, some grails)
- Minor fixes
 2010-02-04 15:50:59 +00:00
Michał W. Urbańczyk
94fa59cf45 * Compilation fix (missing includes, do not remove) 
* New settings.txt file (needed for kingdom overview to work)
* Last remainings of h3m format: hero placeholders parsing
* Minor improvements
 2010-02-01 17:07:46 +00:00
Ivan Savenko
def041a8c9 #39 and #106 - fixed cosmetic buildings behaviour 
#102 - fixed config + requirements system
#161 - extended clickable rectangle
and some minor fixes
 2009-12-29 13:40:16 +00:00
DjWarmonger
0daac5f265 Corrected resolutions settings by Zamolxis 2009-11-28 15:22:49 +00:00
mateuszb
ad0848f1d2 * fix for bugs 47 and 89 2009-10-18 14:39:53 +00:00
mateuszb
96add1cd62 * added missing puzzleSepia=1 to settings.txt 2009-09-30 14:42:50 +00:00
DjWarmonger
62cb72975c 1. All Ceature Banks now have correct configs. 
2. Pyramid is fully supported.
3. Minor Pandora fix.
 2009-09-25 15:40:28 +00:00
DjWarmonger
6d881789f6 1.Messenger banks won't reset monthly. 
2.Fixed ZRCBANKS and exported to bankconfig.txt file
 2009-09-25 09:38:59 +00:00
mateuszb
9a1669b926 * animation of catapult 
* stacks won't be reversed when attacked by turrets
 2009-09-24 13:44:55 +00:00
mateuszb
2d54b31b17 * fixed bug with lightning bolt 2009-09-23 13:22:40 +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
Frank Zago
1c2957d33f Re-inserted 1280x1024 resolution hijacked in r1220 and made 800x600 the default again. 2009-09-19 15:00:14 +00:00
DjWarmonger
c158f044e8 Updated config for 1440x900 resolution by Zamolxis. 2009-09-19 13:40:11 +00:00
mateuszb
320e3b9cde * small fixes for creature banks info 2009-09-17 10:47:47 +00:00
DjWarmonger
ce1c572294 Fixed defenders' position in Banks - now they are ordered correctly and match edges of battlefield. 2009-09-15 17:40:04 +00:00
mateuszb
ea5a836a7e * better positioning of moat/mlip 
* minor change
 2009-09-07 12:30:10 +00:00
mateuszb
05b0d82769 * next part of sieges 2009-09-05 14:10:26 +00:00
mateuszb
73acb19d09 * better obstacles.txt file by Ivan (+ fix for misspelling of OBGRS03) 2009-09-02 08:58:59 +00:00
mateuszb
399f58f1af * partially implemented puzzle map 2009-08-31 15:57:15 +00:00