diff --git a/darcap/darcap/circus/ghost b/darcap/darcap/circus/ghost index d151f4d2e..a29d9f82a 100644 --- a/darcap/darcap/circus/ghost +++ b/darcap/darcap/circus/ghost @@ -1225,7 +1225,7 @@ arch dungeon_floor x 8 y 13 end -arch gargolye +arch gargoyle x 8 y 13 unaggressive 1 @@ -2198,7 +2198,7 @@ arch dungeon_floor x 15 y 14 end -arch gargolye +arch gargoyle x 15 y 14 end diff --git a/editor/pickmaps/monster b/editor/pickmaps/monster index 757631653..843db6e0e 100644 --- a/editor/pickmaps/monster +++ b/editor/pickmaps/monster @@ -471,7 +471,7 @@ y 45 arch spell_magic_bullet end end -arch gargolye +arch gargoyle x 3 y 46 end diff --git a/quests/mak/chaos/monsters.pick b/quests/mak/chaos/monsters.pick index 0d78b6099..81f4126f0 100644 --- a/quests/mak/chaos/monsters.pick +++ b/quests/mak/chaos/monsters.pick @@ -294,7 +294,7 @@ arch wandering_terror x 5 y 4 end -arch large_gargolye +arch large_gargoyle x 5 y 7 end diff --git a/quests/mak/chaos/up3 b/quests/mak/chaos/up3 index 43f027dc8..41d3c9f1c 100644 --- a/quests/mak/chaos/up3 +++ b/quests/mak/chaos/up3 @@ -491,7 +491,7 @@ arch woodfloor x 3 y 4 end -arch large_gargolye +arch large_gargoyle x 3 y 4 end @@ -507,7 +507,7 @@ arch woodfloor x 3 y 7 end -arch large_gargolye +arch large_gargoyle x 3 y 7 end @@ -603,7 +603,7 @@ arch woodfloor x 3 y 27 end -arch large_gargolye +arch large_gargoyle x 3 y 27 end @@ -701,7 +701,7 @@ arch woodfloor x 4 y 18 end -arch large_gargolye +arch large_gargoyle x 4 y 18 end @@ -941,7 +941,7 @@ arch woodfloor x 6 y 7 end -arch large_gargolye +arch large_gargoyle x 6 y 7 end @@ -981,7 +981,7 @@ arch woodfloor x 6 y 15 end -arch large_gargolye +arch large_gargoyle x 6 y 15 end @@ -1033,7 +1033,7 @@ arch woodfloor x 6 y 25 end -arch large_gargolye +arch large_gargoyle x 6 y 25 end @@ -2108,7 +2108,7 @@ arch woodfloor x 13 y 2 end -arch large_gargolye +arch large_gargoyle x 13 y 2 end @@ -2120,7 +2120,7 @@ arch woodfloor x 13 y 4 end -arch large_gargolye +arch large_gargoyle x 13 y 4 end @@ -2764,7 +2764,7 @@ arch woodfloor x 17 y 4 end -arch large_gargolye +arch large_gargoyle x 17 y 4 end @@ -3407,7 +3407,7 @@ arch woodfloor x 21 y 10 end -arch large_gargolye +arch large_gargoyle x 21 y 10 end @@ -3565,7 +3565,7 @@ arch woodfloor x 22 y 2 end -arch large_gargolye +arch large_gargoyle x 22 y 2 end @@ -3815,7 +3815,7 @@ arch woodfloor x 23 y 25 end -arch large_gargolye +arch large_gargoyle x 23 y 25 end @@ -3901,7 +3901,7 @@ arch woodfloor x 24 y 12 end -arch large_gargolye +arch large_gargoyle x 24 y 12 end @@ -4015,7 +4015,7 @@ arch woodfloor x 25 y 3 end -arch large_gargolye +arch large_gargoyle x 25 y 3 end @@ -4131,7 +4131,7 @@ arch woodfloor x 25 y 28 end -arch large_gargolye +arch large_gargoyle x 25 y 28 end @@ -4173,7 +4173,7 @@ arch woodfloor x 26 y 5 end -arch large_gargolye +arch large_gargoyle x 26 y 5 end @@ -4193,7 +4193,7 @@ arch woodfloor x 26 y 8 end -arch large_gargolye +arch large_gargoyle x 26 y 8 end @@ -4269,7 +4269,7 @@ arch woodfloor x 26 y 23 end -arch large_gargolye +arch large_gargoyle x 26 y 23 end @@ -4573,7 +4573,7 @@ arch woodfloor x 28 y 24 end -arch large_gargolye +arch large_gargoyle x 28 y 24 end @@ -4655,7 +4655,7 @@ arch woodfloor x 29 y 10 end -arch large_gargolye +arch large_gargoyle x 29 y 10 end @@ -4667,7 +4667,7 @@ arch woodfloor x 29 y 12 end -arch large_gargolye +arch large_gargoyle x 29 y 12 end @@ -4695,7 +4695,7 @@ arch woodfloor x 29 y 17 end -arch large_gargolye +arch large_gargoyle x 29 y 17 end diff --git a/quests/todd/aljwaf/hall2 b/quests/todd/aljwaf/hall2 index a133ca5b0..85bfbfeef 100644 --- a/quests/todd/aljwaf/hall2 +++ b/quests/todd/aljwaf/hall2 @@ -1216,7 +1216,7 @@ arch stonefloor2 x 6 y 16 end -arch gargolye +arch gargoyle x 6 y 16 unaggressive 1 @@ -1438,7 +1438,7 @@ arch stonefloor2 x 7 y 16 end -arch gargolye +arch gargoyle x 7 y 16 unaggressive 1 @@ -1633,7 +1633,7 @@ arch stonefloor2 x 8 y 16 end -arch gargolye +arch gargoyle x 8 y 16 unaggressive 1 @@ -2397,7 +2397,7 @@ arch stonefloor2 x 12 y 13 end -arch gargolye +arch gargoyle Wis 5 x 12 y 13 @@ -2603,7 +2603,7 @@ arch stonefloor2 x 13 y 13 end -arch gargolye +arch gargoyle Wis 5 x 13 y 13 @@ -3951,7 +3951,7 @@ arch stonefloor2 x 19 y 22 end -arch gargolye +arch gargoyle Wis 5 x 19 y 22 @@ -4116,7 +4116,7 @@ arch stonefloor2 x 20 y 22 end -arch gargolye +arch gargoyle Wis 5 x 20 y 22 @@ -4126,7 +4126,7 @@ arch stonefloor2 x 20 y 23 end -arch gargolye +arch gargoyle Wis 5 x 20 y 23 @@ -4291,7 +4291,7 @@ arch stonefloor2 x 21 y 22 end -arch gargolye +arch gargoyle Wis 5 x 21 y 22 @@ -4301,7 +4301,7 @@ arch stonefloor2 x 21 y 23 end -arch gargolye +arch gargoyle Wis 5 x 21 y 23 @@ -4454,7 +4454,7 @@ arch stonefloor2 x 22 y 22 end -arch gargolye +arch gargoyle Wis 5 x 22 y 22 @@ -4464,7 +4464,7 @@ arch stonefloor2 x 22 y 23 end -arch gargolye +arch gargoyle Wis 5 x 22 y 23 @@ -4641,7 +4641,7 @@ arch stonefloor2 x 23 y 22 end -arch gargolye +arch gargoyle Wis 5 x 23 y 22 diff --git a/santo_dominion/temple_naive/templenaive.1 b/santo_dominion/temple_naive/templenaive.1 index 69d177757..1c3bdd34e 100755 --- a/santo_dominion/temple_naive/templenaive.1 +++ b/santo_dominion/temple_naive/templenaive.1 @@ -1900,7 +1900,7 @@ arch marble x 9 y 12 end -arch gargolye +arch gargoyle x 9 y 12 end @@ -1956,7 +1956,7 @@ arch marble x 9 y 19 end -arch gargolye +arch gargoyle x 9 y 19 end @@ -3191,7 +3191,7 @@ arch marble x 15 y 12 end -arch gargolye +arch gargoyle x 15 y 12 end @@ -3257,7 +3257,7 @@ arch marble x 15 y 19 end -arch gargolye +arch gargoyle x 15 y 19 end diff --git a/styles/monsterstyles/nethack/nethack_10 b/styles/monsterstyles/nethack/nethack_10 index 515260080..88b323a94 100644 --- a/styles/monsterstyles/nethack/nethack_10 +++ b/styles/monsterstyles/nethack/nethack_10 @@ -267,7 +267,7 @@ y 3 attacktype 33 undead 1 end -arch gargolye +arch gargoyle x 2 y 5 end @@ -567,7 +567,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -676,7 +676,7 @@ y 19 speed 0.350000 level 15 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -758,7 +758,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_11 b/styles/monsterstyles/nethack/nethack_11 index 2f9a283f1..5943b2690 100644 --- a/styles/monsterstyles/nethack/nethack_11 +++ b/styles/monsterstyles/nethack/nethack_11 @@ -677,7 +677,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -854,7 +854,7 @@ y 14 speed 0.350000 level 15 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -986,7 +986,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_12 b/styles/monsterstyles/nethack/nethack_12 index db240acc3..a2c4bc1ac 100644 --- a/styles/monsterstyles/nethack/nethack_12 +++ b/styles/monsterstyles/nethack/nethack_12 @@ -694,7 +694,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -875,7 +875,7 @@ y 14 speed 0.350000 level 15 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -1011,7 +1011,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_13 b/styles/monsterstyles/nethack/nethack_13 index bd848a1c8..f3b00e57e 100644 --- a/styles/monsterstyles/nethack/nethack_13 +++ b/styles/monsterstyles/nethack/nethack_13 @@ -519,7 +519,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -650,7 +650,7 @@ y 7 speed 0.350000 level 15 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -748,7 +748,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_14 b/styles/monsterstyles/nethack/nethack_14 index 58e43edda..8cce8397d 100644 --- a/styles/monsterstyles/nethack/nethack_14 +++ b/styles/monsterstyles/nethack/nethack_14 @@ -527,7 +527,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -662,7 +662,7 @@ y 7 speed 0.350000 level 15 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -760,7 +760,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_15 b/styles/monsterstyles/nethack/nethack_15 index cdb880d45..65a049922 100644 --- a/styles/monsterstyles/nethack/nethack_15 +++ b/styles/monsterstyles/nethack/nethack_15 @@ -527,7 +527,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -662,7 +662,7 @@ y 7 speed 0.350000 level 15 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -760,7 +760,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_16 b/styles/monsterstyles/nethack/nethack_16 index 1374ad4e1..725861b13 100644 --- a/styles/monsterstyles/nethack/nethack_16 +++ b/styles/monsterstyles/nethack/nethack_16 @@ -157,7 +157,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -228,7 +228,7 @@ level 15 attacktype 1 resist_magic 0 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -285,7 +285,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_17 b/styles/monsterstyles/nethack/nethack_17 index 7235cfb9e..cc5c12808 100644 --- a/styles/monsterstyles/nethack/nethack_17 +++ b/styles/monsterstyles/nethack/nethack_17 @@ -161,7 +161,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -232,7 +232,7 @@ level 15 attacktype 1 resist_magic 0 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -289,7 +289,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_18 b/styles/monsterstyles/nethack/nethack_18 index 243102693..6a3dbad4d 100644 --- a/styles/monsterstyles/nethack/nethack_18 +++ b/styles/monsterstyles/nethack/nethack_18 @@ -161,7 +161,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -232,7 +232,7 @@ level 15 attacktype 1 resist_magic 0 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -289,7 +289,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_19 b/styles/monsterstyles/nethack/nethack_19 index 2061722b9..c89840c05 100644 --- a/styles/monsterstyles/nethack/nethack_19 +++ b/styles/monsterstyles/nethack/nethack_19 @@ -161,7 +161,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -232,7 +232,7 @@ level 15 attacktype 1 resist_magic 0 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -289,7 +289,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_20 b/styles/monsterstyles/nethack/nethack_20 index bc17deb9d..25fe3dc4d 100644 --- a/styles/monsterstyles/nethack/nethack_20 +++ b/styles/monsterstyles/nethack/nethack_20 @@ -161,7 +161,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -232,7 +232,7 @@ level 15 attacktype 1 resist_magic 0 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -289,7 +289,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_21 b/styles/monsterstyles/nethack/nethack_21 index 403fedf32..7e903a07c 100644 --- a/styles/monsterstyles/nethack/nethack_21 +++ b/styles/monsterstyles/nethack/nethack_21 @@ -169,7 +169,7 @@ attacktype 1029 resist_magic 60 randomitems none end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -249,7 +249,7 @@ x 4 y 24 attacktype 1 end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 @@ -306,7 +306,7 @@ resist_paralyze 0 resist_fear 0 randomitems giant end -arch gargolye +arch gargoyle name winged gargoyle hp 900 maxhp 900 diff --git a/styles/monsterstyles/nethack/nethack_7 b/styles/monsterstyles/nethack/nethack_7 index 85531038c..955999796 100644 --- a/styles/monsterstyles/nethack/nethack_7 +++ b/styles/monsterstyles/nethack/nethack_7 @@ -284,7 +284,7 @@ y 14 attacktype 33 undead 1 end -arch gargolye +arch gargoyle x 2 y 16 end diff --git a/styles/monsterstyles/nethack/nethack_8 b/styles/monsterstyles/nethack/nethack_8 index 2708c196f..7d8343cc0 100644 --- a/styles/monsterstyles/nethack/nethack_8 +++ b/styles/monsterstyles/nethack/nethack_8 @@ -293,7 +293,7 @@ y 8 attacktype 33 undead 1 end -arch gargolye +arch gargoyle x 2 y 10 end diff --git a/styles/monsterstyles/nethack/nethack_9 b/styles/monsterstyles/nethack/nethack_9 index 6c11bd0af..cb696c300 100644 --- a/styles/monsterstyles/nethack/nethack_9 +++ b/styles/monsterstyles/nethack/nethack_9 @@ -263,7 +263,7 @@ y 3 attacktype 33 undead 1 end -arch gargolye +arch gargoyle x 2 y 5 end diff --git a/under_world/uworld_120_109 b/under_world/uworld_120_109 index abdae4a64..1681c3bbc 100644 --- a/under_world/uworld_120_109 +++ b/under_world/uworld_120_109 @@ -578,7 +578,7 @@ arch pstone_1 x 1 y 37 end -arch gargolye +arch gargoyle x 1 y 37 end @@ -1190,7 +1190,7 @@ arch pstone_1 x 3 y 21 end -arch gargolye +arch gargoyle x 3 y 21 end @@ -1776,7 +1776,7 @@ arch pstone_1 x 4 y 56 end -arch gargolye +arch gargoyle x 4 y 56 end @@ -2074,7 +2074,7 @@ arch pstone_1 x 5 y 44 end -arch gargolye +arch gargoyle x 5 y 44 end @@ -5924,7 +5924,7 @@ arch pstone_1 x 16 y 16 end -arch gargolye +arch gargoyle x 16 y 16 end @@ -7114,7 +7114,7 @@ arch pstone_1 x 19 y 37 end -arch gargolye +arch gargoyle x 19 y 37 end @@ -7560,7 +7560,7 @@ arch pstone_1 x 20 y 53 end -arch gargolye +arch gargoyle x 20 y 53 end @@ -8132,7 +8132,7 @@ arch pstone_1 x 22 y 27 end -arch gargolye +arch gargoyle x 22 y 27 end @@ -8350,7 +8350,7 @@ arch pstone_1 x 23 y 3 end -arch gargolye +arch gargoyle x 23 y 3 end diff --git a/unlinked/kandora/cave/cave1 b/unlinked/kandora/cave/cave1 index 515de9d07..6fa62e45e 100644 --- a/unlinked/kandora/cave/cave1 +++ b/unlinked/kandora/cave/cave1 @@ -165,7 +165,7 @@ arch dungeon_magic x 1 y 8 end -arch gargolye +arch gargoyle x 1 y 8 end diff --git a/unlinked/kandora/elcyon/temple b/unlinked/kandora/elcyon/temple index 9ab564f60..3eeea76f8 100644 --- a/unlinked/kandora/elcyon/temple +++ b/unlinked/kandora/elcyon/temple @@ -5233,7 +5233,7 @@ arch magic_banned x 22 y 22 end -arch gargolye +arch gargoyle name Cockatrice x 22 y 22