0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NR S5a: more bugfixes

Browse source 
* 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]
This commit is contained in:
Severin Glöckner 2018-06-04 19:16:24 +02:00
parent 2935946c12
commit 05e053ca43
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Northern_Rebirth/lua/respawn_utils.lua
View file

@ -26,7 +26,7 @@ function wesnoth.wml_actions.find_respawn_point(cfg)
}
},
T["not"] {
terrain = "Wo,*^Xm,X*,Q*"
terrain = "Wo,*^Xm,*^Xo,X*,Q*"
}
})

4
data/campaigns/Northern_Rebirth/maps/05a_01_The_Pursuit.map
View file

@ -2,8 +2,8 @@ Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xu, Xos, Xu, Xos, Xu, Xu, X
Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Rd, Xu, Re, Xu, Xu, Xu, Uh^Uf, Xu, Xu, Xu, Xu, Xu, Xos, Qxu, Xos, Xu, Xu, Xu, Wog^Xo, Wog^Xo, Wog^Xo, Xu, Xos, Xu, Xu, Xu, Xu, Xu
Xu, Xu, Xu, Xu, Uu, Kh, Cud, Xu, Uu, Xu, Re^Edb, Rd^Edb, Re^Edb, Rd^Edb, Re, Re^Es, Re^Edb, Rd^Edb, Re^Edb, Xu, Uu^Es, Uu^Uf, Uh, Xu, Xos, Xos, Urb, Urb, Cud, Xos, Xos, Xu, Xuc, Wog, Wog, Wog^Xo, Wog^Xo, Xos, Xos, Xu, Xu, Xu
Xu, Xu, Xu, Xu, Xu, Cud, Uu, Xu, Uu, Xu, Re, Chr^Eb, Re^Edb, Re, Ch, Re^Edb, Rd, Chr^Eb, Re, Xu, Uu, Uu^Es, Uu, Xu, Cud, Cud, Urb, Urb, Urb, Cud, Xuc, Xuc, Cud, Wwg, Wwg, Wog, Wog, Wog^Xo, Wog^Xo, Xos, Xu, Xu
Xu, Xu, Xu, Xu, Xu, Cud, Uu, Uu, Uu, Xu, Rd, Re^Es, Re^Es, Chr^Edb, Kh, Chr, Re, Rd^Edb, Re, Xu, Xu, Xu, Xuc, Xu, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud, Cud, Cud, Cud, Wwg, Wwg, Wog, Wog^Xo, Xos, Xos, Xu
Xu, Xu, Xu, Xu, Xu, Cud, Xu, Xu, Xu, Xu, Re, Rd^Edb, Re^Edb, Chr, Ch, Chr, Re^Edb, Re, Rd, Xu, Xu, Xu, Xuc, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud^Ebn, Cud, 2 Kud, Cud, Cud, Cud, Xuc, Wog, Xos, Xos, Xu
Xu, Xu, Xu, Xu, Xu, Cud, Uu, Uu, Uu, Xu, Rd, Re^Es, Re^Es, Chr^Edb, Kh, Chr, Re, Rd^Edb, Re, Xu, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud, Cud, Cud, Cud, Wwg, Wwg, Wog, Wog^Xo, Xos, Xos, Xu
Xu, Xu, Xu, Xu, Xu, Cud, Xu, Xu, Xu, Xu, Re, Rd^Edb, Re^Edb, Chr, Ch, Chr, Re^Edb, Re, Rd, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud^Ebn, Cud, 2 Kud, Cud, Cud, Cud, Xuc, Wog, Xos, Xos, Xu
Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Chr^Eb, Re, Re, Re, Rd^Edb, Re, Chr^Eb, Re, Xu, Xu, Xu, Xuc, Cud^Eb, Urb, Urb, Urb, Urb, Urb, Urb, Rr, Rr, Urb, Cud^Ebn, Urb, Cud, Xuc, Xuc, Wwg, Wog, Xos, Xu
Xu, Xu, Xu, Xu, Qxu, Xu, Xu, Cud, Rd, Uu, Uu, Re^Edb, Xu, Rd, Re^Es, Re^Es, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Rr, Rr, Urb, Urb, Urb, Urb, Urb, Urb, Xu, Xu, Wwg, Wog, Xos, Xos
Xu, Xu, Qxu, Qxu, Uh^Vu, Uh, Re, Rd, Uu, Urb, Cud, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xos, Urb, Urb, Rr, Rr, Urb, Urb, Urb, Urb, Urb, Urb, Xu, Cud, Xu, Xu, Wwg^Xo, Wwg, Xos, Xos

14
data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
View file

@ -232,6 +232,17 @@
team_name=monsters
user_team_name= _ "Monsters"
no_leader=yes
# If the players opens the other door, the spiders attack the undead too
# They can't harm Malifor, but they should not gather around him either
[ai]
[avoid]
[filter]
id=Malifor
[/filter]
radius=3
[/avoid]
[/ai]
[/side]
# Whole lot of doors
@ -2650,7 +2661,7 @@
# Don't allow anyone but Morvin and Thera to damage Malifor
{FORCE_CHANCE_TO_HIT (
side=1
side=1,8
[not]
id=Father Morvin,Sister Thera
[/not]
@ -2845,7 +2856,6 @@
[event]
name=scenario_end
{CLEAR_VARIABLE malifor_respawn_point,malifor_died_by}
{CLEAR_VARIABLE back_door_opened,main_door_opened,spider_door_opened,got_rod_of_justice}
[/event]