crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update maps to use the new potion name (invulnerability is now shielding) 

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7259 282e977c-c81d-0410-88c4-b93c2d0d6712
master
rjtanner 2007-09-27 04:47:51 +00:00
parent add325d613
commit 0c12e4b464
23 changed files with 356 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brest/asyvan/palace3
View File

@ -643,7 +643,7 @@ arch afloor_left
x 6
y 4
end
arch potion_invulnerability
arch potion_shielding
x 6
y 4
end

2
editor/picks/alchemy
View File

@ -103,7 +103,7 @@ arch potioncon
x 2
y 7
end
arch potion_invulnerability
arch potion_shielding
x 2
y 8
end

2
editor/picks/artifacts
View File

@ -457,7 +457,7 @@ arch hugenugget
x 9
y 7
end
arch potion_invulnerability
arch potion_shielding
x 9
y 8
end

4
lake_country/Mwizard/Mwizard6
View File

@ -1491,7 +1491,7 @@ arch waybread
x 9
y 2
end
arch potion_invulnerability
arch potion_shielding
x 9
y 2
end
@ -1867,7 +1867,7 @@ arch waybread
x 11
y 2
end
arch potion_invulnerability
arch potion_shielding
x 11
y 2
end

2
lake_country/Mwizard/MwizardG
View File

@ -314,7 +314,7 @@ arch flagstone
x 2
y 18
end
arch potion_invulnerability
arch potion_shielding
x 2
y 18
end

2
marksel/wizard
View File

@ -931,7 +931,7 @@ arch ring
end
arch wiz_hat
end
arch potion_invulnerability
arch potion_shielding
end
arch potion_magic
end

2
navar_city/misc/navarwiz
View File

@ -338,7 +338,7 @@ x 2
y 1
connected 1
lifesave 1
arch potion_invulnerability
arch potion_shielding
name potion of gem essence
name_pl potions of gem essence
resist_physical 0

2
pup_land/ancient/kurte/shop
View File

@ -1738,7 +1738,7 @@ end
arch diamond_converter
name 500 large nuggets -> a potion
slaying largenugget
other_arch potion_invulnerability
other_arch potion_shielding
food 500
x 20
y 11

2
pup_land/nurnberg/alshop
View File

@ -3559,7 +3559,7 @@ arch shop_empty
x 24
y 14
end
arch potion_invulnerability
arch potion_shielding
x 24
y 14
end

2
pup_land/nurnberg/dick/bomb1
View File

@ -796,7 +796,7 @@ arch dungeon_floor
x 5
y 6
end
arch potion_invulnerability
arch potion_shielding
x 5
y 6
end

2
pup_land/ordeal/tower_ordeal1
View File

@ -1588,7 +1588,7 @@ arch afloor_right
x 7
y 8
end
arch potion_invulnerability
arch potion_shielding
x 7
y 8
end

2
pup_land/raffle/raffle2_u3
View File

@ -723,7 +723,7 @@ Wis 3
x 2
y 28
carrying 2100
arch potion_invulnerability
arch potion_shielding
end
arch key2
name Wizard's key

18
python/guilds/guild_dues.py
View File

@ -21,9 +21,21 @@ import CFGuilds
import CFItemBroker
import random
import string
x=6
y=7
x1=31
x2=32
x3=33
x4=34
x5=35
y1=9
y2=10
y3=11
y4=12
y5=13
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
mymap = activator.Map
whoami=Crossfire.WhoAmI()
remarklist = ['Excellent','Thank You','Thank You','Thank You', 'Thank You', 'Great', 'OK', 'Wonderful', 'Swell', 'Dude', 'Big Spender']
@ -35,7 +47,7 @@ text = string.split(Crossfire.WhatIsMessage())
if (guildname):
guild = CFGuilds.CFGuild(guildname)
cointype = "imperial" #What type of token are we using for guild dues?
cointype = "jadecoin" #What type of token are we using for guild dues?
object = activator.CheckInventory(cointype)
if text[0] == 'help' or text[0] == 'yes':
@ -62,4 +74,4 @@ if (guildname):
message = "Howdy %s, paying some guild dues today?" %(random.choice(buddylist))
whoami.Say(message)
else:
activator.Write('Guildname Error, please notify a DM')
activator.Write('Guildname Error, please notify a DM')

