Skip to content

Commit

Permalink
Remove door terrains that were supposed to be removed by 1.14
Browse files Browse the repository at this point in the history
If someone was using these despite being hidden and everything they were
really asking to get shot in the foot at some point.

(cherry-picked from commit 6eddc6f)
  • Loading branch information
irydacea committed Oct 7, 2018
1 parent 5aa4bf2 commit 8c369ed
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 69 deletions.
3 changes: 3 additions & 0 deletions changelog.md
Expand Up @@ -70,6 +70,9 @@
* Fixed various instances of the server crashing under certain conditions.
### Packaging
* OpenMP support has been removed. It is no longer an optional build-time dependency.
### Terrains
* Removed hidden terrains that were not supposed to make it to 1.14: ^Prg,
^Prgo, ^Pwd, ^Pwdo
### Units
* Changed the plural name for the merfolk race from Mermen to Merfolk (issue #2940)
and replaced a few instances in core unit or terrain descriptions accordingly.
Expand Down
6 changes: 0 additions & 6 deletions data/core/terrain-graphics.cfg
Expand Up @@ -433,12 +433,6 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
{GATES_DIAGONAL_SW_L (*^Pw\o) (X*) 0 () portals/door-wooden-open}
{GATES_DIAGONAL_SE_L (*^Pw/o) (X*) 0 () portals/door-wooden-open}

# Simple dummy tiles for obsolete terrain codes
{NEW:OVERLAY (*^Prg) portals/gate-rusty-long-n}
{NEW:OVERLAY (*^Prgo) portals/gate-rusty-open-long-n}
{NEW:OVERLAY (*^Pwd) portals/door-wooden-long-n}
{NEW:OVERLAY (*^Pwdo) portals/door-wooden-open-long-n}


#
# > B A S E T E R R A I N S <
Expand Down
63 changes: 0 additions & 63 deletions data/core/terrain.cfg
Expand Up @@ -1400,69 +1400,6 @@ Occasionally caves are <ref>dst='terrain_illuminated_cave' text='illuminated'</r
hide_help=yes
[/terrain_type]

#
# ## Previous directionless gate terrains (for backwards compatibility) ##
# ## Should be removed by BfW 1.14.0
#

[terrain_type]
symbol_image=void/void
editor_image=portals/gate-rusty-long-se
id=portal_gate_rusty
name= _ "Gate"
editor_name= _ "Rusty Gate"
string=^Prg
default_base=Rr
aliasof=_bas,Xt
mvt_alias=Xt
editor_group=embellishments,obstacle
hidden=yes
hide_help=yes
[/terrain_type]

[terrain_type]
symbol_image=void/void
editor_image=portals/door-wooden-long-se
id=portal_door_wooden
name= _ "Door"
editor_name= _ "Wooden Door"
string=^Pwd
default_base=Rr
aliasof=_bas,Xt
mvt_alias=Xt
editor_group=embellishments,obstacle
hidden=yes
hide_help=yes
[/terrain_type]

[terrain_type]
symbol_image=void/void
editor_image=portals/gate-rusty-open-long-se
id=p_open_rusty
name= _ "Gate"
editor_name= _ "Rusty Open Gate"
string=^Prgo
default_base=Rr
aliasof=_bas
editor_group=embellishments
hidden=yes
hide_help=yes
[/terrain_type]

[terrain_type]
symbol_image=void/void
editor_image=portals/door-wooden-open-long-se
id=p_open_wooden
name= _ "Door"
editor_name= _ "Wooden Open Door"
string=^Pwdo
default_base=Rr
aliasof=_bas
editor_group=embellishments
hidden=yes
hide_help=yes
[/terrain_type]

#
# ## Invisible obstacle overlays ##
#
Expand Down

0 comments on commit 8c369ed

Please sign in to comment.