wpdev-commits Mailing List for Wolfpack Emu (Page 81)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/regions/trammel/towns Modified Files: britain.xml cove.xml delucia.xml minoc.xml papua.xml skara_brae.xml trinsic.xml vesper.xml yew.xml Log Message: Turns out this is why regions didn't work right... id="region name" became name="region name" Index: vesper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/vesper.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vesper.xml 8 Jul 2004 19:14:50 -0000 1.1 --- vesper.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Vesper --> ! <region id="trammel_vesper"> <flags> <guarded /> --- 3,7 ---- <!-- Vesper --> ! <region name="trammel_vesper"> <flags> <guarded /> Index: trinsic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/trinsic.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** trinsic.xml 8 Jul 2004 19:14:50 -0000 1.1 --- trinsic.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Trinsic --> ! <region id="trammel_trinsic"> <flags> <guarded /> --- 3,7 ---- <!-- Trinsic --> ! <region name="trammel_trinsic"> <flags> <guarded /> Index: britain.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/britain.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** britain.xml 8 Jul 2004 19:14:50 -0000 1.1 --- britain.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 2,6 **** <definitions> <!-- Britain --> ! <region id="trammel_britain"> <flags> <guarded /> --- 2,6 ---- <definitions> <!-- Britain --> ! <region name="trammel_britain"> <flags> <guarded /> *************** *** 22,26 **** <!-- Britain's Farmlands --> ! <region id="trammel_britain_farmlands"> <flags> <guarded /> --- 22,26 ---- <!-- Britain's Farmlands --> ! <region name="trammel_britain_farmlands"> <flags> <guarded /> *************** *** 40,44 **** <!-- Lord British's castle --> ! <region id="trammel_lord_british_castle"> <flags> <guarded /> --- 40,44 ---- <!-- Lord British's castle --> ! <region name="trammel_lord_british_castle"> <flags> <guarded /> *************** *** 56,60 **** <!-- Lord Blackthorne's castle --> ! <region id="trammel_lord_blackthorne_castle"> <flags> <guarded /> --- 56,60 ---- <!-- Lord Blackthorne's castle --> ! <region name="trammel_lord_blackthorne_castle"> <flags> <guarded /> Index: delucia.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/delucia.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** delucia.xml 8 Jul 2004 19:14:50 -0000 1.1 --- delucia.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Delucia --> ! <region id="trammel_delucia"> <flags> <guarded /> --- 3,7 ---- <!-- Delucia --> ! <region name="trammel_delucia"> <flags> <guarded /> Index: papua.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/papua.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** papua.xml 8 Jul 2004 19:14:50 -0000 1.1 --- papua.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Papua --> ! <region id="trammel_papua"> <flags> <guarded /> --- 3,7 ---- <!-- Papua --> ! <region name="trammel_papua"> <flags> <guarded /> Index: minoc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/minoc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** minoc.xml 8 Jul 2004 19:14:50 -0000 1.1 --- minoc.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Minoc --> ! <region id="trammel_minoc"> <flags> <guarded /> --- 3,7 ---- <!-- Minoc --> ! <region name="trammel_minoc"> <flags> <guarded /> Index: yew.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/yew.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** yew.xml 8 Jul 2004 19:14:50 -0000 1.1 --- yew.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Yew --> ! <region id="trammel_yew"> <flags> <guarded /> --- 3,7 ---- <!-- Yew --> ! <region name="trammel_yew"> <flags> <guarded /> Index: cove.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/cove.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cove.xml 8 Jul 2004 19:14:50 -0000 1.1 --- cove.xml 10 Jul 2004 11:46:18 -0000 1.2 *************** *** 3,7 **** <!-- Cove --> ! <region id="trammel_cove"> <flags> <guarded /> --- 3,7 ---- <!-- Cove --> ! <region name="trammel_cove"> <flags> <guarded /> Index: skara_brae.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/trammel/towns/skara_brae.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** skara_brae.xml 8 Jul 2004 23:28:26 -0000 1.2 --- skara_brae.xml 10 Jul 2004 11:46:18 -0000 1.3 *************** *** 3,7 **** <!-- Skara Brae --> ! <region id="trammel_skara_brae"> <flags> <guarded /> --- 3,7 ---- <!-- Skara Brae --> ! <region name="trammel_skara_brae"> <flags> <guarded /> |
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/regions/ilshenar/towns Modified Files: ancient_citadel.xml bet-lem_reg.xml gargoyle_city.xml mistas.xml montor.xml reg_volon.xml terort_skitas.xml Log Message: Turns out this is why regions didn't work right... id="region name" became name="region name" Index: montor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/montor.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** montor.xml 8 Jul 2004 20:06:30 -0000 1.1 --- montor.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Montor --> ! <region id="ilshenar_montor"> <rectangle x1="1576" y1="272" x2="1720" y2="368" map="2" /> <rectangle x1="1616" y1="200" x2="1696" y2="272" map="2" /> --- 3,7 ---- <!-- Montor --> ! <region name="ilshenar_montor"> <rectangle x1="1576" y1="272" x2="1720" y2="368" map="2" /> <rectangle x1="1616" y1="200" x2="1696" y2="272" map="2" /> Index: mistas.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/mistas.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mistas.xml 8 Jul 2004 20:06:30 -0000 1.1 --- mistas.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Mistas --> ! <region id="ilshenar_mistas"> <rectangle x1="744" y1="984" x2="912" y2="1152" map="2" /> <rectangle x1="744" y1="1152" x2="792" y2="1176" map="2" /> --- 3,7 ---- <!-- Mistas --> ! <region name="ilshenar_mistas"> <rectangle x1="744" y1="984" x2="912" y2="1152" map="2" /> <rectangle x1="744" y1="1152" x2="792" y2="1176" map="2" /> Index: bet-lem_reg.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/bet-lem_reg.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bet-lem_reg.xml 8 Jul 2004 20:06:30 -0000 1.1 --- bet-lem_reg.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Bet-Lem Reg --> ! <region id="ilshenar_bet-lem_reg"> <rectangle x1="1232" y1="936" x2="1272" y2="984" map="2" /> </region> --- 3,7 ---- <!-- Bet-Lem Reg --> ! <region name="ilshenar_bet-lem_reg"> <rectangle x1="1232" y1="936" x2="1272" y2="984" map="2" /> </region> Index: gargoyle_city.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/gargoyle_city.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gargoyle_city.xml 8 Jul 2004 20:06:30 -0000 1.1 --- gargoyle_city.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Gargoyle City, Ver Lor Reg --> ! <region id="ilshenar_gargoyle_city"> <rectangle x1="824" y1="552" x2="856" y2="728" map="2" /> <rectangle x1="752" y1="576" x2="824" y2="704" map="2" /> --- 3,7 ---- <!-- Gargoyle City, Ver Lor Reg --> ! <region name="ilshenar_gargoyle_city"> <rectangle x1="824" y1="552" x2="856" y2="728" map="2" /> <rectangle x1="752" y1="576" x2="824" y2="704" map="2" /> Index: terort_skitas.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/terort_skitas.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** terort_skitas.xml 8 Jul 2004 20:06:30 -0000 1.1 --- terort_skitas.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 2,6 **** <definitions> ! <region id="ilshenar_terort_skitas"> <rectangle x1="528" y1="376" x2="624" y2="464" map="2" /> </region> --- 2,6 ---- <definitions> ! <region name="ilshenar_terort_skitas"> <rectangle x1="528" y1="376" x2="624" y2="464" map="2" /> </region> Index: ancient_citadel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/ancient_citadel.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ancient_citadel.xml 8 Jul 2004 20:06:30 -0000 1.1 --- ancient_citadel.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Ancient Citadel --> ! <region id="ilshenar_ancient_citadel"> <rectangle x1="1448" y1="496" x2="1552" y2="600" map="2" /> </region> --- 3,7 ---- <!-- Ancient Citadel --> ! <region name="ilshenar_ancient_citadel"> <rectangle x1="1448" y1="496" x2="1552" y2="600" map="2" /> </region> Index: reg_volon.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/towns/reg_volon.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** reg_volon.xml 8 Jul 2004 20:06:30 -0000 1.1 --- reg_volon.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Reg Volon --> ! <region id="ilshenar_reg_volon"> <rectangle x1="1328" y1="1008" x2="1408" y2="1120" map="2" /> </region> --- 3,7 ---- <!-- Reg Volon --> ! <region name="ilshenar_reg_volon"> <rectangle x1="1328" y1="1008" x2="1408" y2="1120" map="2" /> </region> |
|
From: Richard M. <dr...@us...> - 2004-07-10 11:46:27
|
Update of /cvsroot/wpdev/xmlscripts/definitions/teleports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/teleports Modified Files: felucca.xml ilshenar.xml malas.xml trammel.xml Log Message: Turns out this is why regions didn't work right... id="region name" became name="region name" Index: malas.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/malas.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** malas.xml 30 May 2004 03:01:44 -0000 1.2 --- malas.xml 10 Jul 2004 11:46:18 -0000 1.3 *************** *** 12,16 **** <definitions> ! <region id="malas_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="2560" y2="2048" map="3" /> --- 12,16 ---- <definitions> ! <region name="malas_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="2560" y2="2048" map="3" /> Index: ilshenar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/ilshenar.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ilshenar.xml 30 May 2004 03:01:44 -0000 1.2 --- ilshenar.xml 10 Jul 2004 11:46:18 -0000 1.3 *************** *** 12,16 **** <definitions> ! <region id="ilshenar_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="2304" y2="1600" map="2" /> --- 12,16 ---- <definitions> ! <region name="ilshenar_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="2304" y2="1600" map="2" /> Index: trammel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/trammel.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trammel.xml 30 May 2004 03:01:44 -0000 1.2 --- trammel.xml 10 Jul 2004 11:46:18 -0000 1.3 *************** *** 12,16 **** <definitions> ! <region id="trammel_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="6144" y2="4096" map="1" /> --- 12,16 ---- <definitions> ! <region name="trammel_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="6144" y2="4096" map="1" /> Index: felucca.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/felucca.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** felucca.xml 30 May 2004 03:01:44 -0000 1.2 --- felucca.xml 10 Jul 2004 11:46:18 -0000 1.3 *************** *** 12,16 **** <definitions> ! <region id="felucca_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="6144" y2="4096" map="0" /> --- 12,16 ---- <definitions> ! <region name="felucca_teleports"> <!-- The World --> <rectangle x1="1" y1="1" x2="6144" y2="4096" map="0" /> |
|
From: Richard M. <dr...@us...> - 2004-07-10 11:46:27
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/regions/felucca/towns Modified Files: britain.xml cove.xml delucia.xml minoc.xml moonglow.xml papua.xml skara_brae.xml trinsic.xml vesper.xml yew.xml Log Message: Turns out this is why regions didn't work right... id="region name" became name="region name" Index: vesper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/vesper.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vesper.xml 8 Jul 2004 19:14:49 -0000 1.1 --- vesper.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Vesper --> ! <region id="felucca_vesper"> <flags> <guarded /> --- 3,7 ---- <!-- Vesper --> ! <region name="felucca_vesper"> <flags> <guarded /> Index: trinsic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/trinsic.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** trinsic.xml 8 Jul 2004 19:14:49 -0000 1.1 --- trinsic.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Trinsic --> ! <region id="felucca_trinsic"> <flags> <guarded /> --- 3,7 ---- <!-- Trinsic --> ! <region name="felucca_trinsic"> <flags> <guarded /> Index: britain.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/britain.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** britain.xml 8 Jul 2004 19:14:49 -0000 1.1 --- britain.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 2,6 **** <definitions> <!-- Britain --> ! <region id="felucca_britain"> <flags> <guarded /> --- 2,6 ---- <definitions> <!-- Britain --> ! <region name="felucca_britain"> <flags> <guarded /> *************** *** 22,26 **** <!-- Britain's Farmlands --> ! <region id="felucca_britain_farmlands"> <flags> <guarded /> --- 22,26 ---- <!-- Britain's Farmlands --> ! <region name="felucca_britain_farmlands"> <flags> <guarded /> *************** *** 56,60 **** <!-- Lord Blackthorne's castle --> ! <region id="felucca_lord_blackthorne_castle"> <flags> <guarded /> --- 56,60 ---- <!-- Lord Blackthorne's castle --> ! <region name="felucca_lord_blackthorne_castle"> <flags> <guarded /> Index: delucia.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/delucia.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** delucia.xml 8 Jul 2004 19:14:49 -0000 1.1 --- delucia.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Delucia --> ! <region id="felucca_delucia"> <flags> <guarded /> --- 3,7 ---- <!-- Delucia --> ! <region name="felucca_delucia"> <flags> <guarded /> Index: papua.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/papua.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** papua.xml 8 Jul 2004 19:14:49 -0000 1.1 --- papua.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Papua --> ! <region id="felucca_papua"> <flags> <guarded /> --- 3,7 ---- <!-- Papua --> ! <region name="felucca_papua"> <flags> <guarded /> Index: moonglow.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/moonglow.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** moonglow.xml 8 Jul 2004 19:14:49 -0000 1.1 --- moonglow.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Moonglow --> ! <region id="felucca_moonglow"> <flags> <guarded /> --- 3,7 ---- <!-- Moonglow --> ! <region name="felucca_moonglow"> <flags> <guarded /> Index: minoc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/minoc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** minoc.xml 8 Jul 2004 19:14:49 -0000 1.1 --- minoc.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Minoc --> ! <region id="felucca_minoc"> <flags> <guarded /> --- 3,7 ---- <!-- Minoc --> ! <region name="felucca_minoc"> <flags> <guarded /> Index: yew.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/yew.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** yew.xml 8 Jul 2004 19:14:49 -0000 1.1 --- yew.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Yew --> ! <region id="felucca_yew"> <flags> <guarded /> --- 3,7 ---- <!-- Yew --> ! <region name="felucca_yew"> <flags> <guarded /> Index: cove.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/cove.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cove.xml 8 Jul 2004 19:14:49 -0000 1.1 --- cove.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Cove --> ! <region id="felucca_cove"> <flags> <guarded /> --- 3,7 ---- <!-- Cove --> ! <region name="felucca_cove"> <flags> <guarded /> Index: skara_brae.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/towns/skara_brae.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** skara_brae.xml 8 Jul 2004 23:28:25 -0000 1.2 --- skara_brae.xml 10 Jul 2004 11:46:17 -0000 1.3 *************** *** 3,7 **** <!-- Skara Brae --> ! <region id="felucca_skara_brae"> <flags> <guarded /> --- 3,7 ---- <!-- Skara Brae --> ! <region name="felucca_skara_brae"> <flags> <guarded /> |
|
From: Richard M. <dr...@us...> - 2004-07-10 11:46:26
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/regions/felucca/misc Modified Files: britain_graveyard.xml Log Message: Turns out this is why regions didn't work right... id="region name" became name="region name" Index: britain_graveyard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/felucca/misc/britain_graveyard.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** britain_graveyard.xml 8 Jul 2004 19:14:48 -0000 1.1 --- britain_graveyard.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Britain Graveyard --> ! <region id="felucca_britain_graveyard"> <rectangle x1="1336" y1="1443" x2="1391" y2="1494" map="0" /> <rectangle x1="1336" y1="1494" x2="1376" y2="1511" map="0" /> --- 3,7 ---- <!-- Britain Graveyard --> ! <region name="felucca_britain_graveyard"> <rectangle x1="1336" y1="1443" x2="1391" y2="1494" map="0" /> <rectangle x1="1336" y1="1494" x2="1376" y2="1511" map="0" /> |
|
From: Richard M. <dr...@us...> - 2004-07-10 11:46:26
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6706/regions/ilshenar/misc Modified Files: unknown.xml Log Message: Turns out this is why regions didn't work right... id="region name" became name="region name" Index: unknown.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/regions/ilshenar/misc/unknown.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** unknown.xml 8 Jul 2004 20:06:29 -0000 1.1 --- unknown.xml 10 Jul 2004 11:46:17 -0000 1.2 *************** *** 3,7 **** <!-- Termir Flam --> ! <region id="Ilshenar Termir Flam"> <rectangle x1="1520" y1="368" x2="1752" y2="496" map="2" /> <rectangle x1="1520" y1="296" x2="1576" y2="368" map="2" /> --- 3,7 ---- <!-- Termir Flam --> ! <region name="Ilshenar Termir Flam"> <rectangle x1="1520" y1="368" x2="1752" y2="496" map="2" /> <rectangle x1="1520" y1="296" x2="1576" y2="368" map="2" /> *************** *** 10,14 **** <!-- Twin Oaks --> ! <region id="Ilshenar Twin Oaks"> <rectangle x1="1536" y1="1032" x2="1584" y2="1072" map="2" /> </region> --- 10,14 ---- <!-- Twin Oaks --> ! <region name="Ilshenar Twin Oaks"> <rectangle x1="1536" y1="1032" x2="1584" y2="1072" map="2" /> </region> |
|
From: Sebastian H. <dar...@us...> - 2004-07-10 11:19:50
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2828 Modified Files: territories.cpp Log Message: Fix Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** territories.cpp 2 Jun 2004 15:04:07 -0000 1.46 --- territories.cpp 10 Jul 2004 11:19:40 -0000 1.47 *************** *** 331,335 **** if ( territory->rectangles().empty() ) { ! Console::instance()->send( tr( "Warning: Top level region %1 lacks rectangle tag, ignoring region" ).arg( territory->name() ) ); delete territory; } --- 331,335 ---- if ( territory->rectangles().empty() ) { ! Console::instance()->log(LOG_WARNING, "Region %1 lacks rectangle tag, ignoring region.\n").arg(territory->name())); delete territory; } |
|
From: Richard M. <dr...@us...> - 2004-07-09 22:45:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29624/commands Modified Files: where.py Log Message: This looks better in the sysmessage Also prevents a player's say color from making it hard to read in the journal. Index: where.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/where.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** where.py 26 May 2004 13:07:21 -0000 1.3 --- where.py 9 Jul 2004 22:45:35 -0000 1.4 *************** *** 17,30 **** def where( socket, command, arguments ): char = socket.player - region = char.region pos = char.pos name = None ! while region: ! if region.name and len( region.name ) > 0: ! name = region.name ! break ! ! region = region.parent multi = char.multi --- 17,26 ---- def where( socket, command, arguments ): char = socket.player pos = char.pos + region = wolfpack.region( pos.x, pos.y, pos.map ) name = None ! if region and region.name and len( region.name ) > 0: ! name = region.name multi = char.multi *************** *** 48,54 **** if name: ! char.message( "You are in %s at %d,%d,%d on %s" % ( name, pos.x, pos.y, pos.z, map ) ) else: ! char.message( "You are at %d,%d,%d on %s" % ( pos.x, pos.y, pos.z, map ) ) def onLoad(): --- 44,50 ---- if name: ! socket.sysmessage( "You are in %s at %d,%d,%d on %s" % ( name, pos.x, pos.y, pos.z, map ) ) else: ! socket.sysmessage( "You are at %d,%d,%d on %s" % ( pos.x, pos.y, pos.z, map ) ) def onLoad(): |
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18281 Modified Files: archery_butte.py bandages.py blades.py book.py bulletinboard.py check.py cooking.py daggermenu.py door.py environment.py figurine.py food.py gate.py guillotine.py ingot.py key.py kindling.py lightsource.py lockpick.py moongate.py ore.py pickaxe.py pickpocket_dip.py Log Message: Tweaks... looking at ways to reduce memory load. Index: daggermenu.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/daggermenu.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** daggermenu.py 26 May 2004 13:07:19 -0000 1.8 --- daggermenu.py 9 Jul 2004 21:47:45 -0000 1.9 *************** *** 1,2 **** --- 1,4 ---- + + import wolfpack from wolfpack.gumps import cGump Index: key.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/key.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** key.py 26 May 2004 13:07:20 -0000 1.10 --- key.py 9 Jul 2004 21:47:45 -0000 1.11 *************** *** 1,7 **** - from wolfpack.consts import * import wolfpack - from wolfpack.gumps import cGump import random def gump_response(char, args, response): --- 1,7 ---- import wolfpack import random + from wolfpack.gumps import cGump + from wolfpack.consts import TINKERING def gump_response(char, args, response): Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** bandages.py 12 May 2004 21:46:52 -0000 1.7 --- bandages.py 9 Jul 2004 21:47:45 -0000 1.8 *************** *** 1,8 **** import wolfpack - from wolfpack import additem - from wolfpack.utilities import tobackpack - from wolfpack.consts import * import random def onUse( char, item ): --- 1,8 ---- import wolfpack import random + import wolfpack.utilities + from wolfpack.consts import HEALING, ANATOMY + def onUse( char, item ): *************** *** 33,37 **** if not bandages: return ! if (target.item and target.item.getoutmostchar() and target.item.getoutmostchar() != char) or not char.canreach(target.pos, 5): char.socket.sysmessage("You can't reach that.") --- 33,37 ---- if not bandages: return ! if (target.item and target.item.getoutmostchar() and target.item.getoutmostchar() != char) or not char.canreach(target.pos, 5): char.socket.sysmessage("You can't reach that.") *************** *** 202,206 **** # Random Position (for now, maybe storing the original position in a tag would be good) # Handle Weight but no Auto Stacking ! backpack.additem( item, 1, 1, 0 ) item.update() --- 202,206 ---- # Random Position (for now, maybe storing the original position in a tag would be good) # Handle Weight but no Auto Stacking ! backpack.wolfpack.additem( item, 1, 1, 0 ) item.update() *************** *** 250,259 **** # This is target independent if baseid == 0xe21: ! item = additem( 'e20' ) ! if not tobackpack( item, char ): item.update() elif baseid == 0xee9: ! item = additem( 'e22' ) ! if not tobackpack( item, char ): item.update() --- 250,259 ---- # This is target independent if baseid == 0xe21: ! item = wolfpack.additem( 'e20' ) ! if not wolfpack.utilities.tobackpack( item, char ): item.update() elif baseid == 0xee9: ! item = wolfpack.additem( 'e22' ) ! if not wolfpack.utilities.tobackpack( item, char ): item.update() Index: book.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/book.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** book.py 26 May 2004 13:07:19 -0000 1.10 --- book.py 9 Jul 2004 21:47:45 -0000 1.11 *************** *** 2,6 **** import wolfpack from wolfpack import console ! from wolfpack.consts import * def sendPage(socket, serial, page, lines): --- 2,6 ---- import wolfpack from wolfpack import console ! from wolfpack.consts import LOG_ERROR def sendPage(socket, serial, page, lines): Index: gate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/gate.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gate.py 26 May 2004 13:07:19 -0000 1.6 --- gate.py 9 Jul 2004 21:47:45 -0000 1.7 *************** *** 1,7 **** - from wolfpack.consts import * - from wolfpack import console - from wolfpack.gumps import * import wolfpack # --- 1,7 ---- import wolfpack + from wolfpack.consts import LOG_ERROR + from wolfpack import console + from wolfpack.gumps import cGump # Index: door.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** door.py 6 Jul 2004 12:52:13 -0000 1.11 --- door.py 9 Jul 2004 21:47:45 -0000 1.12 *************** *** 9,23 **** import wolfpack - from wolfpack.utilities import * # Sound constants for opening and closing a door ! SOUND_OPENWOOD = 0x00EA ! SOUND_OPENGATE = 0x00EB ! SOUND_OPENSTEEL = 0x00EC ! SOUND_OPENSECRET = 0x00ED ! SOUND_CLOSEWOOD = 0x00F1 ! SOUND_CLOSEGATE = 0x00F2 ! SOUND_CLOSESTEEL = 0x00F3 ! SOUND_CLOSESECRET = 0x00F4 # How long does it take to close a door automatically (in ms) --- 9,22 ---- import wolfpack # Sound constants for opening and closing a door ! SOUND_OPENWOOD = 0xEA ! SOUND_OPENGATE = 0xEB ! SOUND_OPENSTEEL = 0xEC ! SOUND_OPENSECRET = 0xED ! SOUND_CLOSEWOOD = 0xF1 ! SOUND_CLOSEGATE = 0xF2 ! SOUND_CLOSESTEEL = 0xF3 ! SOUND_CLOSESECRET = 0xF4 # How long does it take to close a door automatically (in ms) Index: ingot.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ingot.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ingot.py 26 May 2004 13:07:20 -0000 1.3 --- ingot.py 9 Jul 2004 21:47:45 -0000 1.4 *************** *** 1,3 **** --- 1,4 ---- + import wolfpack from skills import mining Index: cooking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/cooking.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cooking.py 26 May 2004 13:07:19 -0000 1.5 --- cooking.py 9 Jul 2004 21:47:45 -0000 1.6 *************** *** 9,13 **** import wolfpack import wolfpack.utilities ! from wolfpack.consts import * import random --- 9,13 ---- import wolfpack import wolfpack.utilities ! from wolfpack.consts import COOKING import random Index: guillotine.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/guillotine.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** guillotine.py 26 May 2004 13:07:20 -0000 1.2 --- guillotine.py 9 Jul 2004 21:47:45 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- import wolfpack + from wolfpack.consts import ITEMID def onUse( char, item ): *************** *** 16,20 **** return 1 ! if( char.checkskill( wolfpack.ITEMID, 0, 100 ) ): # Not animated if( item.id == 0x1230 ): --- 17,21 ---- return 1 ! if( char.checkskill( ITEMID, 0, 100 ) ): # Not animated if( item.id == 0x1230 ): *************** *** 29,31 **** item.update() ! return 1 \ No newline at end of file --- 30,32 ---- item.update() ! return 1 Index: archery_butte.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/archery_butte.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** archery_butte.py 9 Jul 2004 10:30:25 -0000 1.9 --- archery_butte.py 9 Jul 2004 21:47:45 -0000 1.10 *************** *** 7,12 **** import wolfpack ! from wolfpack.consts import * ! from random import choice, randrange from combat.utilities import weaponskill --- 7,12 ---- import wolfpack ! import random ! from wolfpack.consts import ARCHERY from combat.utilities import weaponskill *************** *** 134,143 **** # 10% of destroying the ammo on failure if( ( not char.checkskill( ARCHERY, 0, 1000 ) ) ): ! if( not randrange( 0, 9 ) ): char.emote( "You see " + char.name + "'s poor shot destroys the " + ammoname ) else: ! char.emote( "You see " + char.name + "'s " + choice( failureText ) ) else: ! char.emote( "You see " + char.name + "'s " + choice( successText ) ) # Increase the ammo we have in the butte --- 134,143 ---- # 10% of destroying the ammo on failure if( ( not char.checkskill( ARCHERY, 0, 1000 ) ) ): ! if( not random.randrange( 0, 9 ) ): char.emote( "You see " + char.name + "'s poor shot destroys the " + ammoname ) else: ! char.emote( "You see " + char.name + "'s " + random.choice( failureText ) ) else: ! char.emote( "You see " + char.name + "'s " + random.choice( successText ) ) # Increase the ammo we have in the butte Index: lightsource.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lightsource.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lightsource.py 26 May 2004 13:07:20 -0000 1.6 --- lightsource.py 9 Jul 2004 21:47:45 -0000 1.7 *************** *** 8,11 **** --- 8,13 ---- #===============================================================# + import wolfpack + # List of "burning" lightsources burning = [ 0x9fd, 0xa02, 0xa07, 0xa0c, 0xa0f, 0xa12, 0xa15, 0xa1a, 0xa22, 0xb1a, 0xb1d, 0xb20, 0xb22, 0xb24, 0xb26, 0x142c, 0x1430, 0x1434 ] *************** *** 95,101 **** # This is no Light Source else: ! return 0 ! return 1 def onDropOnItem( container, item ): --- 97,103 ---- # This is no Light Source else: ! return False ! return True def onDropOnItem( container, item ): *************** *** 108,112 **** dropper.soundeffect( 0x226, 0 ) ! return 0 def onDropOnChar( char, item ): --- 110,114 ---- dropper.soundeffect( 0x226, 0 ) ! return False def onDropOnChar( char, item ): *************** *** 120,122 **** dropper.soundeffect( 0x226, 0 ) ! return 0 --- 122,124 ---- dropper.soundeffect( 0x226, 0 ) ! return False Index: kindling.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/kindling.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kindling.py 26 May 2004 13:07:20 -0000 1.5 --- kindling.py 9 Jul 2004 21:47:45 -0000 1.6 *************** *** 13,17 **** import wolfpack import wolfpack.time ! from wolfpack.consts import * def onUse( char, item ): --- 13,17 ---- import wolfpack import wolfpack.time ! from wolfpack.consts import CAMPING def onUse( char, item ): *************** *** 56,58 **** item.delete() ! return 1 --- 56,58 ---- item.delete() ! return True Index: pickpocket_dip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/pickpocket_dip.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pickpocket_dip.py 26 May 2004 13:07:20 -0000 1.3 --- pickpocket_dip.py 9 Jul 2004 21:47:45 -0000 1.4 *************** *** 6,10 **** ################################################################# ! from wolfpack import * # Pickpocket dips --- 6,11 ---- ################################################################# ! import wolfpack ! from wolfpack.consts import STEALING # Pickpocket dips *************** *** 68,72 **** # Reset the id of a swinging dummy def resetid( iSerial ): ! item = finditem( iSerial ) if( item ): --- 69,73 ---- # Reset the id of a swinging dummy def resetid( iSerial ): ! item = wolfpack.finditem( iSerial ) if( item ): Index: environment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/environment.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** environment.py 26 May 2004 13:07:19 -0000 1.12 --- environment.py 9 Jul 2004 21:47:45 -0000 1.13 *************** *** 2,12 **** # like plants and oters - from wolfpack.consts import * - from wolfpack.utilities import tobackpack - from wolfpack.gumps import cGump - from math import floor import wolfpack import time import random def cotton( char, item ): --- 2,14 ---- # like plants and oters import wolfpack import time import random + from wolfpack.consts import COTTONPLANTS_REGROW, ANIM_ATTACK5, TINKERING, \ + MUSICIANSHIP, LAYER_HAIR, LAYER_BEARD + from wolfpack.utilities import tobackpack + from wolfpack.gumps import cGump + from math import floor + def cotton( char, item ): Index: bulletinboard.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bulletinboard.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bulletinboard.py 26 May 2004 13:07:19 -0000 1.6 --- bulletinboard.py 9 Jul 2004 21:47:45 -0000 1.7 *************** *** 1,7 **** import wolfpack - from wolfpack.consts import * - from struct import unpack import time from math import floor --- 1,7 ---- import wolfpack import time + from wolfpack.consts import LAYER_NPCRESTOCK + from struct import unpack from math import floor Index: food.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** food.py 20 Jun 2004 20:09:54 -0000 1.5 --- food.py 9 Jul 2004 21:47:45 -0000 1.6 *************** *** 1,5 **** import random ! from wolfpack.consts import * from wolfpack.utilities import tobackpack from system import poison --- 1,5 ---- import random ! from wolfpack.consts import ANIM_FIDGET3 from wolfpack.utilities import tobackpack from system import poison Index: figurine.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/figurine.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** figurine.py 26 May 2004 13:07:19 -0000 1.2 --- figurine.py 9 Jul 2004 21:47:45 -0000 1.3 *************** *** 1,5 **** import wolfpack from wolfpack import console ! from wolfpack.consts import * # --- 1,5 ---- import wolfpack from wolfpack import console ! from wolfpack.consts import SND_IDLE, ANIM_CASTDIRECTED # Index: lockpick.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/lockpick.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lockpick.py 26 May 2004 13:07:20 -0000 1.3 --- lockpick.py 9 Jul 2004 21:47:45 -0000 1.4 *************** *** 1,5 **** import wolfpack ! from wolfpack.consts import * import random --- 1,5 ---- import wolfpack ! from wolfpack.consts import LOCKPICKING import random Index: check.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/check.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** check.py 9 Jul 2004 10:30:25 -0000 1.7 --- check.py 9 Jul 2004 21:47:45 -0000 1.8 *************** *** 34,39 **** gold.amount = min( [ value, 60000 ] ) gold.container = bankbox - value -= min( [ value, 60000 ] ) amount = str( value ) char.soundeffect( 0x37, 0 ) --- 34,39 ---- gold.amount = min( [ value, 60000 ] ) gold.container = bankbox value -= min( [ value, 60000 ] ) + amount = str( value ) char.soundeffect( 0x37, 0 ) Index: ore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ore.py 2 Jul 2004 13:40:45 -0000 1.19 --- ore.py 9 Jul 2004 21:47:45 -0000 1.20 *************** *** 3,13 **** # ~ Dreoth - from wolfpack.consts import * - import whrandom import wolfpack import skills from skills import mining from wolfpack.time import * - from wolfpack.utilities import * from random import randrange, randint from system.lootlists import DEF_ORES # Gets BaseIDs --- 3,13 ---- # ~ Dreoth import wolfpack import skills + import whrandom + import wolfpack.utilities + from wolfpack.consts import GRAY, MINING, SOUND_HAMMER_1 from skills import mining from wolfpack.time import * from random import randrange, randint from system.lootlists import DEF_ORES # Gets BaseIDs Index: pickaxe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/pickaxe.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pickaxe.py 2 Jul 2004 13:40:45 -0000 1.3 --- pickaxe.py 9 Jul 2004 21:47:45 -0000 1.4 *************** *** 6,16 **** ################################################################# - from wolfpack.consts import * - import whrandom import wolfpack import skills ! from skills.mining import * from wolfpack.time import * ! from wolfpack.utilities import * def onUse( char, tool ): --- 6,16 ---- ################################################################# import wolfpack import skills ! import whrandom ! import wolfpack.utilities ! from wolfpack.consts import GRAY, LAYER_MOUNT from wolfpack.time import * ! def onUse( char, tool ): *************** *** 34,38 **** # Is that mining tool ? ! if isminingtool( tool ): # Where do you wish to dig? char.socket.clilocmessage( 503033, "", GRAY) --- 34,38 ---- # Is that mining tool ? ! if wolfpack.utilities.isminingtool( tool ): # Where do you wish to dig? char.socket.clilocmessage( 503033, "", GRAY) Index: moongate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/moongate.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** moongate.py 20 Jun 2004 13:31:09 -0000 1.11 --- moongate.py 9 Jul 2004 21:47:45 -0000 1.12 *************** *** 6,9 **** --- 6,10 ---- ################################################################# + import wolfpack from wolfpack.gumps import cGump Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** blades.py 7 Jul 2004 13:08:20 -0000 1.5 --- blades.py 9 Jul 2004 21:47:45 -0000 1.6 *************** *** 9,19 **** import wolfpack - import wolfpack.time - from wolfpack.consts import * - from wolfpack.utilities import * - from skills.lumberjacking import * - import wolfpack.utilities - from wolfpack import settings import whrandom #import weapons.blades --- 9,18 ---- import wolfpack import whrandom + import skills.lumberjacking + from wolfpack import utilities + from wolfpack import settings + from wolfpack.consts import * + #import weapons.blades *************** *** 71,84 **** target.char.baseid = 'sheep_sheered' target.char.update() ! # Create Wool wool = wolfpack.additem("df8") wool.amount = 2 ! ! if not wolfpack.utilities.tobackpack(wool, char): wool.update() char.socket.clilocmessage( 0x7A2E4 ) # You place the gathered wool into your backpack. ! # Let the wool regrow (minutes) delay = settings.getnumber('Game Speed', 'Regrow Wool Minutes', 180, 1) --- 70,83 ---- target.char.baseid = 'sheep_sheered' target.char.update() ! # Create Wool wool = wolfpack.additem("df8") wool.amount = 2 ! ! if not utilities.tobackpack(wool, char): wool.update() char.socket.clilocmessage( 0x7A2E4 ) # You place the gathered wool into your backpack. ! # Let the wool regrow (minutes) delay = settings.getnumber('Game Speed', 'Regrow Wool Minutes', 180, 1) *************** *** 102,106 **** treeid = target.model ! if istree(treeid): # Axes/Polearms get Logs, Swords get kindling. # Also allows a mace's war axe to be use. 0x13af and 0x13b0 --- 101,105 ---- treeid = target.model ! if utilities.istree(treeid): # Axes/Polearms get Logs, Swords get kindling. # Also allows a mace's war axe to be use. 0x13af and 0x13b0 *************** *** 141,145 **** char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve.. return ! if corpse.hastag('carved') or carve == '': char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve.. --- 140,144 ---- char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve.. return ! if corpse.hastag('carved') or carve == '': char.socket.clilocmessage( 0x7A305, "", 0x3b2, 3, corpse ) # You see nothing useful to carve.. *************** *** 159,163 **** item = wolfpack.additem( id ) item.amount = amount ! if not wolfpack.utilities.tocontainer( item, corpse ): item.update() --- 158,162 ---- item = wolfpack.additem( id ) item.amount = amount ! if not utilities.tocontainer( item, corpse ): item.update() *************** *** 176,180 **** item_new = wolfpack.additem( "97a" ) item_new.amount = item.amount * 2 ! if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() item.delete() --- 175,179 ---- item_new = wolfpack.additem( "97a" ) item_new.amount = item.amount * 2 ! if not utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() item.delete() |
|
From: Richard M. <dr...@us...> - 2004-07-09 21:47:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18281/commands Modified Files: eval.py Log Message: Tweaks... looking at ways to reduce memory load. Index: eval.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/eval.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** eval.py 9 Jul 2004 21:08:36 -0000 1.3 --- eval.py 9 Jul 2004 21:47:46 -0000 1.4 *************** *** 17,19 **** def onLoad(): ! registercommand('eval', evalcommand) --- 17,19 ---- def onLoad(): ! wolfpack.registercommand('eval', evalcommand) |
|
From: Richard M. <dr...@us...> - 2004-07-09 21:08:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10928 Modified Files: account.py add.py addtree.py disconnect.py dye.py eval.py events.py freeze.py go.py kill.py password.py restore.py resurrect.py serverinfo.py skill.py skillinfo.py sound.py Log Message: Importing only what needs to be imported. Index: kill.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/kill.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kill.py 9 Jul 2004 09:58:21 -0000 1.1 --- kill.py 9 Jul 2004 21:08:36 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import wolfpack + from wolfpack.consts import LOG_MESSAGE def onLoad(): *************** *** 29,32 **** --- 30,34 ---- else: target.char.lightning() + char.log( LOG_MESSAGE, "Used kill on 0x%x.\n" % target.char.serial ) target.char.kill() return True Index: disconnect.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/disconnect.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** disconnect.py 26 May 2004 13:07:21 -0000 1.2 --- disconnect.py 9 Jul 2004 21:08:36 -0000 1.3 *************** *** 1,4 **** - import wolfpack - """ \command disconnect --- 1,2 ---- *************** *** 7,10 **** --- 5,10 ---- """ + import wolfpack + def disconnect( socket, command, argstring): socket.sysmessage( "Which client do you want to disconnect?" ) Index: resurrect.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/resurrect.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resurrect.py 9 Jul 2004 07:41:02 -0000 1.2 --- resurrect.py 9 Jul 2004 21:08:36 -0000 1.3 *************** *** 8,12 **** import wolfpack ! from wolfpack.consts import * def onLoad(): --- 8,12 ---- import wolfpack ! from wolfpack.consts import LOG_MESSAGE def onLoad(): *************** *** 33,37 **** target.char.soundeffect( 0x215 ) target.char.resurrect() ! char.log(LOG_MESSAGE, "Resurrects character 0x%x.\n" % target.char.serial) # Restore the character as well, added bonus. target.char.hitpoints = target.char.maxhitpoints --- 33,37 ---- target.char.soundeffect( 0x215 ) target.char.resurrect() ! char.log( LOG_MESSAGE, "Resurrects character 0x%x.\n" % target.char.serial ) # Restore the character as well, added bonus. target.char.hitpoints = target.char.maxhitpoints Index: skill.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/skill.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** skill.py 2 Jul 2004 13:40:45 -0000 1.3 --- skill.py 9 Jul 2004 21:08:36 -0000 1.4 *************** *** 19,23 **** import wolfpack import string ! from wolfpack.consts import * usage = 'Usage: skill <skill-name> <value*10>' --- 19,23 ---- import wolfpack import string ! from wolfpack.consts import YELLOW, NORMAL usage = 'Usage: skill <skill-name> <value*10>' Index: go.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/go.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** go.py 7 Jul 2004 04:21:37 -0000 1.8 --- go.py 9 Jul 2004 21:08:36 -0000 1.9 *************** *** 31,35 **** from wolfpack.consts import * from system.makemenus import MakeMenu, MakeAction, findmenu - from wolfpack.console import * --- 31,34 ---- *************** *** 132,142 **** if len(arguments) == 0: ! global generated ! if not generated: ! socket.sysmessage('Generating go menu.') ! socket.sysmessage('Please wait...') ! generateGoMenu() ! generated = 1 ! menu = findmenu('GOMENU') if menu: --- 131,141 ---- if len(arguments) == 0: ! global generated ! if not generated: ! socket.sysmessage('Generating go menu.') ! socket.sysmessage('Please wait...') ! generateGoMenu() ! generated = 1 ! menu = findmenu('GOMENU') if menu: *************** *** 263,266 **** def onUnload(): ! global generated ! generated = 0 --- 262,265 ---- def onUnload(): ! global generated ! generated = 0 Index: password.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/password.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** password.py 9 Jul 2004 08:38:25 -0000 1.1 --- password.py 9 Jul 2004 21:08:36 -0000 1.2 *************** *** 10,14 **** import wolfpack.accounts import string ! from wolfpack.consts import * # Loads the command --- 10,14 ---- import wolfpack.accounts import string ! from wolfpack.consts import LOG_MESSAGE # Loads the command Index: skillinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/skillinfo.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** skillinfo.py 5 Jul 2004 12:55:35 -0000 1.4 --- skillinfo.py 9 Jul 2004 21:08:36 -0000 1.5 *************** *** 4,12 **** \description Show a dialog to modify the skill values and caps of a character. """ - - from wolfpack.utilities import tobackpack import wolfpack - from wolfpack.consts import * import wolfpack.gumps from math import ceil, floor from commands.info import iteminfo --- 4,11 ---- \description Show a dialog to modify the skill values and caps of a character. """ import wolfpack import wolfpack.gumps + from wolfpack.utilities import tobackpack + from wolfpack.consts import ALLSKILLS, SKILLNAMES, LOG_MESSAGE from math import ceil, floor from commands.info import iteminfo Index: serverinfo.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/serverinfo.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** serverinfo.py 29 Jun 2004 11:36:12 -0000 1.2 --- serverinfo.py 9 Jul 2004 21:08:36 -0000 1.3 *************** *** 14,18 **** import wolfpack import wolfpack.accounts - from wolfpack.consts import * from wolfpack.gumps import * from wolfpack.time import * --- 14,17 ---- Index: sound.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/sound.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sound.py 26 May 2004 13:07:21 -0000 1.2 --- sound.py 9 Jul 2004 21:08:36 -0000 1.3 *************** *** 16,20 **** import wolfpack ! from wolfpack.utilities import * def sound( socket, command, arguments ): --- 16,20 ---- import wolfpack ! from wolfpack.utilities import hex2dec def sound( socket, command, arguments ): Index: account.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/account.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** account.py 9 Jul 2004 09:58:21 -0000 1.7 --- account.py 9 Jul 2004 21:08:36 -0000 1.8 *************** *** 49,52 **** --- 49,53 ---- import string from wolfpack.utilities import hex2dec + from wolfpack.consts import LOG_MESSAGE usage0 = "Account Command Usage:" *************** *** 85,94 **** # Reload Accounts if action == 'reload': ! char.log( LOG_MESSAGE, "0x%x reloaded accounts.\n" % char.serial ) wolfpack.accounts.reload() return True # Save Accounts elif action == 'save': ! char.log( LOG_MESSAGE, "0x%x saved accounts.\n" % char.serial ) wolfpack.accounts.save() return True --- 86,95 ---- # Reload Accounts if action == 'reload': ! char.log( LOG_MESSAGE, "Reloaded accounts.\n" % char.serial ) wolfpack.accounts.reload() return True # Save Accounts elif action == 'save': ! char.log( LOG_MESSAGE, "Saved accounts.\n" % char.serial ) wolfpack.accounts.save() return True *************** *** 169,174 **** else: account.delete() ! socket.sysmessage( "Success: Account %s removed!" % username ) ! char.log( LOG_MESSAGE, "0x%x removed account: %s\n" % ( char.serial, username ) ) return True # Failure --- 170,175 ---- else: account.delete() ! socket.sysmessage( "Success: Account %s removed!" % account.name ) ! char.log( LOG_MESSAGE, "Removed account: %s\n" % account.name ) return True # Failure *************** *** 198,202 **** else: if account: ! socket.sysmessage( "Error: Account %s exists!" % username ) return False # Create the Account --- 199,203 ---- else: if account: ! socket.sysmessage( "Error: Account %s exists!" % account.name ) return False # Create the Account *************** *** 205,209 **** newaccount.acl = 'player' socket.sysmessage( "You created the account successfully!" ) ! char.log( LOG_MESSAGE, "0x%x created account: %s\n" % ( char.serial, username ) ) return True # Failure --- 206,210 ---- newaccount.acl = 'player' socket.sysmessage( "You created the account successfully!" ) ! char.log( LOG_MESSAGE, "Created account: %s\n" % account.name ) return True # Failure *************** *** 233,269 **** if key == 'acl': socket.sysmessage( "%s.acl = %s" % ( account.name, account.acl ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.acl.\n" % ( char.serial, account.name ) ) return True elif key == 'characters': socket.sysmessage( "%s.characters = %s" % ( account.name, account.characters ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.characters.\n" % ( char.serial, account.name ) ) return True elif key == 'flags': socket.sysmessage( "%s.flags = %s" % ( account.name, account.flags ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.flags.\n" % ( char.serial, account.name ) ) return True elif key == 'inuse': socket.sysmessage( "%s.inuse = %s" % ( account.name, account.inuse ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.inuse.\n" % ( char.serial, account.name ) ) return True elif key == 'lastlogin': socket.sysmessage( "%s.lastlogin = %s" % ( account.name, account.lastlogin ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.lastlogin.\n" % ( char.serial, account.name ) ) return True elif key == 'multigems': socket.sysmessage( "%s.multigems = %s" % ( account.name, account.multigems ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.multigems.\n" % ( char.serial, account.name ) ) return True elif key == 'name': socket.sysmessage( "%s.name = %s" % ( account.name, account.name ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.name.\n" % ( char.serial, account.name ) ) return True elif key == 'password' and ( account.name == characcount.name or characcount.rank == 100 ): socket.sysmessage( "%s.password = %s" % ( account.name, account.password ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.password.\n" % ( char.serial, account.name ) ) return True elif key == 'rank': socket.sysmessage( "%s.rank = %i" % ( account.name, account.rank ) ) ! char.log( LOG_MESSAGE, "0x%x requested %s.rank.\n" % ( char.serial, account.name ) ) return True else: --- 234,270 ---- if key == 'acl': socket.sysmessage( "%s.acl = %s" % ( account.name, account.acl ) ) ! char.log( LOG_MESSAGE, "Requested %s.acl.\n" % account.name ) return True elif key == 'characters': socket.sysmessage( "%s.characters = %s" % ( account.name, account.characters ) ) ! char.log( LOG_MESSAGE, "Requested %s.characters.\n" % account.name ) return True elif key == 'flags': socket.sysmessage( "%s.flags = %s" % ( account.name, account.flags ) ) ! char.log( LOG_MESSAGE, "Requested %s.flags.\n" % account.name ) return True elif key == 'inuse': socket.sysmessage( "%s.inuse = %s" % ( account.name, account.inuse ) ) ! char.log( LOG_MESSAGE, "Requested %s.inuse.\n" % account.name ) return True elif key == 'lastlogin': socket.sysmessage( "%s.lastlogin = %s" % ( account.name, account.lastlogin ) ) ! char.log( LOG_MESSAGE, "Requested %s.lastlogin.\n" % account.name ) return True elif key == 'multigems': socket.sysmessage( "%s.multigems = %s" % ( account.name, account.multigems ) ) ! char.log( LOG_MESSAGE, "Requested %s.multigems.\n" % account.name ) return True elif key == 'name': socket.sysmessage( "%s.name = %s" % ( account.name, account.name ) ) ! char.log( LOG_MESSAGE, "Requested %s.name.\n" % account.name ) return True elif key == 'password' and ( account.name == characcount.name or characcount.rank == 100 ): socket.sysmessage( "%s.password = %s" % ( account.name, account.password ) ) ! char.log( LOG_MESSAGE, "Requested %s.password.\n" % account.name ) return True elif key == 'rank': socket.sysmessage( "%s.rank = %i" % ( account.name, account.rank ) ) ! char.log( LOG_MESSAGE, "Requested %s.rank.\n" % account.name ) return True else: *************** *** 301,306 **** account.acl == value socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) ) ! char.log( LOG_MESSAGE, "0x%x modified %s.acl.\n" % ( char.serial, account.name ) ) ! char.log( LOG_MESSAGE, "%s.acl = %s :: %s.flags = %s\n" % ( account.name, oldvalue, account.name, value ) ) return True else: --- 302,306 ---- account.acl == value socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) ) ! char.log( LOG_MESSAGE, "Modified %s.acl ( %s :: %s ).\n" % ( account.name, oldvale, value ) ) return True else: *************** *** 313,318 **** account.flags = hex2dec(value) socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.flags ) ) ! char.log( LOG_MESSAGE, "0x%x modified %s.flags.\n" % ( char.serial, account.name ) ) ! char.log( LOG_MESSAGE, "%s.flags = 0x%x :: %s.flags = 0x%x\n" % ( account.name, oldvalue, account.name, value ) ) return True # MultiGems --- 313,317 ---- account.flags = hex2dec(value) socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.flags ) ) ! char.log( LOG_MESSAGE, "Modified %s.flags ( %s :: %s ).\n" % ( account.name, oldvalue, value ) ) return True # MultiGems *************** *** 323,328 **** account.multigems == value socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) ) ! char.log( LOG_MESSAGE, "0x%x modified %s.multigems.\n" % ( char.serial, account.name ) ) ! char.log( LOG_MESSAGE, "%s.multigems = %s :: %s.multigems = %s\n" % ( account.name, oldvalue, account.name, value ) ) return True else: --- 322,326 ---- account.multigems == value socket.sysmessage( "Changed: %s.acl = %s" % ( account.name, account.acl ) ) ! char.log( LOG_MESSAGE, "Modified %s.multigems ( %s :: %s ).\n" % ( account.name, oldvalue, value ) ) return True else: *************** *** 341,349 **** account.password = key socket.sysmessage( "Changed: %s.password" % ( account.name, account.password ) ) ! char.log( LOG_MESSAGE, "0x%x modified %s.password.\n" % ( char.serial, account.name ) ) return True # READ ONLY VALUES elif key == 'name' or key == 'lastlogin' or key == 'inuse' or key == 'characters' or key == 'rank': ! char.log( LOG_MESSAGE, "0x%x attempted modification of read only value %s.%s.\n" % ( char.serial, account.name, key ) ) socket.sysmessage( "Error: The account.%s property is read only!" % key ) return False --- 339,347 ---- account.password = key socket.sysmessage( "Changed: %s.password" % ( account.name, account.password ) ) ! char.log( LOG_MESSAGE, "Modified %s.password.\n" % ( char.serial, account.name ) ) return True # READ ONLY VALUES elif key == 'name' or key == 'lastlogin' or key == 'inuse' or key == 'characters' or key == 'rank': ! char.log( LOG_MESSAGE, "Attempted modification of read-only value %s.%s.\n" % ( char.serial, account.name, key ) ) socket.sysmessage( "Error: The account.%s property is read only!" % key ) return False Index: eval.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/eval.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** eval.py 26 May 2004 13:07:21 -0000 1.2 --- eval.py 9 Jul 2004 21:08:36 -0000 1.3 *************** *** 2,11 **** # All these imports are available to the python scriptlets as well # Keep that in mind - from wolfpack import * - from wolfpack.consts import * ! def evalcommand(socket, command, arguments): ! script = "from wolfpack import *\nfrom wolfpack.consts import *\n%s\n\n" % arguments try: code = compile(script, '<SOCKET>', 'exec') --- 2,10 ---- # All these imports are available to the python scriptlets as well # Keep that in mind ! import wolfpack + def evalcommand(socket, command, arguments): + script = "import wolfpack\nfrom wolfpack.consts import *\n%s\n\n" % arguments try: code = compile(script, '<SOCKET>', 'exec') Index: events.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/events.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** events.py 6 Jul 2004 12:52:14 -0000 1.1 --- events.py 9 Jul 2004 21:08:36 -0000 1.2 *************** *** 1,5 **** import wolfpack ! from wolfpack.consts import * def addevent_response(player, arguments, target): --- 1,5 ---- import wolfpack ! from wolfpack.consts import LOG_MESSAGE, EVENT_USE def addevent_response(player, arguments, target): *************** *** 13,22 **** player.socket.sysmessage("You've burnt your fingers!") return ! object = target.char else: player.socket.sysmessage('You have to target a character or item.') return ! player.log(LOG_MESSAGE, "Adds event '%s' to object 0x%x.\n" % (event, object.serial)) object.addevent(event) --- 13,22 ---- player.socket.sysmessage("You've burnt your fingers!") return ! object = target.char else: player.socket.sysmessage('You have to target a character or item.') return ! player.log(LOG_MESSAGE, "Adds event '%s' to object 0x%x.\n" % (event, object.serial)) object.addevent(event) *************** *** 34,41 **** socket.sysmessage('Usage: addevent <identifier>') return ! event = arguments.strip() ! ! try: wolfpack.hasevent(event, EVENT_USE) except: --- 34,41 ---- socket.sysmessage('Usage: addevent <identifier>') return ! event = arguments.strip() ! ! try: wolfpack.hasevent(event, EVENT_USE) except: *************** *** 45,49 **** socket.sysmessage("Please select the object you want to add the event '%s' to." % event) socket.attachtarget('commands.events.addevent_response', [event]) ! def removeevent_response(player, arguments, target): event = arguments[0] --- 45,49 ---- socket.sysmessage("Please select the object you want to add the event '%s' to." % event) socket.attachtarget('commands.events.addevent_response', [event]) ! def removeevent_response(player, arguments, target): event = arguments[0] *************** *** 56,65 **** player.socket.sysmessage("You've burnt your fingers!") return ! object = target.char else: player.socket.sysmessage('You have to target a character or item.') return ! if object.hasevent(event): player.log(LOG_MESSAGE, "Removes event '%s' from object 0x%x.\n" % (event, object.serial)) --- 56,65 ---- player.socket.sysmessage("You've burnt your fingers!") return ! object = target.char else: player.socket.sysmessage('You have to target a character or item.') return ! if object.hasevent(event): player.log(LOG_MESSAGE, "Removes event '%s' from object 0x%x.\n" % (event, object.serial)) *************** *** 80,86 **** socket.sysmessage('Usage: removeevent <identifier>') return ! event = arguments.strip() ! try: wolfpack.hasevent(event, EVENT_USE) --- 80,86 ---- socket.sysmessage('Usage: removeevent <identifier>') return ! event = arguments.strip() ! try: wolfpack.hasevent(event, EVENT_USE) Index: add.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/add.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** add.py 7 Jul 2004 04:21:37 -0000 1.7 --- add.py 9 Jul 2004 21:08:36 -0000 1.8 *************** *** 1,5 **** import wolfpack ! from wolfpack.consts import * from wolfpack import console from system.makemenus import MakeItemAction, MakeMenu, MakeAction, findmenu --- 1,5 ---- import wolfpack ! from wolfpack.consts import WPDT_NPC, WPDT_ITEM, WPDT_MULTI from wolfpack import console from system.makemenus import MakeItemAction, MakeMenu, MakeAction, findmenu Index: addtree.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/addtree.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** addtree.py 26 May 2004 13:07:21 -0000 1.4 --- addtree.py 9 Jul 2004 21:08:36 -0000 1.5 *************** *** 9,13 **** import wolfpack ! from wolfpack.consts import * from wolfpack.utilities import hex2dec from wolfpack import console --- 9,13 ---- import wolfpack ! from wolfpack.consts import WPDT_ITEM from wolfpack.utilities import hex2dec from wolfpack import console Index: dye.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/dye.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dye.py 15 Jun 2004 19:28:59 -0000 1.3 --- dye.py 9 Jul 2004 21:08:36 -0000 1.4 *************** *** 16,20 **** import wolfpack ! from wolfpack.utilities import * def dye( socket, command, arguments ): --- 16,20 ---- import wolfpack ! from wolfpack.utilities import hex2dec def dye( socket, command, arguments ): Index: freeze.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/freeze.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** freeze.py 15 Jun 2004 19:28:59 -0000 1.1 --- freeze.py 9 Jul 2004 21:08:36 -0000 1.2 *************** *** 15,19 **** import wolfpack ! from wolfpack.utilities import * def freeze( socket, command, arguments ): --- 15,19 ---- import wolfpack ! from wolfpack.utilities import booleantoggle def freeze( socket, command, arguments ): *************** *** 25,32 **** def response( char, args, target ): if target.char: ! if target.char.frozen == 0: ! target.char.frozen = 1 ! elif target.char.frozen == 1: ! target.char.frozen = 0 else: char.socket.sysmessage( 'That was not a valid object.', GRAY ) --- 25,29 ---- def response( char, args, target ): if target.char: ! target.char.frozen = booleantoggle( target.char.frozen ) else: char.socket.sysmessage( 'That was not a valid object.', GRAY ) Index: restore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/restore.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** restore.py 8 Apr 2004 19:04:50 -0000 1.1 --- restore.py 9 Jul 2004 21:08:36 -0000 1.2 *************** *** 21,26 **** import wolfpack ! from wolfpack.consts import * ! from wolfpack.utilities import * def onLoad(): --- 21,25 ---- import wolfpack ! from wolfpack.consts import LOG_MESSAGE def onLoad(): *************** *** 43,46 **** --- 42,46 ---- target.char.mana = int( target.char.maxmana ) target.char.updatestats() + char.log( LOG_MESSAGE, "Restored 0x%x.\n" % target.char.serial ) def heal( socket, command, arguments ): *************** *** 57,58 **** --- 57,59 ---- target.char.hitpoints = int( target.char.maxhitpoints ) target.char.updatestats() + char.log( LOG_MESSAGE, "Healed 0x%x.\n" % target.char.serial ) |
|
From: Sebastian H. <dar...@us...> - 2004-07-09 10:56:06
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3521 Modified Files: global.cpp Log Message: Crashfix Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** global.cpp 7 Jul 2004 13:04:45 -0000 1.139 --- global.cpp 9 Jul 2004 10:55:57 -0000 1.140 *************** *** 68,71 **** --- 68,76 ---- PyObject* PyGetObjectObject( cUObject* object ) { + if (!object) { + Py_INCREF(Py_None); + return Py_None; + } + if ( dynamic_cast<P_ITEM>( object ) ) return PyGetItemObject( ( P_ITEM ) object ); *************** *** 73,77 **** return PyGetCharObject( ( P_CHAR ) object ); ! return 0; } --- 78,83 ---- return PyGetCharObject( ( P_CHAR ) object ); ! Py_INCREF(Py_None); ! return Py_None; } |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:37:06
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv880 Modified Files: fix.py Log Message: Tired eyes result in ignoring the missing , Index: fix.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/fix.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fix.py 9 Jul 2004 10:14:30 -0000 1.2 --- fix.py 9 Jul 2004 10:36:57 -0000 1.3 *************** *** 18,22 **** def onLoad(): wolfpack.registercommand( 'fix', commandFix ) ! wolfpack.registercommand( 'resend' commandFix ) return --- 18,22 ---- def onLoad(): wolfpack.registercommand( 'fix', commandFix ) ! wolfpack.registercommand( 'resend', commandFix ) return |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:32:54
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv389/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: More updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ChangeLog.wolfpack 9 Jul 2004 10:16:55 -0000 1.12 --- ChangeLog.wolfpack 9 Jul 2004 10:32:46 -0000 1.13 *************** *** 38,41 **** --- 38,42 ---- - Fixed sheering of sheeps and wool regrowing - Rudimentarily Implemented Map Plotting + - new wolfpack.utilities function: booleantoggle( boolean ) * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:31:07
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32483/commands Added Files: invis.py Log Message: I almost forgot to commit this --- NEW FILE: invis.py --- #===============================================================# # ) (\_ | WOLFPACK 13.0.0 Scripts # (( _/{ "-; | Created by: Dreoth # )).-' {{ ;'` | Revised by: # ( ( ;._ \\ ctr | Last Modification: Created #===============================================================# """ \command invis \description Toggle invisibility. """ import wolfpack from wolfpack.utilities import booleantoggle def onLoad(): wolfpack.registercommand( "invis", commandInvis ) return def commandInvis( socket, cmd, args ): char = socket.player char.invisible = booleantoggle( char.invisible ) char.update() socket.sysmessage( "Invisible is now '%i'." % char.invisible ) return True |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:30:42
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32003/skills Modified Files: alchemy.py anatomy.py animallore.py animaltaming.py armslore.py begging.py blacksmithing.py bowcraft.py carpentry.py detectinghidden.py evaluatingintel.py fishing.py healing.py hiding.py inscription.py lumberjacking.py mining.py Log Message: *shrug* kinda pointless, but I was looking through scripts to see what I've forgotten to do anyways... I should finish the potionkeg script... assuming it will let me. Index: detectinghidden.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/detectinghidden.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** detectinghidden.py 22 Feb 2004 01:05:43 -0000 1.6 --- detectinghidden.py 9 Jul 2004 10:30:26 -0000 1.7 *************** *** 27,31 **** # only handle detect hidden if skill != DETECTINGHIDDEN: ! return 0 if char.socket.hastag( 'skill_delay' ): --- 27,31 ---- # only handle detect hidden if skill != DETECTINGHIDDEN: ! return False if char.socket.hastag( 'skill_delay' ): *************** *** 33,37 **** if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 33,37 ---- if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 40,44 **** char.socket.attachtarget( "skills.detectinghidden.response" ) ! return 1 def response( char, args, target ): --- 40,44 ---- char.socket.attachtarget( "skills.detectinghidden.response" ) ! return True def response( char, args, target ): Index: anatomy.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/anatomy.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** anatomy.py 26 May 2004 13:07:24 -0000 1.12 --- anatomy.py 9 Jul 2004 10:30:26 -0000 1.13 *************** *** 18,22 **** # We only handle anatomy if skill != ANATOMY: ! return 0 socket = char.socket --- 18,22 ---- # We only handle anatomy if skill != ANATOMY: ! return False socket = char.socket *************** *** 26,30 **** if cur_time < socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: socket.deltag( 'skill_delay' ) --- 26,30 ---- if cur_time < socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: socket.deltag( 'skill_delay' ) *************** *** 34,38 **** socket.attachtarget( "skills.anatomy.response" ) ! return 1 def response( char, args, target ): --- 34,38 ---- socket.attachtarget( "skills.anatomy.response" ) ! return True def response( char, args, target ): Index: bowcraft.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/bowcraft.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bowcraft.py 16 May 2004 22:04:23 -0000 1.13 --- bowcraft.py 9 Jul 2004 10:30:26 -0000 1.14 *************** *** 20,29 **** def onUse(player, item): if not checktool(player, item): ! return 1 menu = findmenu('BOWCRAFT') if menu: menu.send(player, [item.serial]) ! return 1 # --- 20,29 ---- def onUse(player, item): if not checktool(player, item): ! return True menu = findmenu('BOWCRAFT') if menu: menu.send(player, [item.serial]) ! return True # *************** *** 32,41 **** def checktool(char, item, wearout = 0): if not item: ! return 0 # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return 0 # We do not allow "invulnerable" tools. --- 32,41 ---- def checktool(char, item, wearout = 0): if not item: ! return False # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return False # We do not allow "invulnerable" tools. *************** *** 43,47 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 if wearout: --- 43,47 ---- char.socket.clilocmessage(1044038) item.delete() ! return False if wearout: *************** *** 50,58 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 else: item.settag('remaining_uses', uses - 1) ! return 1 # --- 50,58 ---- char.socket.clilocmessage(1044038) item.delete() ! return False else: item.settag('remaining_uses', uses - 1) ! return True # *************** *** 70,74 **** def getexceptionalchance(self, player, arguments): if not self.skills.has_key(BOWCRAFT): ! return 0 minskill = self.skills[BOWCRAFT][0] --- 70,74 ---- def getexceptionalchance(self, player, arguments): if not self.skills.has_key(BOWCRAFT): ! return False minskill = self.skills[BOWCRAFT][0] *************** *** 131,135 **** if not checktool(player, wolfpack.finditem(arguments[0])): ! return 0 return CraftItemAction.make(self, player, arguments, nodelay) --- 131,135 ---- if not checktool(player, wolfpack.finditem(arguments[0])): ! return False return CraftItemAction.make(self, player, arguments, nodelay) Index: evaluatingintel.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/evaluatingintel.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** evaluatingintel.py 26 May 2004 13:07:25 -0000 1.9 --- evaluatingintel.py 9 Jul 2004 10:30:26 -0000 1.10 *************** *** 17,21 **** #Only Handle Evalint if skill != EVALUATINGINTEL: ! return 0 if char.socket.hastag( 'skill_delay' ): --- 17,21 ---- #Only Handle Evalint if skill != EVALUATINGINTEL: ! return False if char.socket.hastag( 'skill_delay' ): *************** *** 23,27 **** if cur_time < char.socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 23,27 ---- if cur_time < char.socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 29,33 **** char.socket.clilocmessage( 0x7A4AA, "", 0x3b2, 3 ) # What would you like to evaluate char.socket.attachtarget( "skills.evaluatingintel.response" ) ! return 1 def response( char, args, target ): --- 29,33 ---- char.socket.clilocmessage( 0x7A4AA, "", 0x3b2, 3 ) # What would you like to evaluate char.socket.attachtarget( "skills.evaluatingintel.response" ) ! return True def response( char, args, target ): *************** *** 36,44 **** # It looks smarter than a rock, but dumber than a piece of wood char.socket.clilocmessage( 0x7A4AC, "", 0x3b2, 3, target.item ) ! return 0 if not char.canreach( target.char, 8 ): # No Cliloc when failing LoS or Distance Check ! return 0 # Vendors: 0x7A4AD That person could probably calculate the cost of what you buy from them. --- 36,44 ---- # It looks smarter than a rock, but dumber than a piece of wood char.socket.clilocmessage( 0x7A4AC, "", 0x3b2, 3, target.item ) ! return False if not char.canreach( target.char, 8 ): # No Cliloc when failing LoS or Distance Check ! return False # Vendors: 0x7A4AD That person could probably calculate the cost of what you buy from them. *************** *** 48,52 **** # Hmm, that person looks really silly. char.socket.clilocmessage( 0x7A4AE, "", 0x3b2, 3, target.char ) ! return 0 cur_time = servertime() --- 48,52 ---- # Hmm, that person looks really silly. char.socket.clilocmessage( 0x7A4AE, "", 0x3b2, 3, target.char ) ! return False cur_time = servertime() *************** *** 55,59 **** if not char.checkskill( EVALUATINGINTEL, 0, 1000 ): char.socket.clilocmessage( 0xFD756, "", 0x3b2, 3, target.char ) ! return 0 IntRatio = float( 100.0 / target.char.intelligence ) --- 55,59 ---- if not char.checkskill( EVALUATINGINTEL, 0, 1000 ): char.socket.clilocmessage( 0xFD756, "", 0x3b2, 3, target.char ) ! return False IntRatio = float( 100.0 / target.char.intelligence ) *************** *** 72,76 **** char.socket.clilocmessage( msgId, "", 0x3b2, 3, target.char ) char.socket.clilocmessage( msgId2, "", 0x3b2, 3, target.char ) ! return 1 def onLoad(): --- 72,76 ---- char.socket.clilocmessage( msgId, "", 0x3b2, 3, target.char ) char.socket.clilocmessage( msgId2, "", 0x3b2, 3, target.char ) ! return True def onLoad(): Index: begging.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/begging.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** begging.py 26 May 2004 13:07:24 -0000 1.12 --- begging.py 9 Jul 2004 10:30:26 -0000 1.13 *************** *** 27,31 **** def begging( char, skill ): if skill != BEGGING: ! return 0 if char.socket.hastag( 'skill_delay' ): --- 27,31 ---- def begging( char, skill ): if skill != BEGGING: ! return False if char.socket.hastag( 'skill_delay' ): *************** *** 33,37 **** if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 33,37 ---- if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 42,46 **** char.socket.attachtarget( "skills.begging.response" ) ! return 1 def response( char, args, target ): --- 42,46 ---- char.socket.attachtarget( "skills.begging.response" ) ! return True def response( char, args, target ): *************** *** 103,105 **** def onLoad(): ! skills.register( BEGGING, begging ) \ No newline at end of file --- 103,105 ---- def onLoad(): ! skills.register( BEGGING, begging ) Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** lumberjacking.py 2 Jul 2004 13:40:46 -0000 1.13 --- lumberjacking.py 9 Jul 2004 10:30:26 -0000 1.14 *************** *** 1,7 **** - from wolfpack.consts import * - import whrandom import wolfpack import skills from wolfpack.time import * from wolfpack.utilities import * --- 1,7 ---- import wolfpack + import whrandom import skills + from wolfpack.consts import * from wolfpack.time import * from wolfpack.utilities import * *************** *** 267,269 **** else: return False - --- 267,268 ---- Index: carpentry.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/carpentry.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** carpentry.py 16 May 2004 22:04:23 -0000 1.17 --- carpentry.py 9 Jul 2004 10:30:26 -0000 1.18 *************** *** 14,23 **** def checktool(char, item, wearout = 0): if not item: ! return 0 # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return 0 # We do not allow "invulnerable" tools. --- 14,23 ---- def checktool(char, item, wearout = 0): if not item: ! return False # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return False # We do not allow "invulnerable" tools. *************** *** 25,29 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 if wearout: --- 25,29 ---- char.socket.clilocmessage(1044038) item.delete() ! return False if wearout: *************** *** 32,40 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 else: item.settag('remaining_uses', uses - 1) ! return 1 # --- 32,40 ---- char.socket.clilocmessage(1044038) item.delete() ! return False else: item.settag('remaining_uses', uses - 1) ! return True # *************** *** 43,52 **** def onUse(char, item): if not checktool(char, item): ! return 1 menu = findmenu('CARPENTRY') if menu: menu.send(char, [item.serial]) ! return 1 # --- 43,52 ---- def onUse(char, item): if not checktool(char, item): ! return True menu = findmenu('CARPENTRY') if menu: menu.send(char, [item.serial]) ! return True # *************** *** 65,69 **** # Only works if this item requires carpentry if not self.skills.has_key(CARPENTRY): ! return 0 minskill = self.skills[CARPENTRY][0] --- 65,69 ---- # Only works if this item requires carpentry if not self.skills.has_key(CARPENTRY): ! return False minskill = self.skills[CARPENTRY][0] *************** *** 125,129 **** if not checktool(player, wolfpack.finditem(arguments[0])): ! return 0 return CraftItemAction.make(self, player, arguments, nodelay) --- 125,129 ---- if not checktool(player, wolfpack.finditem(arguments[0])): ! return False return CraftItemAction.make(self, player, arguments, nodelay) *************** *** 154,158 **** def getsubmaterial1used(self, player, arguments): if not player.hastag('blacksmithing_ore'): ! return 0 else: material = int(player.gettag('blacksmithing_ore')) --- 154,158 ---- def getsubmaterial1used(self, player, arguments): if not player.hastag('blacksmithing_ore'): ! return False else: material = int(player.gettag('blacksmithing_ore')) *************** *** 160,164 **** return material else: ! return 0 # --- 160,164 ---- return material else: ! return False # Index: fishing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/fishing.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** fishing.py 18 May 2004 02:47:31 -0000 1.6 --- fishing.py 9 Jul 2004 10:30:26 -0000 1.7 *************** *** 36,45 **** if char.itemonlayer( LAYER_MOUNT ): socket.clilocmessage( 0x7A4EB, "", 0x3b2, 3 ) # You can't fish while riding! ! return 1 # Are we already fishing? if socket.hastag( 'is_fishing' ) and socket.gettag( 'is_fishing' ) > wolfpack.time.servertime(): socket.clilocmessage( 0x7A4EC, "", 0x3b2, 3 ) # You are already fishing. ! return 1 iserial = item.serial --- 36,45 ---- if char.itemonlayer( LAYER_MOUNT ): socket.clilocmessage( 0x7A4EB, "", 0x3b2, 3 ) # You can't fish while riding! ! return True # Are we already fishing? if socket.hastag( 'is_fishing' ) and socket.gettag( 'is_fishing' ) > wolfpack.time.servertime(): socket.clilocmessage( 0x7A4EC, "", 0x3b2, 3 ) # You are already fishing. ! return True iserial = item.serial *************** *** 49,60 **** if hand1 and hand1.serial != item.serial: socket.clilocmessage( 502641, "", 0x3b2, 3 ) # Must equip this item to use it! ! return 1 elif hand2 and hand2.serial != item.serial: socket.clilocmessage( 502641, "", 0x3b2, 3 ) # Must equip this item to use it! ! return 1 else: socket.clilocmessage( 0x7A4EE, "", 0x3b2, 3 ) # What water do you want to fish in? socket.attachtarget( "skills.fishing.response" ) ! return 1 def response( char, args, target ): --- 49,60 ---- if hand1 and hand1.serial != item.serial: socket.clilocmessage( 502641, "", 0x3b2, 3 ) # Must equip this item to use it! ! return True elif hand2 and hand2.serial != item.serial: socket.clilocmessage( 502641, "", 0x3b2, 3 ) # Must equip this item to use it! ! return True else: socket.clilocmessage( 0x7A4EE, "", 0x3b2, 3 ) # What water do you want to fish in? socket.attachtarget( "skills.fishing.response" ) ! return True def response( char, args, target ): Index: armslore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/armslore.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** armslore.py 22 Jun 2004 12:05:30 -0000 1.11 --- armslore.py 9 Jul 2004 10:30:26 -0000 1.12 *************** *** 20,24 **** # only handle armslore if skill != ARMSLORE: ! return 0 if char.socket.hastag( 'skill_delay' ): --- 20,24 ---- # only handle armslore if skill != ARMSLORE: ! return False if char.socket.hastag( 'skill_delay' ): *************** *** 26,30 **** if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 26,30 ---- if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 33,37 **** char.socket.attachtarget( "skills.armslore.response" ) ! return 1 def response( char, args, target ): --- 33,37 ---- char.socket.attachtarget( "skills.armslore.response" ) ! return True def response( char, args, target ): *************** *** 44,52 **** if not char.canreach( item, 4 ): char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 ) ! return 0 if not char.distanceto( item ) < 5: char.socket.clilocmessage( 0x7A27E, "", 0x3b2, 3 ) ! return 0 if isweapon( item ) or isarmor( item ) or isshield( item ): --- 44,52 ---- if not char.canreach( item, 4 ): char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 ) ! return False if not char.distanceto( item ) < 5: char.socket.clilocmessage( 0x7A27E, "", 0x3b2, 3 ) ! return False if isweapon( item ) or isarmor( item ) or isshield( item ): *************** *** 55,59 **** if not char.checkskill( ARMSLORE, 0, 1000 ): char.socket.clilocmessage( 0x7A281, "", 0x3b2, 3 ) ! return 0 char.socket.clilocmessage( 0x103319, "", 0x3b2, 3 ) --- 55,59 ---- if not char.checkskill( ARMSLORE, 0, 1000 ): char.socket.clilocmessage( 0x7A281, "", 0x3b2, 3 ) ! return False char.socket.clilocmessage( 0x103319, "", 0x3b2, 3 ) *************** *** 93,112 **** arm_id = max( 0, min( int( armor / 5 ), 7 ) ) char.socket.clilocmessage( 1038295 + arm_id ) ! return 1 else: char.socket.clilocmessage( 0x7A280, "", 0x3b2, 3 ) ! return 0 else: if not char.canreach( target.char, 4 ): char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 ) ! return 0 if not char.distanceto ( target.char ) < 5: char.socket.clilocmessage( 0x7A27E, "", 0x3b2, 3 ) ! return 0 char.socket.clilocmessage( 0x7A280, "", 0x3b2, 3 ) ! return 0 def onLoad(): --- 93,112 ---- arm_id = max( 0, min( int( armor / 5 ), 7 ) ) char.socket.clilocmessage( 1038295 + arm_id ) ! return True else: char.socket.clilocmessage( 0x7A280, "", 0x3b2, 3 ) ! return False else: if not char.canreach( target.char, 4 ): char.socket.clilocmessage( 0x7A27F, "", 0x3b2, 3 ) ! return False if not char.distanceto ( target.char ) < 5: char.socket.clilocmessage( 0x7A27E, "", 0x3b2, 3 ) ! return False char.socket.clilocmessage( 0x7A280, "", 0x3b2, 3 ) ! return False def onLoad(): Index: blacksmithing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/blacksmithing.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** blacksmithing.py 26 May 2004 13:07:24 -0000 1.19 --- blacksmithing.py 9 Jul 2004 10:30:26 -0000 1.20 *************** *** 58,64 **** if anvil and forge: ! return 1 ! return 0 # --- 58,64 ---- if anvil and forge: ! return True ! return False # *************** *** 67,76 **** def checktool(char, item, wearout = 0): if not item: ! return 0 # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return 0 # We do not allow "invulnerable" tools. --- 67,76 ---- def checktool(char, item, wearout = 0): if not item: ! return False # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return False # We do not allow "invulnerable" tools. *************** *** 78,82 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 # See if we have another tool equipped --- 78,82 ---- char.socket.clilocmessage(1044038) item.delete() ! return False # See if we have another tool equipped *************** *** 84,88 **** if equipped and equipped != item: char.socket.clilocmessage(1048146) ! return 0 if wearout: --- 84,88 ---- if equipped and equipped != item: char.socket.clilocmessage(1048146) ! return False if wearout: *************** *** 91,99 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 else: item.settag('remaining_uses', uses - 1) ! return 1 # --- 91,99 ---- char.socket.clilocmessage(1044038) item.delete() ! return False else: item.settag('remaining_uses', uses - 1) ! return True # *************** *** 102,115 **** def onUse(char, item): if not checktool(char, item): ! return 1 if not checkanvilandforge(char): char.socket.clilocmessage(1044267) ! return 1 menu = findmenu('BLACKSMITHING') if menu: menu.send(char, [item.serial]) ! return 1 # --- 102,115 ---- def onUse(char, item): if not checktool(char, item): ! return True if not checkanvilandforge(char): char.socket.clilocmessage(1044267) ! return True menu = findmenu('BLACKSMITHING') if menu: menu.send(char, [item.serial]) ! return True # *************** *** 128,132 **** # Only works if this item requires blacksmithing if not self.skills.has_key(BLACKSMITHING): ! return 0 minskill = self.skills[BLACKSMITHING][0] --- 128,132 ---- # Only works if this item requires blacksmithing if not self.skills.has_key(BLACKSMITHING): ! return False minskill = self.skills[BLACKSMITHING][0] *************** *** 217,224 **** if not checkanvilandforge(player): player.socket.clilocmessage(1044267) ! return 0 if not checktool(player, wolfpack.finditem(arguments[0])): ! return 0 return CraftItemAction.make(self, player, arguments, nodelay) --- 217,224 ---- if not checkanvilandforge(player): player.socket.clilocmessage(1044267) ! return False if not checktool(player, wolfpack.finditem(arguments[0])): ! return False return CraftItemAction.make(self, player, arguments, nodelay) *************** *** 388,392 **** def getsubmaterial1used(self, player, arguments): if not player.hastag('blacksmithing_ore'): ! return 0 else: material = int(player.gettag('blacksmithing_ore')) --- 388,392 ---- def getsubmaterial1used(self, player, arguments): if not player.hastag('blacksmithing_ore'): ! return False else: material = int(player.gettag('blacksmithing_ore')) *************** *** 394,398 **** return material else: ! return 0 # --- 394,398 ---- return material else: ! return False # *************** *** 401,405 **** def getsubmaterial2used(self, player, arguments): if not player.hastag('blacksmithing_scales'): ! return 0 else: material = int(player.gettag('blacksmithing_scales')) --- 401,405 ---- def getsubmaterial2used(self, player, arguments): if not player.hastag('blacksmithing_scales'): ! return False else: material = int(player.gettag('blacksmithing_scales')) *************** *** 407,411 **** return material else: ! return 0 # --- 407,411 ---- return material else: ! return False # Index: hiding.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/hiding.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** hiding.py 26 May 2004 13:07:25 -0000 1.9 --- hiding.py 9 Jul 2004 10:30:26 -0000 1.10 *************** *** 16,20 **** def hiding( char, skill ): if skill != HIDING: ! return 0 if char.socket.hastag( 'skill_delay' ): --- 16,20 ---- def hiding( char, skill ): if skill != HIDING: ! return False if char.socket.hastag( 'skill_delay' ): *************** *** 22,26 **** if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 22,26 ---- if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 39,43 **** char.socket.settag( 'skill_delay', cur_time + HIDING_DELAY ) ! return 1 def onLoad(): --- 39,43 ---- char.socket.settag( 'skill_delay', cur_time + HIDING_DELAY ) ! return True def onLoad(): Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** mining.py 29 May 2004 01:45:31 -0000 1.30 --- mining.py 9 Jul 2004 10:30:26 -0000 1.31 *************** *** 6,16 **** ################################################################# - from wolfpack.consts import * - from wolfpack import console import wolfpack import skills from wolfpack.time import * from wolfpack.utilities import ismountainorcave, tobackpack ! import random #mining calling from pickaxe.py and shovel.py --- 6,17 ---- ################################################################# import wolfpack import skills + import random + from wolfpack.consts import * from wolfpack.time import * + from wolfpack import console from wolfpack.utilities import ismountainorcave, tobackpack ! #mining calling from pickaxe.py and shovel.py *************** *** 47,51 **** char.turnto( pos ) char.action( ANIM_ATTACK3 ) ! return 1 def createoregem(pos): --- 48,52 ---- char.turnto( pos ) char.action( ANIM_ATTACK3 ) ! return True def createoregem(pos): *************** *** 91,95 **** socket = char.socket if not socket: ! return 0 pos = target.pos --- 92,96 ---- socket = char.socket if not socket: ! return False pos = target.pos *************** *** 99,103 **** # That is too far away socket.clilocmessage( 500446, "", GRAY ) ! return 1 tool = args[0] --- 100,104 ---- # That is too far away socket.clilocmessage( 500446, "", GRAY ) ! return True tool = args[0] *************** *** 108,112 **** # You can't mine that. socket.clilocmessage( 501863, "", GRAY ) ! return 1 #Find tile by it's position if we haven't model --- 109,113 ---- # You can't mine that. socket.clilocmessage( 501863, "", GRAY ) ! return True #Find tile by it's position if we haven't model *************** *** 118,122 **** # You can't mine there. socket.clilocmessage( 501862, "", GRAY ) ! return 1 #Find tile by it's model --- 119,123 ---- # You can't mine there. socket.clilocmessage( 501862, "", GRAY ) ! return True #Find tile by it's model *************** *** 127,136 **** else: socket.clilocmessage( 501862, "", GRAY ) # You can't mine there. ! return 1 else: ! return 0 ! return 1 #Sound effect --- 128,137 ---- else: socket.clilocmessage( 501862, "", GRAY ) # You can't mine there. ! return True else: ! return False ! return True #Sound effect *************** *** 146,155 **** #if not char.canreach(pos, MINING_MAX_DISTANCE): # socket.clilocmessage(501867) ! # return 0 veingem = getvein(socket, pos) if not veingem or not veingem.hastag('resourcecount'): ! return 0 # 50% chance to dig up primary resource, --- 147,156 ---- #if not char.canreach(pos, MINING_MAX_DISTANCE): # socket.clilocmessage(501867) ! # return False veingem = getvein(socket, pos) if not veingem or not veingem.hastag('resourcecount'): ! return False # 50% chance to dig up primary resource, *************** *** 171,180 **** wolfpack.addtimer(duration, "skills.mining.respawnvein", [veingem], 1) veingem.settag('resource_empty', 1) ! return 0 # You loosen some rocks but fail to find any usable ore. if char.skill < reqskill: socket.clilocmessage(501869) ! return 0 chance = max(0, char.skill[MINING] - ORES[resname][MINSKILL]) / 1000.0 --- 172,181 ---- wolfpack.addtimer(duration, "skills.mining.respawnvein", [veingem], 1) veingem.settag('resource_empty', 1) ! return False # You loosen some rocks but fail to find any usable ore. if char.skill < reqskill: socket.clilocmessage(501869) ! return False chance = max(0, char.skill[MINING] - ORES[resname][MINSKILL]) / 1000.0 *************** *** 183,187 **** if not skills.checkskill(char, MINING, chance): socket.clilocmessage(501869) ! return 0 # Digs up the large ore. --- 184,188 ---- if not skills.checkskill(char, MINING, chance): socket.clilocmessage(501869) ! return False # Digs up the large ore. *************** *** 209,213 **** socket.clilocmessage(1044038) # You have worn out your tool! ! return 1 def successmining(char, gem, resname, size): --- 210,214 ---- socket.clilocmessage(1044038) # You have worn out your tool! ! return True def successmining(char, gem, resname, size): *************** *** 248,252 **** else: char.socket.sysmessage(unicode(message)) ! return 1 def respawnvein( time, args ): --- 249,253 ---- else: char.socket.sysmessage(unicode(message)) ! return True def respawnvein( time, args ): *************** *** 255,257 **** vein.settag('resourcecount', random.randint(MINING_ORE[0], MINING_ORE[1])) vein.deltag('resource_empty') ! return 1 --- 256,258 ---- vein.settag('resourcecount', random.randint(MINING_ORE[0], MINING_ORE[1])) vein.deltag('resource_empty') ! return True Index: inscription.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/inscription.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** inscription.py 4 Jul 2004 12:44:05 -0000 1.5 --- inscription.py 9 Jul 2004 10:30:26 -0000 1.6 *************** *** 19,31 **** def checktool(char, item, wearout=0): if not item: ! return 0 if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return 0 # use this for a Siege-style shard #if not item.hastag('remaining_uses'): # char.socket.clilocmessage(1044038) # item.delete() ! # return 0 #if wearout: # uses = int(item.gettag('remaining_uses')) --- 19,31 ---- def checktool(char, item, wearout=0): if not item: ! return False if item.getoutmostchar() != char: char.socket.clilocmessage(500364) ! return False # use this for a Siege-style shard #if not item.hastag('remaining_uses'): # char.socket.clilocmessage(1044038) # item.delete() ! # return False #if wearout: # uses = int(item.gettag('remaining_uses')) *************** *** 33,57 **** # char.socket.clilocmessage(1044038) # item.delete() ! # return 0 # else: # item.settag('remaining_uses', uses - 1) ! return 1 # skill is used via the blue button on skill gump - copy a book def inscription(char, skill): if skill != INSCRIPTION: ! return 0 char.socket.sysmessage("copying a book is not implemented yet") ! return 1 # skill is used via a scribe's pen def onUse(char, item): #if not checktool(char, item): ! # return 1 # send makemenu menu = findmenu('INSCRIPTION') if menu: menu.send(char, [item.serial]) ! return 1 class InscriptionMenu(CraftMenu): --- 33,57 ---- # char.socket.clilocmessage(1044038) # item.delete() ! # return False # else: # item.settag('remaining_uses', uses - 1) ! return True # skill is used via the blue button on skill gump - copy a book def inscription(char, skill): if skill != INSCRIPTION: ! return False char.socket.sysmessage("copying a book is not implemented yet") ! return True # skill is used via a scribe's pen def onUse(char, item): #if not checktool(char, item): ! # return True # send makemenu menu = findmenu('INSCRIPTION') if menu: menu.send(char, [item.serial]) ! return True class InscriptionMenu(CraftMenu): *************** *** 61,65 **** self.allowrepair = 0 self.gumptype = 0xce123456 ! def loadMenu( id, parent = None ): definition = wolfpack.getdefinition(WPDT_MENU, id) --- 61,65 ---- self.allowrepair = 0 self.gumptype = 0xce123456 ! def loadMenu( id, parent = None ): definition = wolfpack.getdefinition(WPDT_MENU, id) *************** *** 132,139 **** # FIXME : exceptional / success chance def getexceptionalchance(self, player, args): ! return 0 def getsuccesschance(self, player, args): ! return 0 def checkmaterial(self, player, args, silent=0): --- 132,139 ---- # FIXME : exceptional / success chance def getexceptionalchance(self, player, args): ! return False def getsuccesschance(self, player, args): ! return False def checkmaterial(self, player, args, silent=0): *************** *** 151,160 **** # recall rune #elif '1f14' in baseids or '1f15' in baseids or '1f16' in baseids or '1f17' in baseids: ! return 0 ! return 1 def make(self, player, args, nodelay=0): if not checktool(player, wolfpack.finditem(args[0]), 0): ! return 0 # spell scrolls # FIXME : spell no. is not correct --- 151,160 ---- # recall rune #elif '1f14' in baseids or '1f15' in baseids or '1f16' in baseids or '1f17' in baseids: ! return False ! return True def make(self, player, args, nodelay=0): if not checktool(player, wolfpack.finditem(args[0]), 0): ! return False # spell scrolls # FIXME : spell no. is not correct *************** *** 171,175 **** self.parent.send(player, args) player.socket.sysmessage(self.noticestr) ! return 0 if player.mana < self.mana: player.socket.clilocmessage(1044380) --- 171,175 ---- self.parent.send(player, args) player.socket.sysmessage(self.noticestr) ! return False if player.mana < self.mana: player.socket.clilocmessage(1044380) *************** *** 177,181 **** self.noticestr = '' self.parent.send(player, args) ! return 0 if player.socket.hastag('craftmenu_crafting'): player.socket.clilocmessage(500119) --- 177,181 ---- self.noticestr = '' self.parent.send(player, args) ! return False if player.socket.hastag('craftmenu_crafting'): player.socket.clilocmessage(500119) *************** *** 183,190 **** self.noticestr = '' self.parent.send(player, args) ! return 0 if not self.checkmaterial(player, args): self.parent.send(player, args) ! return 0 player.mana = player.mana - self.mana self.consumematerial(player, args, 0) --- 183,190 ---- self.noticestr = '' self.parent.send(player, args) ! return False if not self.checkmaterial(player, args): self.parent.send(player, args) ! return False player.mana = player.mana - self.mana self.consumematerial(player, args, 0) *************** *** 206,210 **** self.noticestr = 'Not implemented yet' self.parent.send(player, args) ! return 0 def onLoad(): --- 206,210 ---- self.noticestr = 'Not implemented yet' self.parent.send(player, args) ! return False def onLoad(): Index: animaltaming.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/animaltaming.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** animaltaming.py 2 Jun 2004 15:03:05 -0000 1.14 --- animaltaming.py 9 Jul 2004 10:30:26 -0000 1.15 *************** *** 31,35 **** if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 31,35 ---- if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 38,46 **** char.socket.clilocmessage( 502789, "", 0x3b2, 3 ) char.socket.attachtarget("skills.animaltaming.response") ! return 1 def response(char, args, target): dotame(char, target.char) ! return 1 def dotame(char, totame): --- 38,46 ---- char.socket.clilocmessage( 502789, "", 0x3b2, 3 ) char.socket.attachtarget("skills.animaltaming.response") ! return True def response(char, args, target): dotame(char, target.char) ! return True def dotame(char, totame): Index: healing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/healing.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** healing.py 26 May 2004 13:07:25 -0000 1.3 --- healing.py 9 Jul 2004 10:30:26 -0000 1.4 *************** *** 43,57 **** char.socket.clilocmessage( 500948, "", 0x3b2, 3 ) char.socket.attachtarget( "skills.healing.response" ) ! return 1 def response( char, args, target ): if not target.char: char.socket.clilocmessage( 500970, "", 0x3b2, 3 ) ! return 1 # will be added : a golem would not healed by bandages # count bandage if not char.countresource( 0x0e21 ): ! return 1 anatomy = char.skill[ ANATOMY ] --- 43,57 ---- char.socket.clilocmessage( 500948, "", 0x3b2, 3 ) char.socket.attachtarget( "skills.healing.response" ) ! return True def response( char, args, target ): if not target.char: char.socket.clilocmessage( 500970, "", 0x3b2, 3 ) ! return True # will be added : a golem would not healed by bandages # count bandage if not char.countresource( 0x0e21 ): ! return True anatomy = char.skill[ ANATOMY ] *************** *** 63,72 **** if char == target.char: #char.socket.clilocmessage() ! return 1 if healing >= RES_HEALING and anatomy >= RES_ANATOMY: res_char( char, target.char, healing, anatomy ) else: char.socket.clilocmessage( 1049656, "", 0x3b2, 3 ) ! return 1 if target.char.poisoned: if healing >= CURE_HEALING and anatomy >= CURE_ANATOMY: --- 63,72 ---- if char == target.char: #char.socket.clilocmessage() ! return True if healing >= RES_HEALING and anatomy >= RES_ANATOMY: res_char( char, target.char, healing, anatomy ) else: char.socket.clilocmessage( 1049656, "", 0x3b2, 3 ) ! return True if target.char.poisoned: if healing >= CURE_HEALING and anatomy >= CURE_ANATOMY: *************** *** 74,78 **** #else: #char.socket.clilocmessage() ! return 1 # calc total heal amount : used formula from UOSS --- 74,78 ---- #else: #char.socket.clilocmessage() ! return True # calc total heal amount : used formula from UOSS Index: alchemy.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/alchemy.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** alchemy.py 26 May 2004 13:07:24 -0000 1.4 --- alchemy.py 9 Jul 2004 10:30:25 -0000 1.5 *************** *** 14,23 **** def checktool(char, item, wearout = 0): if not item: ! return 0 # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(1044263) ! return 0 # We do not allow "invulnerable" tools. --- 14,23 ---- def checktool(char, item, wearout = 0): if not item: ! return False # Has to be in our posession if item.getoutmostchar() != char: char.socket.clilocmessage(1044263) ! return False # We do not allow "invulnerable" tools. *************** *** 25,29 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 if wearout: --- 25,29 ---- char.socket.clilocmessage(1044038) item.delete() ! return False if wearout: *************** *** 32,40 **** char.socket.clilocmessage(1044038) item.delete() ! return 0 else: item.settag('remaining_uses', uses - 1) ! return 1 # --- 32,40 ---- char.socket.clilocmessage(1044038) item.delete() ! return False else: item.settag('remaining_uses', uses - 1) ! return True # *************** *** 43,52 **** def onUse(char, item): if not checktool(char, item): ! return 1 menu = findmenu('ALCHEMY') if menu: menu.send(char, [item.serial]) ! return 1 # --- 43,52 ---- def onUse(char, item): if not checktool(char, item): ! return True menu = findmenu('ALCHEMY') if menu: menu.send(char, [item.serial]) ! return True # *************** *** 63,67 **** # def getexceptionalchance(self, player, arguments): ! return 0 # --- 63,67 ---- # def getexceptionalchance(self, player, arguments): ! return False # *************** *** 98,102 **** if not checktool(player, wolfpack.finditem(arguments[0])): ! return 0 return CraftItemAction.make(self, player, arguments, nodelay) --- 98,102 ---- if not checktool(player, wolfpack.finditem(arguments[0])): ! return False return CraftItemAction.make(self, player, arguments, nodelay) Index: animallore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/animallore.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** animallore.py 30 May 2004 13:22:41 -0000 1.17 --- animallore.py 9 Jul 2004 10:30:26 -0000 1.18 *************** *** 16,20 **** def animallore( char, skill ): if skill != ANIMALLORE: ! return 0 if char.socket.hastag( 'skill_delay' ): --- 16,20 ---- def animallore( char, skill ): if skill != ANIMALLORE: ! return False if char.socket.hastag( 'skill_delay' ): *************** *** 22,26 **** if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return 1 else: char.socket.deltag( 'skill_delay' ) --- 22,26 ---- if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) ! return True else: char.socket.deltag( 'skill_delay' ) *************** *** 29,33 **** char.socket.attachtarget( "skills.animallore.response" ) ! return 1 def response( char, args, target ): --- 29,33 ---- char.socket.attachtarget( "skills.animallore.response" ) ! return True def response( char, args, target ): *************** *** 42,46 **** if not char.canreach( target.char, 13 ): return # no msg sent when you fail los check on OSI, wonder why... ! if target.char.mintaming >= 1100 and not target.char.tamed: if char.skill[ ANIMALLORE ] == 1000: --- 42,46 ---- if not char.canreach( target.char, 13 ): return # no msg sent when you fail los check on OSI, wonder why... ! if target.char.mintaming >= 1100 and not target.char.tamed: if char.skill[ ANIMALLORE ] == 1000: |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:30:35
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32003 Modified Files: archery_butte.py check.py commands.py potionkeg.py Log Message: *shrug* kinda pointless, but I was looking through scripts to see what I've forgotten to do anyways... I should finish the potionkeg script... assuming it will let me. Index: commands.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** commands.py 19 Feb 2003 21:14:47 -0000 1.4 --- commands.py 9 Jul 2004 10:30:25 -0000 1.5 *************** *** 13,17 **** testpacket( socket, command, argstring ) ! return 1 def testpacket( socket, command, argstring ): --- 13,17 ---- testpacket( socket, command, argstring ) ! return True def testpacket( socket, command, argstring ): Index: check.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/check.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** check.py 26 May 2004 13:07:19 -0000 1.6 --- check.py 9 Jul 2004 10:30:25 -0000 1.7 *************** *** 22,26 **** tooltip.add( 1060738, str( target.gettag( "value") ) ) tooltip.send ( sender ) ! return 1 def onUse( char, item ): --- 22,26 ---- tooltip.add( 1060738, str( target.gettag( "value") ) ) tooltip.send ( sender ) ! return True def onUse( char, item ): *************** *** 40,42 **** char.socket.sendcontainer( bankbox ) item.delete() ! return 1 --- 40,42 ---- char.socket.sendcontainer( bankbox ) item.delete() ! return True Index: archery_butte.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/archery_butte.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** archery_butte.py 26 May 2004 13:07:19 -0000 1.8 --- archery_butte.py 9 Jul 2004 10:30:25 -0000 1.9 *************** *** 35,39 **** if( not boltCount and not arrowCount ): char.message( "The butte is empty." ) ! return 1 if( arrowCount ): --- 35,39 ---- if( not boltCount and not arrowCount ): char.message( "The butte is empty." ) ! return True if( arrowCount ): *************** *** 80,89 **** if( char.distanceto( item ) > 10 or char.distanceto( item ) < 5 ): char.message( "You are either too near or far to shoot." ) ! return 1 # Sanity checks for the line-of-fire if( ( item.id == 0x100b and ( char.pos.x != item.pos.x or char.pos.y <= item.pos.y ) ) or ( item.id == 0x100a and ( char.pos.y != item.pos.y or char.pos.x <= item.pos.x ) ) ): char.message( "You can't shoot from here." ) ! return 1 # TODO: Check line of sight --- 80,89 ---- if( char.distanceto( item ) > 10 or char.distanceto( item ) < 5 ): char.message( "You are either too near or far to shoot." ) ! return True # Sanity checks for the line-of-fire if( ( item.id == 0x100b and ( char.pos.x != item.pos.x or char.pos.y <= item.pos.y ) ) or ( item.id == 0x100a and ( char.pos.y != item.pos.y or char.pos.x <= item.pos.x ) ) ): char.message( "You can't shoot from here." ) ! return True # TODO: Check line of sight *************** *** 102,116 **** if( ( weaponskill(char, char.getweapon()) != ARCHERY ) or ( ammo == -1 ) ): char.message( "You only can use crossbows and bows on this butte." ) ! return 1 # If we've already learned all we can > cancel. if( char.skill[ ARCHERY ] >= 300 ): char.message( "You can learn much from a dummy but you have already learned it all." ) ! return 1 # Use ammo (if 0 was used = no ammo) if( not char.useresource( 1, ammo ) ): char.message( "You are out of ammunition." ) ! return 1 # Display the char-action --- 102,116 ---- if( ( weaponskill(char, char.getweapon()) != ARCHERY ) or ( ammo == -1 ) ): char.message( "You only can use crossbows and bows on this butte." ) ! return True # If we've already learned all we can > cancel. if( char.skill[ ARCHERY ] >= 300 ): char.message( "You can learn much from a dummy but you have already learned it all." ) ! return True # Use ammo (if 0 was used = no ammo) if( not char.useresource( 1, ammo ) ): char.message( "You are out of ammunition." ) ! return True # Display the char-action *************** *** 147,151 **** item.settag( "bolt_count", item.gettag( "bolt_count" ) + 1 ) ! return 1 def ammoType( char ): --- 147,151 ---- item.settag( "bolt_count", item.gettag( "bolt_count" ) + 1 ) ! return True def ammoType( char ): Index: potionkeg.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potionkeg.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** potionkeg.py 18 May 2004 08:28:12 -0000 1.6 --- potionkeg.py 9 Jul 2004 10:30:25 -0000 1.7 *************** *** 19,23 **** def onDropOnItem(potionkeg, potion): if ('potionkeg' not in potionkeg.events) or ('potions' not in potion.events): ! return 0 char = potion.container --- 19,23 ---- def onDropOnItem(potionkeg, potion): if ('potionkeg' not in potionkeg.events) or ('potions' not in potion.events): ! return False char = potion.container *************** *** 26,30 **** if not potion.hastag('potiontype') or not potionkeg.hastag('kegfill'): socket.sysmessage("Only potions may be added to a potion keg!") ! return 0 char.say("Test") --- 26,30 ---- if not potion.hastag('potiontype') or not potionkeg.hastag('kegfill'): socket.sysmessage("Only potions may be added to a potion keg!") ! return False char.say("Test") *************** *** 41,53 **** potionkeg.settag('kegfill', kegfill) potion.delete() ! return 1 else: # The keg will not hold any more! socket.clilocmessage(502233) ! return 1 else: # You decide that it would be a bad idea to mix different types of potions. socket.clilocmessage(502236) ! return 1 else: potionkeg.settag( 'potiontype', potion.gettag('potiontype') ) --- 41,53 ---- potionkeg.settag('kegfill', kegfill) potion.delete() ! return True else: # The keg will not hold any more! socket.clilocmessage(502233) ! return True else: # You decide that it would be a bad idea to mix different types of potions. socket.clilocmessage(502236) ! return True else: potionkeg.settag( 'potiontype', potion.gettag('potiontype') ) *************** *** 55,63 **** potionkeg.name = potions[ potion.gettag('potiontype') ][ KEG_NAME ] consumePotion( char, potion, 1 ) ! return 1 else: ! return 0 """ ! return 1 ### End Filling ### --- 55,63 ---- potionkeg.name = potions[ potion.gettag('potiontype') ][ KEG_NAME ] consumePotion( char, potion, 1 ) ! return True else: ! return False """ ! return True ### End Filling ### *************** *** 95,103 **** potionkeg.deltag('potiontype') ! return 1 def checkkegstatus(char, potionkeg, potiontype): if potionkeg.name != potions[ potiontype ][ KEG_NAME ]: potionkeg.name = potions[ potiontype ][ KEG_NAME ] ! return 1 --- 95,103 ---- potionkeg.deltag('potiontype') ! return True def checkkegstatus(char, potionkeg, potiontype): if potionkeg.name != potions[ potiontype ][ KEG_NAME ]: potionkeg.name = potions[ potiontype ][ KEG_NAME ] ! return True |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:17:06
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30416/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ChangeLog.wolfpack 9 Jul 2004 08:39:42 -0000 1.11 --- ChangeLog.wolfpack 9 Jul 2004 10:16:55 -0000 1.12 *************** *** 12,15 **** --- 12,20 ---- - Removed command: resurrect - Removed command: password + - Removed command: tele + - Removed command: invis + - Removed command: kill + - Removed command: fix + - Removed command: resend * Definition Changes: - Fixed Sheep definitions *************** *** 25,28 **** --- 30,38 ---- - New command: resurrect - New command: password + - New command: tele + - New command: invis + - New command: kill + - New command: fix + - New command: resend - Fixed carving - Fixed sheering of sheeps and wool regrowing |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:14:58
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29951/commands Modified Files: fix.py Log Message: Resend works the same as fix. Index: fix.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/fix.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fix.py 9 Jul 2004 10:06:54 -0000 1.1 --- fix.py 9 Jul 2004 10:14:30 -0000 1.2 *************** *** 7,13 **** """ \command fix ! \description Resend the player information. """ - import wolfpack --- 7,16 ---- """ \command fix ! \description Resend the player and the surrounding objects. ! """ ! """ ! \command resend ! \description Resend the player and the surrounding objects. """ import wolfpack *************** *** 15,18 **** --- 18,22 ---- def onLoad(): wolfpack.registercommand( 'fix', commandFix ) + wolfpack.registercommand( 'resend' commandFix ) return |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:14:12
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29773 Modified Files: commands.cpp Log Message: Resend moved as well... almost missed it... and with this, I'm done removing simple commands from the core. :D Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.247 retrieving revision 1.248 diff -C2 -d -r1.247 -r1.248 *** commands.cpp 9 Jul 2004 10:10:28 -0000 1.247 --- commands.cpp 9 Jul 2004 10:14:02 -0000 1.248 *************** *** 252,266 **** /* - \command resend - \description Resend the player and the surrounding objects. - */ - void commandResend( cUOSocket* socket, const QString& command, const QStringList& args ) throw() - { - Q_UNUSED( args ); - Q_UNUSED( command ); - socket->resendPlayer( false ); - } - - /* \command remove \description Delete an item or character. --- 252,255 ---- *************** *** 1032,1036 **** { "RELOAD", commandReload }, { "REMOVE", commandRemove }, - { "RESEND", commandResend }, { "RESTOCK", commandRestock }, { "SAVE", commandSave }, --- 1021,1024 ---- |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:10:41
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29358 Modified Files: commands.cpp Log Message: Fix moved to Python. Index: commands.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v retrieving revision 1.246 retrieving revision 1.247 diff -C2 -d -r1.246 -r1.247 *** commands.cpp 9 Jul 2004 09:58:56 -0000 1.246 --- commands.cpp 9 Jul 2004 10:10:28 -0000 1.247 *************** *** 195,211 **** /* - \command fix - \description Resend the player information. - */ - void commandFix( cUOSocket* socket, const QString& command, const QStringList& args ) throw() - { - Q_UNUSED( args ); - Q_UNUSED( command ); - // TODO: Eventually check if the character is stuck etc. - socket->resendPlayer(); - socket->player()->resendTooltip(); - } - - /* \command set \description Change properties of characters and items. --- 195,198 ---- *************** *** 1039,1043 **** { "BROADCAST", commandBroadcast }, { "DOORGEN", commandDoorGenerator }, - { "FIX", commandFix }, { "GMTALK", commandGmtalk }, { "MOVE", commandMove }, --- 1026,1029 ---- |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:07:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28798/wolfpack Modified Files: utilities.py Log Message: commands.fix Added a new utility function Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** utilities.py 27 Jun 2004 11:48:29 -0000 1.59 --- utilities.py 9 Jul 2004 10:06:54 -0000 1.60 *************** *** 18,21 **** --- 18,22 ---- from wolfpack.consts import * import random + import string from types import * *************** *** 111,114 **** --- 112,133 ---- """ + \function wolfpack.utilities.booleantoggle + \param boolean + \return Boolean + \description Takes a boolean property and toggles it. + """ + + def booleantoggle( boolean ): + if boolean == 1: + boolean = 0 + elif boolean == 0: + boolean = 1 + elif boolean.lower() == "true": + boolean = "false" + elif boolean.lower() == "false": + boolean = "true" + return boolean + + """ \function wolfpack.utilities.tocontainer \param item The item you want to move to the given container. *************** *** 448,452 **** \param baseid The baseid of the resource you are looking for. \param amount The amount that is required of the given resource. ! \return 0 if all the required resources have been found. Otherwise the remaining amount of the resource that has not been found. \description Recursively searches for items with a given baseid in a container and checks if a --- 467,471 ---- \param baseid The baseid of the resource you are looking for. \param amount The amount that is required of the given resource. ! \return 0 if all the required resources have been found. Otherwise the remaining amount of the resource that has not been found. \description Recursively searches for items with a given baseid in a container and checks if a *************** *** 502,510 **** \param source The source of the damage. May be None. \param amount The amount of damage dealt. ! \param physical Defaults to 0. The physical fraction of the damage. This is an integer value ranging from 0 to 100. ! \param fire Defaults to 0. The fire fraction of the damage. This is an integer value ranging from 0 to 100. ! \param cold Defaults to 0. The cold fraction of the damage. This is an integer value ranging from 0 to 100. \param poison Defaults to 0. --- 521,529 ---- \param source The source of the damage. May be None. \param amount The amount of damage dealt. ! \param physical Defaults to 0. The physical fraction of the damage. This is an integer value ranging from 0 to 100. ! \param fire Defaults to 0. The fire fraction of the damage. This is an integer value ranging from 0 to 100. ! \param cold Defaults to 0. The cold fraction of the damage. This is an integer value ranging from 0 to 100. \param poison Defaults to 0. *************** *** 512,516 **** \param energy Defaults to 0. The energy fraction of the damage. This is an integer value ranging from 0 to 100. ! \param noreflect Defaults to 0. If this parameter is 1, no physical damage will be reflected back to the source. \param damagetype Defaults to DAMAGE_MAGICAL. This is the damagetype passed on to the internal damage function. --- 531,535 ---- \param energy Defaults to 0. The energy fraction of the damage. This is an integer value ranging from 0 to 100. ! \param noreflect Defaults to 0. If this parameter is 1, no physical damage will be reflected back to the source. \param damagetype Defaults to DAMAGE_MAGICAL. This is the damagetype passed on to the internal damage function. |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:07:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts/npc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28798/npc Modified Files: healer.py Log Message: commands.fix Added a new utility function Index: healer.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/npc/healer.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** healer.py 2 Jul 2004 13:40:46 -0000 1.5 --- healer.py 9 Jul 2004 10:06:54 -0000 1.6 *************** *** 6,14 **** ################################################################# - from wolfpack.consts import * import wolfpack ! def onContextEntry( char, healer, tag ): ! if( tag == 1 ): if not char or not healer: return False --- 6,15 ---- ################################################################# import wolfpack + from wolfpack.consts import * ! def onContextEntry( char, healer, tag ): ! if( int( tag ) == 1 ): ! healer.say("Hold still!") if not char or not healer: return False *************** *** 28,29 **** --- 29,33 ---- return True + else: + char.say("A HEALER! RESURRECT ME!") + return True |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:07:12
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28798/commands Added Files: fix.py Log Message: commands.fix Added a new utility function --- NEW FILE: fix.py --- #===============================================================# # ) (\_ | WOLFPACK 13.0.0 Scripts # (( _/{ "-; | Created by: Dreoth # )).-' {{ ;'` | Revised by: # ( ( ;._ \\ ctr | Last Modification: Created #===============================================================# """ \command fix \description Resend the player information. """ import wolfpack # Loads the command def onLoad(): wolfpack.registercommand( 'fix', commandFix ) return def commandFix( socket, cmd, args ): socket.sysmessage( "Resending the world, please wait." ) socket.player.update() socket.player.resendtooltip() socket.sysmessage( "Resend complete." ) return True |
|
From: Richard M. <dr...@us...> - 2004-07-09 10:06:19
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28682 Modified Files: scripts.xml Log Message: command.fix Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** scripts.xml 9 Jul 2004 09:56:25 -0000 1.141 --- scripts.xml 9 Jul 2004 10:06:06 -0000 1.142 *************** *** 92,95 **** --- 92,96 ---- <script>commands.events</script> <script>commands.export</script> + <script>commands.fix</script> <script>commands.freeze</script> <script>commands.go</script> |