43
python/guilds/guild_questpoints_apply.py
View File

@ -1,21 +1,22 @@
import Crossfire
import CFGuilds
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
whoami=Crossfire.WhoAmI()
mymap = activator.Map
mapname = mymap.Name
trank = 0
points=Crossfire.ScriptParameters() # 1 is apply event
if points:
guild = CFGuilds.SearchGuilds(activatorname)
if guild:
CFGuilds.CFGuild.add_questpoints(activatorname,points)
else:
pass
else:
print 'Error, no points specified in %s on map %s' %(whoami,mapname)
import Crossfire
import CFGuilds
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
whoami=Crossfire.WhoAmI()
mymap = activator.Map
mapname = mymap.Name
trank = 0
points=Crossfire.ScriptParameters() # 1 is apply event
if points:
guild = CFGuilds.SearchGuilds(activatorname)
if guild:
CFGuilds.CFGuild.add_questpoints(activatorname,points)
else:
pass
else:
print 'Error, no points specified in %s on map %s' %(whoami,mapname)

43
python/guilds/guildboard.py
View File

@ -1,21 +1,22 @@
import Crossfire
import CFGuilds
def mycmp(a, b):
return cmp(a[1], b[1])
activator=Crossfire.WhoIsActivator()
guilds = CFGuilds.CFGuildHouses()
activator.Write('Guild Standings:')
activator.Write('Guild - Points - Status')
guildlist = guilds.list_guilds()
standings = []
for guild in guildlist:
record = guilds.info(guild)
if record['Status'] != 'inactive':
standings.append([record['Points'], guild, record['Status']])
standings.sort(mycmp)
for item in standings:
activator.Write('%s - %s - %s' %(item[1],item[0],item[2]))
import Crossfire
import CFGuilds
def mycmp(a, b):
return cmp(a[1], b[1])
activator=Crossfire.WhoIsActivator()
guilds = CFGuilds.CFGuildHouses()
activator.Write('Guild Standings:')
activator.Write('Guild - Points - Status')
guildlist = guilds.list_guilds()
standings = []
for guild in guildlist:
record = guilds.info(guild)
if record['Status'] != 'inactive':
standings.append([record['Points'], guild, record['Status']])
standings.sort(mycmp)
for item in standings:
activator.Write('%s - %s - %s' %(item[1],item[0],item[2]))

115
python/guilds/guildbuy.py
View File

@ -1,57 +1,58 @@
import Crossfire
import CFGuilds
whoami=Crossfire.WhoAmI()
guildname=Crossfire.ScriptParameters() # 1 is 'apply' event
def find_player(object):
while (object.Type != 1) : #1 is type 'Player'
object = object.Above
if not object:
return 0
return object
activator=Crossfire.WhoIsActivator()
map = activator.Map
players = []
names = []
if (guildname):
#find players by coords
ob1=map.ObjectAt(33,24)
ob2=map.ObjectAt(33,26)
objects = [ob1, ob2]
for object in objects:
temp = find_player(object)
if temp:
players.append(temp)
players.append(activator)
for player in players:
names.append(player.Name)
if len(players) == 3:
print '%s,%s and %s found guild %s' %(names[0], names[1], names[2], guildname)
CFGuilds.CFGuildHouses().establish(guildname)
#Masterize them
for player, name in zip(players, names):
CFGuilds.CFGuild(guildname).add_member(name, 'GuildMaster')
guildmarker = player.CreateObject("marker")
guildmarker.Speed = 0
guildmarker.Name=guildname
guildmarker.Slaying='GuildMaster'
#teleport them
player.Teleport(map,int(11),int(16))
message = "You have purchased the %s guild. Rule it wisely. (I would type 'save' right about now...)"%guildname
else:
message = 'To purchase a guild requires two additional persons to stand on the alcoves above.'
else:
print 'Guild Purchase Error: %s, %s' %(guildname, activatorname)
message = 'Guild Purchase Error, please notify a DM'
whoami.Say(message)
import Crossfire
import CFGuilds
whoami=Crossfire.WhoAmI()
guildname=Crossfire.ScriptParameters() # 1 is 'apply' event
def find_player(object):
while (object.Type != 1) : #1 is type 'Player'
object = object.Above
if not object:
return 0
return object
activator=Crossfire.WhoIsActivator()
map = activator.Map
players = []
names = []
if (guildname):
#find players by coords
ob1=map.ObjectAt(33,24)
ob2=map.ObjectAt(33,26)
objects = [ob1, ob2]
for object in objects:
temp = find_player(object)
if temp:
players.append(temp)
players.append(activator)
for player in players:
names.append(player.Name)
if len(players) == 3:
print '%s,%s and %s found guild %s' %(names[0], names[1], names[2], guildname)
CFGuilds.CFGuildHouses().establish(guildname)
#Masterize them
for player, name in zip(players, names):
CFGuilds.CFGuild(guildname).add_member(name, 'GuildMaster')
guildmarker = player.CreateObject("marker")
guildmarker.Speed = 0
guildmarker.Name=guildname
guildmarker.Slaying='GuildMaster'
#teleport them
player.Teleport(map,int(11),int(16))
message = "You have purchased the %s guild. Rule it wisely. (I would type 'save' right about now...)"%guildname
else:
message = 'To purchase a guild requires two additional persons to stand on the alcoves above.'
else:
print 'Guild Purchase Error: %s, %s' %(guildname, activatorname)
message = 'Guild Purchase Error, please notify a DM'
whoami.Say(message)

