Commit graph

9992 commits

Author SHA1 Message Date
Severin Glöckner
1b2a6b96c1 TSG 04: Better implementation to protect the magican
The player can all the time view the stats of any unit in the sidebar. This allowed to
see that he doesn't attack because he has only one move. There is no way to see the
movement costs directly, and as long as they are higher than the max_moves it's not
possible to figure out that this is not AI behavior but a game restriction.

Additionally, as the player has to kill both leaders to continue, try to not let the
player camp around the castle for the rest of the game, by giving the leader a possiblity
to attack if he recruited last turn a unit.

[ci skip]
2018-07-06 22:32:29 +02:00
Severin Glöckner
990bedd52e slight text edits
- missing dots in some MP strings
- superfluous space in some MP strings
-ran wmlinden on UtBS scenarios

[ci skip]
2018-07-05 08:35:57 +02:00
Severin Glöckner
34670e3ff4 Change Campfire timezones in TSG S8b
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is an visual change, no gameplay changes included.

Due to the lack of a save I could not view the result myself,
I chose the ToD shifting colors based on the other scenarios.

part of #3056

[ci skip]
2018-07-05 08:35:57 +02:00
Severin Glöckner
c80562aff0 Change campfire timezones in UtBS S3
Instead of having another ToD, the image of the current ToD is used,
but illuminated. This is a visual change, no gameplay changes included.

The ToD shifting for 'dawn' looked better than for 'dusk', and was
conidered better looking than having no ToD shift compared to the
surrounding.

part of #3056

[ci skip]
2018-07-05 08:35:57 +02:00
Severin Glöckner
a8f53903b9 NR: Disallow lvl 0 recruits after scenario 5.
Don't bother carrying them through the whole campaign.
This scenario seems like a good time, because there begins a new episide in the story
and all the level 1 advancement are available now too.

closes #3074

[ci skip]
2018-07-05 02:03:40 +02:00
sigurdfdragon
5f177ae3bb SotA S21: Set facing for naga appearance 2018-07-04 18:04:58 -04:00
sigurdfdragon
a4bad90bad SotA S11 & 21: Fix #3294
Adjust units to have appropriate gender for story reasons.
2018-07-04 17:13:22 -04:00
sigurdfdragon
1d841bd12b SotA S16: Simplify dialog to fix #3291 2018-07-04 13:46:16 -04:00
Severin Glöckner
c36d209d14 DiD S10: add a redraw
apparently it happens normally only after dismissing the objectives

[ci skip]
2018-07-04 15:41:13 +02:00
Severin Glöckner
3149061a72 TSG S4: prevent leader of the undeads from suiciding
This is generally a problem with most leaders, but here it's worse.

Also changed his keep to the ruined version.
(Not the ajdacent castle tiles as it looks better that way.)

[ci skip]
2018-07-04 15:01:15 +02:00
Severin Glöckner
4c20cc3354 TSG S5: fix an unlikely scenario outcome
In case the player goes south and runs away fromt he bandits, and defeats
the lich first, then the choice to side or not with the bandits would
happen very late.
In case he allied with them and the other undead leader still lived, he
could end the scenario still by triggering "enemies defeated". If they were
already defeated, the scenario could not end anymore. Furthermore, the
storytext doesn't make sense anymore, at least the ending dilogue would
miss,
In case of siding with the elves one can still win by defeating Urza Afalas.
and the story still makes sense,

To solve this, in this special situation the player has no choice anymore,
the path of the elves is chosen.

(the diff may be hard to read; a good part has been wrappend with an [if])

