Commit graph

9231 commits

Author SHA1 Message Date
Severin Glöckner
f2a1acd97e 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:38:26 +02:00
Severin Glöckner
c7d8d23256 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:38:26 +02:00
Severin Glöckner
785f91065b 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:04:23 +02:00
sigurdfdragon
d22c1746e8 SotA S21: Set facing for naga appearance 2018-07-04 18:06:57 -04:00
sigurdfdragon
2f710f83bf SotA S11 & 21: Fix #3294
Adjust units to have appropriate gender for story reasons.
2018-07-04 17:13:15 -04:00
sigurdfdragon
fd43d8454c SotA S16: Simplify dialog to fix #3291 2018-07-04 13:52:48 -04:00
Severin Glöckner
a62264412d DiD S10: add a redraw
apparently it happens normally only after dismissing the objectives

[ci skip]
2018-07-04 15:45:39 +02:00
Severin Glöckner
090ad3140f 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:45:39 +02:00
Severin Glöckner
5dc80e7428 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:12:51 +02:00
josteph
ea62caadf0 TSG S05: Merge all instances of [objectives].
Suggested by @sevu.
2018-07-03 00:48:34 +02:00
josteph
f4ba5cbcb8 TSG S05: Hide completed objectives.
Fixes #3031.
2018-07-03 00:48:34 +02:00
Charles Dang
c39aa72f56 Fixup 7807694
[ci skip]
2018-07-03 06:58:31 +11:00
Charles Dang
78076941a0 DiD S6: fixed previously stored orc leader ending up in the wrong place (fixes #3304)
[ci skip]
2018-07-03 06:48:57 +11:00
pentarctagon
649fdc9a62 Remove unused images from Dead Water.
Also confirmed via PM with beetlenaut that they can be removed, and aren't supposed to still be there.
2018-06-29 15:35:22 -05:00
Severin Glöckner
37566db87c NR S5a: clarify text
[ci skip]
2018-06-22 18:51:08 +02:00
Severin Glöckner
e1cd47b8ec NR S7a: remove dots from objectives
[ci skip]
2018-06-22 11:57:55 +02:00
Severin Glöckner
9d95aa776c SotA: reuse mainline string for ancient lich
[ci skip]
2018-06-18 20:11:29 +02:00
ln-zookeeper
a98c658742 UtBS: Cropped Kaleh's base sprite back to 72x72
[ci skip]
2018-06-17 11:05:05 +03:00
ln-zookeeper
a702674da2 EI S17b: Prevent spell breaking effect playing out twice (fixes #3254) 2018-06-17 10:53:32 +03:00
doofus-01
41adc41093 UtBS S08: mostly cosmetic changes to map 2018-06-17 00:32:40 +11:00
doofus-01
13ec0493fc UtBS S06b and S07b: cosmetic changes to maps, to make them more fitting with dialogs 2018-06-17 00:32:39 +11:00
doofus-01
ea3ee2a336 UtBS S06b: make sure dwarf sergeant is facing the right way in comic-relief dialog 2018-06-17 00:32:39 +11:00
doofus-01
a3294cd04d change sun-sylph halo to be warmer, sunny color, instead of clean, holy color 2018-06-17 00:32:38 +11:00
doofus-01
f0b963a2b1 slight tweak to Kalehs base sprite 2018-06-17 00:32:37 +11:00
doofus-01
5fbd494244 UtBS S05: replace troll camps with actual troll camps instead of orc castles 2018-06-17 00:32:36 +11:00
doofus-01
4b1a06a82d UtBS S04 and S05: some variations in scenery items 2018-06-17 00:32:36 +11:00
Steve Cotton
ad7bc19dd9 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:02:56 +02:00
Steve Cotton
d5f6c17239 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:02:56 +02:00
Steve Cotton
94dd2880c6 DW: Change the team name from Merman Forces to Merfolk 2018-06-15 21:02:56 +02:00
Steve Cotton
ce093e2290 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:55:04 +02:00
ln-zookeeper
c9bb31d1cc EI S11: Fixed missing prisoners (fixes #3237)
The problem was introduced by commit 0f511e8 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:16:44 +03:00
Thom Diment
b3c40498d8 DW 5 Tirigaz - Changes to orc leader death event (#3103)
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
2018-06-11 14:40:47 +02:00
doofus-01
636575627d UtBS S12: Make alien central body vulnerability more visible to player 2018-06-11 16:43:36 +11:00
doofus-01
7924649319 UtBS S11: Citadel graphics, drawn over the cavewall donut 2018-06-11 16:43:35 +11:00
Charles Dang
500259a7c2 DiD S6: shift the escape location slightly to account for the map redraw
[ci skip]
2018-06-10 10:57:36 +11:00
Charles Dang
b6416b8329 DiD S1/S6: new Parthyn maps
[ci skip]
2018-06-10 10:45:29 +11:00
stevecotton
8d055bf038 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 01:09:53 +03:00
Severin Glöckner
18a101be66 Tutorial: show the female fighteress in the help (if she is chosen)
Uses the workaround mentioned in #3012

[ci skip]
2018-06-08 18:01:23 +02:00
Thom Diment
7feb9aee11 UtBS 5: changes to scenario locations (#3104)
* UtBS 5: changes to scenario locations

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

Fixes #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:40:22 +02:00
doofus-01
9bb6cbb82c UtBS: Graphics update for Giant Ant (#3190)
* graphics update for giant ant unit

* slight revision to ant base sprite
2018-06-07 11:48:40 +03:00
sigurdfdragon
85ba7797b2 DW: Fix #3207
...by preventing any allied units from moving to the sword.
2018-06-04 23:56:39 -04:00
Severin Glöckner
fc427ce58c 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

* and run wmlindent

[ci skip]
2018-06-04 19:42:42 +02:00
Thom Diment
913b77d79d NR5_1: Fixes to Malifor attack and secret door events (#3154)
NR S5a: bugfixes

* Fixes #3117 - Malifor damage event now occurs on defence as well on attack

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

[ci skip]
2018-06-04 18:52:20 +02:00
Charles Dang
c7a06939ab Tutorial S2: made enemy starting gold equal to that of the player
[ci skip]
2018-06-04 06:42:32 +11:00
Charles Dang
20af37d527 NR S10 - 14: minor cosmetic map tweaks
[ci skip]
2018-06-03 05:18:41 +11:00
Charles Dang
a46eaa2874 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:57:35 +11:00
Charles Dang
5adb931b2a 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:23:44 +11:00
sigurdfdragon
047ededd9e SotA S09: Fix #3192
...by making the filter more exact.
2018-05-31 19:38:23 -04:00
Byteron
7f2a8f7c19 TSG: Deoran can't recruit Peasants anymore
for the whole campaign, only in the first two scenarios

closes #3051 [ci skip]
2018-05-30 21:47:42 +02:00
Nils Kneuper
183bc272ea updated Italian translation 2018-05-26 21:41:08 +02:00