127
python/guilds/guildjoin.py
View File

@ -1,63 +1,64 @@
# guildjoin.py - operates perilous chair for Hall of Joining in crossfire guilds
#
# Copyright (C) 2004 Todd Mitchell
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# The author can be reached via e-mail at temitchell@sourceforge.net
#
import Crossfire
import CFGuilds
def find_player(object):
while (object.Type != 1) : #1 is type 'Player'
object = object.Above
if not object:
return 0
return object
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
map = activator.Map
whoami=Crossfire.WhoAmI()
guildname=Crossfire.ScriptParameters() # 1 is 'apply' event
if (guildname):
guild = CFGuilds.CFGuild(guildname)
#find players by coords
ob=map.ObjectAt(9,16)
player = find_player(ob)
if player: # look for player
charname=player.Name
in_guild = CFGuilds.SearchGuilds(charname)
if in_guild == 0:
if guild.info(charname):
#already a member
message = '%s is already a member.' %charname
else:
guild.add_member(charname, 'Initiate')
message = 'Added %s to the guild' %charname
else:
message = 'It appears that %s is already a member of the %s guild' %(charname, in_guild)
else:
message = 'No one is in the chair!'
else:
print 'Guild Join Error: %s' %(guildname)
message = 'Guild Join Error, please notify a DM'
whoami.Say(message)
# guildjoin.py - operates perilous chair for Hall of Joining in crossfire guilds
#
# Copyright (C) 2004 Todd Mitchell
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# The author can be reached via e-mail at temitchell@sourceforge.net
#
import Crossfire
import CFGuilds
def find_player(object):
while (object.Type != 1) : #1 is type 'Player'
object = object.Above
if not object:
return 0
return object
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
map = activator.Map
whoami=Crossfire.WhoAmI()
guildname=Crossfire.ScriptParameters() # 1 is 'apply' event
if (guildname):
guild = CFGuilds.CFGuild(guildname)
#find players by coords
ob=map.ObjectAt(9,16)
player = find_player(ob)
if player: # look for player
charname=player.Name
in_guild = CFGuilds.SearchGuilds(charname)
if in_guild == 0:
if guild.info(charname):
#already a member
message = '%s is already a member.' %charname
else:
guild.add_member(charname, 'Initiate')
message = 'Added %s to the guild' %charname
else:
message = 'It appears that %s is already a member of the %s guild' %(charname, in_guild)
else:
message = 'No one is in the chair!'
else:
print 'Guild Join Error: %s' %(guildname)
message = 'Guild Join Error, please notify a DM'
whoami.Say(message)

313
python/guilds/guildoracle.py
View File