[ci skip]
2018-07-03 04:11:29 +02:00
josteph
00c637d5df TSG S05: Merge all instances of [objectives].
Suggested by @sevu.
2018-07-03 00:45:33 +02:00
josteph
aae5057dbd TSG S05: Hide completed objectives.
Fixes #3031.
2018-07-03 00:45:33 +02:00
Charles Dang
2e0fb3c033 Fixup 8659c32
[ci skip]
2018-07-03 06:56:09 +11:00
Charles Dang
8659c32afc DiD S6: fixed previously stored orc leader ending up in the wrong place (fixes #3304)
[ci skip]
2018-07-03 06:48:03 +11:00
Severin Glöckner
b1208eb07c NR S5a: clarify text
[ci skip]
2018-06-22 18:53:10 +02:00
Severin Glöckner
b96e2487fe NR S7a: remove dots from objectives
[ci skip]
2018-06-22 11:56:49 +02:00
Severin Glöckner
7e169d3a56 SotA: reuse mainline string for ancient lich
[ci skip]
2018-06-18 19:22:01 +02:00
ln-zookeeper
67076d376a UtBS: Cropped Kaleh's base sprite back to 72x72
[ci skip]
2018-06-17 11:04:23 +03:00
ln-zookeeper
02433addaf EI S17b: Prevent spell breaking effect playing out twice (fixes #3254) 2018-06-17 10:52:02 +03:00
doofus-01
2be0ff9401 UtBS S08: mostly cosmetic changes to map 2018-06-17 00:29:53 +11:00
doofus-01
ebef8592d2 UtBS S06b and S07b: cosmetic changes to maps, to make them more fitting with dialogs 2018-06-17 00:29:52 +11:00
doofus-01
729a349973 UtBS S06b: make sure dwarf sergeant is facing the right way in comic-relief dialog 2018-06-17 00:29:52 +11:00
doofus-01
e071f5a8da change sun-sylph halo to be warmer, sunny color, instead of clean, holy color 2018-06-17 00:29:52 +11:00
doofus-01
a908fc9d6f slight tweak to Kalehs base sprite 2018-06-17 00:29:51 +11:00
doofus-01
bd42298f5b UtBS S05: replace troll camps with actual troll camps instead of orc castles 2018-06-17 00:29:51 +11:00
doofus-01
f7c6bb40e3 UtBS S04 and S05: some variations in scenery items 2018-06-17 00:29:40 +11:00
Steve Cotton
eba32fd8da DW: Change the team name from Merman Forces to Merfolk 2018-06-15 21:01:28 +02:00
Steve Cotton
9a6b07f3b0 Dead Water: Change "mermen" to "merfolk" (part of #2940)
This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.
2018-06-15 21:01:28 +02:00
Steve Cotton
a1d92d466e Prose: the Storm Trident's description uses "merfolk" (issue #2936)
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).
2018-06-15 21:01:28 +02:00
Steve Cotton
84c081a1c6 DW S05: Add a po hint about the orc saying "mermen" (part of #2940) (#3243)
The orc calls them fish-men several times, so changing it to "merfolk"
wouldn't fit.

Also a whitespace fix from wmlindent.

[ci skip]
2018-06-13 13:53:47 +02:00
ln-zookeeper
354a6709f9 EI S11: Fixed missing prisoners (fixes #3237)
The problem was introduced by commit 1e7c25a139 due to the [modify_unit] tag apparently causing prisoners to disappear because technically they were duplicates as they had merely been unstored and still existed on the recall list as well.
2018-06-12 23:06:19 +03:00
Thom Diment
ba7728c783 DW 5 Tirigaz - Changes to orc leader death event
Fixes #3092 - Updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3903 - Gold event doesn't fire if ghosts kill the orc leader

[ci skip]
2018-06-11 14:44:31 +02:00
doofus-01
ad53608e42 UtBS S12: Make alien central body vulnerability more visible to player 2018-06-11 16:42:58 +11:00
doofus-01
4fca052085 UtBS S11: Citadel graphics, drawn over the cavewall donut 2018-06-11 16:42:58 +11:00
Severin Glöckner
df8ac3cbb0 add / remove some comments
[ci skip]
2018-06-10 03:04:23 +02:00
Severin Glöckner
9cac36e6b8 Tutorial Part2: Give the player a canche to undo his move
in case he started an attack from the water. The warning
makes no sense otherwise.

[ci skip]
2018-06-10 03:04:23 +02:00
Charles Dang
be7ecbba85 DiD S6: shift the escape location slightly to account for the map redraw
[ci skip]
2018-06-10 10:56:56 +11:00
Charles Dang
b3d492b81e DiD S1/S6: new Parthyn maps
[ci skip]
2018-06-10 10:43:24 +11:00
stevecotton
cf6bb49fae DiD S2: When ambushed by goblins, cancel any pending attack (#3227)
This happens in a village-capture event, so the unit has finished
moving for this turn in any case.
2018-06-09 00:25:34 +03:00
Severin Glöckner
ba487c852f Tutorial: show the female fighteress in the help (if she is chosen)
Uses the workaround mentioned in #3012

[ci skip]
2018-06-08 17:58:10 +02:00
Thom Diment
bf28cc7d76 UtBS 5: changes to scenario locations (#3104)
* UtBS 5: changes to scenario locations

From #3077:
* Moved AI leader spawns to keeps
* Changed spawn of trolls that were spawning in walls
* Sanity-checked village ownership in cavern

From #3078:
* Changed spawn of Eastern Troll Flamecaster
* Fixed entry routes of Troll Flamecasters

From author notes:
* Made 'Wounded Dwarf' a wounded unit
2018-06-08 16:41:41 +02:00
doofus-01
216215830a UtBS: Graphics update for Giant Ant (#3190)
* graphics update for giant ant unit

* slight revision to ant base sprite
2018-06-07 11:43:30 +03:00
sigurdfdragon
36dd2a0f2d DW: Fix #3207
...by preventing any allied units from moving to the sword.
2018-06-04 23:37:05 -04:00
Severin Glöckner
05e053ca43 NR S5a: more bugfixes
* now the situation can appear that spiders can attack Malifor,
  this handles it.
* add *^Xo Terrain to the filter. While there is no bug to fix,
  it looks like it belongs there too.
* work around a tile glitching with an [item] at 22,4
* remove code referring to removed variables

[ci skip]
2018-06-04 19:39:38 +02:00
Thom Diment
2935946c12 NR S5a: bugfixes
* Fixes #3117 - Malifor damage event now occurs on defence as well as on attack

* Fixes #3116 - Doors to the study can now be opened from inside

[ci skip]
2018-06-04 19:37:25 +02:00
Charles Dang
ff763d1bb7 Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]
2018-06-04 06:41:33 +11:00
Charles Dang
4f7e789f2d NR S10 - 14: minor cosmetic map tweaks
[ci skip]
2018-06-03 05:09:25 +11:00
Charles Dang
e9639b58a4 NR S13: further reduce enemy gold
[ci skip]

Also fixed an error in my last commit that gave your ally Dwarvish side *more*
gold on higher difficulties.
2018-06-03 00:48:33 +11:00
Charles Dang
af16289678 NR S11 - 13: reduced enemy starting gold and income (resolves #3198)
[ci skip]

Also similarly reduced one of your ally's starting gold in S13.
2018-06-02 09:21:34 +11:00