@ -1,156 +1,157 @@
# Script for say event of guild member board
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# authors: majorwoo josh@woosworld.net, Avion temitchell@sourceforge.net
import Crossfire
import CFGuilds
import CFLog
import sys
import string
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
whoami=Crossfire.WhoAmI()
isDM=activator.DungeonMaster
log=CFLog.CFLog()
guildname=Crossfire.ScriptParameters() # 6 is say event
print "Activated %s" %guildname
if (guildname):
guild = CFGuilds.CFGuild(guildname)
guildhouse = CFGuilds.CFGuildHouses()
text = string.split(Crossfire.WhatIsMessage())
if guild.info(activatorname) == 0 and isDM == 0:
message = 'You don\'t belong to this guild!'
elif text[0] == 'help' or text[0] == 'yes':
if isDM:
message = '\nList of commands:\n-list\n-add <name>\n-remove <member>\n-info <member>\n-promote <member>\n-demote <member>\n-status <member> <status>\n-guildstatus <status>'
else:
message='\nList of commands:\n-list\n-remove <member>\n-info <member>\n-promote <member>\n-demote <member>\n-status <member> <status>'
elif text[0] == 'info':
if len(text)==2:
record = guild.info(text[1])
if record:
message = '%s' %record
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "info <member_name>"'
elif text[0] == 'remove':
if len(text)==2:
if guild.info(text[1]):
message = 'Removed %s from the guild' %text[1]
#delete them
guild.remove_member(text[1])
else:
#if we didn't find them on the board
message = '%s was not a member' %text[1]
else:
message = 'Usage "remove <member_name>"'
elif text[0] == 'list':
list = guild.list_members()
for member in list:
activator.Write(member)
message = 'Total members = ' + str(len(list))
elif text[0] == 'promote':
if len(text)==2:
record = guild.info(text[1])
if record:
if guild.promote_member(text[1]):
record = guild.info(text[1]) #refresh record
message = '%s promoted to %s' %(text[1], record['Rank'])
else:
message = 'You cannot promote %s' %text[1]
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "promote <member_name>"'
elif text[0] == 'demote':
if len(text)==2:
record = guild.info(text[1])
if record:
if guild.demote_member(text[1]):
record = guild.info(text[1]) #refresh record
message = '%s demoted to %s' %(text[1], record['Rank'])
else:
message = 'You cannot demote %s' %text[1]
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "demote <member_name>"'
elif text[0] == 'status':
if len(text)==3:
record = guild.info(text[1])
if record:
if guild.change_status(text[1],text[2]):
record = guild.info(text[1]) #refresh record
message = '%s now has status of %s' %(text[1], record['Status'])
else:
message = '%s is not a valid status' %text[2]
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "status <member_name> <status>\n%s"' %str(guild.status)
# DM commands
#add user directly
elif text[0] == 'add' and isDM:
if len(text)==2:
#check if they are a player
if log.info(text[1]):
#see if they are on the board already
if guild.info(text[1]):
#already a member
message = '%s is already a member.' %text[1]
else:
guild.add_member(text[1], 'Initiate')
message = 'Added %s to the guild' %text[1]
else:
message = 'Sorry, I don\'t know any %s' %text[1]
else:
message = 'Usage "add <membername>"'
#change guild status
elif text[0] == 'guildstatus' and isDM:
if len(text)==2:
record = guildhouse.info(guildname)
if record:
if guildhouse.change_status(guildname,text[1]):
record = guildhouse.info(text[1]) #refresh record
message = '%s now has status of %s' %(guildname, record['Status'])
else:
message = '%s is not a valid status' %text[1]
else:
message = '%s is not a guild' %guildname
else:
message = 'Usage "guildstatus <status>\n%s"' %str(guildhouse.status)
else:
message = 'What did you need?'
else:
message = 'Board Error'
whoami.Say(message)
# Script for say event of guild member board
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# authors: majorwoo josh@woosworld.net, Avion temitchell@sourceforge.net
import Crossfire
import CFGuilds
import CFLog
import sys
import string
activator=Crossfire.WhoIsActivator()
activatorname=activator.Name
whoami=Crossfire.WhoAmI()
isDM=activator.DungeonMaster
log=CFLog.CFLog()
guildname=Crossfire.ScriptParameters() # 6 is say event
print "Activated %s" %guildname
if (guildname):
guild = CFGuilds.CFGuild(guildname)
guildhouse = CFGuilds.CFGuildHouses()
text = string.split(Crossfire.WhatIsMessage())
if guild.info(activatorname) == 0 and isDM == 0:
message = 'You don\'t belong to this guild!'
elif text[0] == 'help' or text[0] == 'yes':
if isDM:
message = '\nList of commands:\n-list\n-add <name>\n-remove <member>\n-info <member>\n-promote <member>\n-demote <member>\n-status <member> <status>\n-guildstatus <status>'
else:
message='\nList of commands:\n-list\n-remove <member>\n-info <member>\n-promote <member>\n-demote <member>\n-status <member> <status>'
elif text[0] == 'info':
if len(text)==2:
record = guild.info(text[1])
if record:
message = '%s' %record
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "info <member_name>"'
elif text[0] == 'remove':
if len(text)==2:
if guild.info(text[1]):
message = 'Removed %s from the guild' %text[1]
#delete them
guild.remove_member(text[1])
else:
#if we didn't find them on the board
message = '%s was not a member' %text[1]
else:
message = 'Usage "remove <member_name>"'
elif text[0] == 'list':
list = guild.list_members()
for member in list:
activator.Write(member)
message = 'Total members = ' + str(len(list))
elif text[0] == 'promote':
if len(text)==2:
record = guild.info(text[1])
if record:
if guild.promote_member(text[1]):
record = guild.info(text[1]) #refresh record
message = '%s promoted to %s' %(text[1], record['Rank'])
else:
message = 'You cannot promote %s' %text[1]
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "promote <member_name>"'
elif text[0] == 'demote':
if len(text)==2:
record = guild.info(text[1])
if record:
if guild.demote_member(text[1]):
record = guild.info(text[1]) #refresh record
message = '%s demoted to %s' %(text[1], record['Rank'])
else:
message = 'You cannot demote %s' %text[1]
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "demote <member_name>"'
elif text[0] == 'status':
if len(text)==3:
record = guild.info(text[1])
if record:
if guild.change_status(text[1],text[2]):
record = guild.info(text[1]) #refresh record
message = '%s now has status of %s' %(text[1], record['Status'])
else:
message = '%s is not a valid status' %text[2]
else:
message = '%s is not a member' %text[1]
else:
message = 'Usage "status <member_name> <status>\n%s"' %str(guild.status)
# DM commands
#add user directly
elif text[0] == 'add' and isDM:
if len(text)==2:
#check if they are a player
if log.info(text[1]):
#see if they are on the board already
if guild.info(text[1]):
#already a member
message = '%s is already a member.' %text[1]
else:
guild.add_member(text[1], 'Initiate')
message = 'Added %s to the guild' %text[1]
else:
message = 'Sorry, I don\'t know any %s' %text[1]
else:
message = 'Usage "add <membername>"'
#change guild status
elif text[0] == 'guildstatus' and isDM:
if len(text)==2:
record = guildhouse.info(guildname)
if record:
if guildhouse.change_status(guildname,text[1]):
record = guildhouse.info(text[1]) #refresh record
message = '%s now has status of %s' %(guildname, record['Status'])
else:
message = '%s is not a valid status' %text[1]
else:
message = '%s is not a guild' %guildname
else:
message = 'Usage "guildstatus <status>\n%s"' %str(guildhouse.status)
else:
message = 'What did you need?'
else:
message = 'Board Error'
whoami.Say(message)

2
quests/greyshield/Archery
View File

@ -3233,7 +3233,7 @@ arch marble
x 16
y 19
end
arch potion_invulnerability
arch potion_shielding
x 16
y 19
end

2
styles/misc/fountains
View File

@ -233,7 +233,7 @@ end
arch potion_fire
x 7
end
arch potion_invulnerability
arch potion_shielding
x 8
end
arch potion_generic

2
templates/guild/guild_alchemy
View File

@ -142,7 +142,7 @@ x 1
y 7
no_pick 1
end
arch potion_invulnerability
arch potion_shielding
x 1
y 7
no_pick 1

2
unlinked/Greyshield/Archery
View File

@ -3233,7 +3233,7 @@ arch marble
x 16
y 19
end
arch potion_invulnerability
arch potion_shielding
x 16
y 19
end

2
unlinked/kandora/dm_wizard
View File

@ -933,7 +933,7 @@ arch ring
end
arch wiz_hat
end
arch potion_invulnerability
arch potion_shielding
end
arch potion_magic
end