wpdev-commits Mailing List for Wolfpack Emu (Page 187)
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
|
|
From: <ri...@us...> - 2003-09-27 12:30:44
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions In directory sc8-pr-cvs1:/tmp/cvs-serv29631/definitions/spawnregions Modified Files: britain_fel.xml britain_tram.xml Log Message: added some regions. guards can walk now :) Index: britain_fel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_fel.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** britain_fel.xml 27 Sep 2003 02:17:00 -0000 1.6 --- britain_fel.xml 27 Sep 2003 12:30:29 -0000 1.7 *************** *** 74,77 **** --- 74,88 ---- <rectangle x1="1422" x2="1426" y1="1547" y2="1550" map="0" /> </spawnregion> + <spawnregion id="fel_weaponsmith2"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>weaponsmith_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1576" x2="1580" y1="1561" y2="1566" map="0" /> + </spawnregion> <spawnregion id="fel_bard1"> <maxnpcamount>1</maxnpcamount> *************** *** 195,198 **** --- 206,275 ---- <rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="0" /> </spawnregion> + <spawnregion id="fel_guard4"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>female_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1422" x2="1442" y1="1695" y2="1698" map="0" /> + </spawnregion> + <spawnregion id="fel_guard5"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>male_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1504" x2="1515" y1="1673" y2="1677" map="0" /> + </spawnregion> + <spawnregion id="fel_guard6"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>female_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1580" x2="1487" y1="1623" y2="1636" map="0" /> + </spawnregion> + <spawnregion id="fel_guard7"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>male_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1484" x2="1501" y1="1573" y2="1578" map="0" /> + </spawnregion> + <spawnregion id="fel_guard8"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>female_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1472" x2="1490" y1="1525" y2="1535" map="0" /> + </spawnregion> + <spawnregion id="fel_guard9"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>male_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1422" x2="1432" y1="1561" y2="1572" map="0" /> + </spawnregion> <spawnregion id="fel_healer1"> <maxnpcamount>1</maxnpcamount> *************** *** 502,505 **** --- 579,593 ---- <npcspercycle>1</npcspercycle> <rectangle x1="1472" x2="1478" y1="1737" y2="1749" map="0" /> + </spawnregion> + <spawnregion id="fel_innkeeper1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>innkeeper_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1593" x2="1596" y1="1585" y2="1586" map="0" /> </spawnregion> </definitions> Index: britain_tram.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_tram.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** britain_tram.xml 27 Sep 2003 02:17:00 -0000 1.4 --- britain_tram.xml 27 Sep 2003 12:30:29 -0000 1.5 *************** *** 74,77 **** --- 74,88 ---- <rectangle x1="1422" x2="1426" y1="1547" y2="1550" map="1" /> </spawnregion> + <spawnregion id="tram_weaponsmith2"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>weaponsmith_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1576" x2="1580" y1="1561" y2="1566" map="1" /> + </spawnregion> <spawnregion id="tram_bard1"> <maxnpcamount>1</maxnpcamount> *************** *** 195,198 **** --- 206,275 ---- <rectangle x1="1616" x2="1622" y1="1762" y2="1766" map="1" /> </spawnregion> + <spawnregion id="tram_guard4"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>female_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1422" x2="1442" y1="1695" y2="1698" map="1" /> + </spawnregion> + <spawnregion id="tram_guard5"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>male_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1504" x2="1515" y1="1673" y2="1677" map="1" /> + </spawnregion> + <spawnregion id="tram_guard6"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>female_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1580" x2="1487" y1="1623" y2="1636" map="1" /> + </spawnregion> + <spawnregion id="tram_guard7"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>male_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1484" x2="1501" y1="1573" y2="1578" map="1" /> + </spawnregion> + <spawnregion id="tram_guard8"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>female_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1472" x2="1490" y1="1525" y2="1535" map="1" /> + </spawnregion> + <spawnregion id="tram_guard9"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>male_guard</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1422" x2="1432" y1="1561" y2="1572" map="1" /> + </spawnregion> <spawnregion id="tram_healer1"> <maxnpcamount>1</maxnpcamount> *************** *** 502,505 **** --- 579,593 ---- <npcspercycle>1</npcspercycle> <rectangle x1="1472" x2="1478" y1="1737" y2="1749" map="1" /> + </spawnregion> + <spawnregion id="tram_innkeeper1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>innkeeper_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1593" x2="1596" y1="1585" y2="1586" map="1" /> </spawnregion> </definitions> |
|
From: <ri...@us...> - 2003-09-27 02:17:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions In directory sc8-pr-cvs1:/tmp/cvs-serv31261/definitions/spawnregions Modified Files: britain_fel.xml britain_tram.xml Log Message: Added a few npcs to the spawnregions Index: britain_fel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_fel.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** britain_fel.xml 21 Sep 2003 17:03:40 -0000 1.5 --- britain_fel.xml 27 Sep 2003 02:17:00 -0000 1.6 *************** *** 288,292 **** <maxtime>1</maxtime> <npcs> ! <npc>carpenter</npc> </npcs> --- 288,292 ---- <maxtime>1</maxtime> <npcs> ! <npc>carpenter_male</npc> </npcs> *************** *** 299,303 **** <maxtime>1</maxtime> <npcs> ! <npc>architect</npc> </npcs> --- 299,303 ---- <maxtime>1</maxtime> <npcs> ! <npc>architect_female</npc> </npcs> *************** *** 354,358 **** <maxtime>1</maxtime> <npcs> ! <npc>tinker</npc> </npcs> --- 354,358 ---- <maxtime>1</maxtime> <npcs> ! <npc>tinker_male</npc> </npcs> *************** *** 365,369 **** <maxtime>1</maxtime> <npcs> ! <npc>butcher</npc> </npcs> --- 365,369 ---- <maxtime>1</maxtime> <npcs> ! <npc>butcher_male</npc> </npcs> *************** *** 464,472 **** <maxtime>1</maxtime> <npcs> ! <npc>cook</npc> </npcs> <npcspercycle>1</npcspercycle> <rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="0" /> </spawnregion> </definitions> --- 464,505 ---- <maxtime>1</maxtime> <npcs> ! <npc>cook_male</npc> </npcs> <npcspercycle>1</npcspercycle> <rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="0" /> + </spawnregion> + <spawnregion id="fel_cook2"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>cook_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1487" x2="1491" y1="1687" y2="1690" map="0" /> + </spawnregion> + <spawnregion id="fel_shipwright1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>shipwright_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1413" x2="1419" y1="1746" y2="1755" map="0" /> + </spawnregion> + <spawnregion id="fel_shipwright2"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>shipwright_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1472" x2="1478" y1="1737" y2="1749" map="0" /> </spawnregion> </definitions> Index: britain_tram.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/britain_tram.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** britain_tram.xml 21 Sep 2003 17:03:40 -0000 1.3 --- britain_tram.xml 27 Sep 2003 02:17:00 -0000 1.4 *************** *** 288,292 **** <maxtime>1</maxtime> <npcs> ! <npc>carpenter</npc> </npcs> --- 288,292 ---- <maxtime>1</maxtime> <npcs> ! <npc>carpenter_male</npc> </npcs> *************** *** 299,303 **** <maxtime>1</maxtime> <npcs> ! <npc>architect</npc> </npcs> --- 299,303 ---- <maxtime>1</maxtime> <npcs> ! <npc>architect_female</npc> </npcs> *************** *** 354,358 **** <maxtime>1</maxtime> <npcs> ! <npc>tinker</npc> </npcs> --- 354,358 ---- <maxtime>1</maxtime> <npcs> ! <npc>tinker_male</npc> </npcs> *************** *** 365,369 **** <maxtime>1</maxtime> <npcs> ! <npc>butcher</npc> </npcs> --- 365,369 ---- <maxtime>1</maxtime> <npcs> ! <npc>butcher_male</npc> </npcs> *************** *** 464,472 **** <maxtime>1</maxtime> <npcs> ! <npc>cook</npc> </npcs> <npcspercycle>1</npcspercycle> <rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="1" /> </spawnregion> </definitions> --- 464,505 ---- <maxtime>1</maxtime> <npcs> ! <npc>cook_male</npc> </npcs> <npcspercycle>1</npcspercycle> <rectangle x1="1610" x2="1612" y1="1584" y2="1586" map="1" /> + </spawnregion> + <spawnregion id="tram_cook2"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>cook_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1487" x2="1491" y1="1687" y2="1690" map="1" /> + </spawnregion> + <spawnregion id="tram_shipwright1"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>shipwright_male</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1413" x2="1419" y1="1746" y2="1755" map="1" /> + </spawnregion> + <spawnregion id="tram_shipwright2"> + <maxnpcamount>1</maxnpcamount> + <mintime>0</mintime> + <maxtime>1</maxtime> + <npcs> + <npc>shipwright_female</npc> + </npcs> + + <npcspercycle>1</npcspercycle> + <rectangle x1="1472" x2="1478" y1="1737" y2="1749" map="1" /> </spawnregion> </definitions> |
|
From: <ri...@us...> - 2003-09-27 02:17:37
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1:/tmp/cvs-serv31261/definitions/npcs/humans Modified Files: vendors.xml Log Message: Added a few npcs to the spawnregions Index: vendors.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** vendors.xml 21 Sep 2003 17:03:40 -0000 1.22 --- vendors.xml 27 Sep 2003 02:17:00 -0000 1.23 *************** *** 71,76 **** <inherit>base_female</inherit> <title>the Tanner</title> ! <ai>Human_Vendor</ai> ! <shopkeeper> <restockable> <item inherit="1711"> --- 71,76 ---- <inherit>base_female</inherit> <title>the Tanner</title> ! <ai>Human_Vendor</ai> ! <shopkeeper> <restockable> <item inherit="1711"> *************** *** 92,96 **** <inherit>base_male</inherit> <title>the Blacksmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 92,96 ---- <inherit>base_male</inherit> <title>the Blacksmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 228,232 **** <inherit>base_female</inherit> <title>the Blacksmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 228,232 ---- <inherit>base_female</inherit> <title>the Blacksmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 365,369 **** <inherit>base_male</inherit> <title>the Baker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 365,369 ---- <inherit>base_male</inherit> <title>the Baker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 425,429 **** <inherit>base_female</inherit> <title>the Baker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 425,429 ---- <inherit>base_female</inherit> <title>the Baker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 486,490 **** <inherit>base_male</inherit> <title>the Healer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 486,490 ---- <inherit>base_male</inherit> <title>the Healer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 526,530 **** <inherit>base_female</inherit> <title>the Healer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 526,530 ---- <inherit>base_female</inherit> <title>the Healer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 567,571 **** <inherit>base_male</inherit> <title>the Armorer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 567,571 ---- <inherit>base_male</inherit> <title>the Armorer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 667,671 **** <inherit>base_female</inherit> <title>the Armorer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 667,671 ---- <inherit>base_female</inherit> <title>the Armorer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 768,772 **** <inherit>base_male</inherit> <title>the Provisioner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 768,772 ---- <inherit>base_male</inherit> <title>the Provisioner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 777,781 **** <inherit>base_female</inherit> <title>the Provisioner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 777,781 ---- <inherit>base_female</inherit> <title>the Provisioner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 787,791 **** <inherit>base_male</inherit> <title>the Jeweler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 787,791 ---- <inherit>base_male</inherit> <title>the Jeweler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 959,963 **** <inherit>base_female</inherit> <title>the Jeweler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 959,963 ---- <inherit>base_female</inherit> <title>the Jeweler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1132,1136 **** <inherit>base_male</inherit> <title>the Tailor</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 1132,1136 ---- <inherit>base_male</inherit> <title>the Tailor</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1157,1161 **** <inherit>base_female</inherit> <title>the Tailor</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 1157,1161 ---- <inherit>base_female</inherit> <title>the Tailor</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1180,1187 **** </npc> <!-- A weaver vendor --> ! <npc id="weaver"> <inherit>base_male</inherit> <title>the Weaver</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 1180,1187 ---- </npc> <!-- A weaver vendor --> ! <npc id="weaver_male"> <inherit>base_male</inherit> <title>the Weaver</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 1189,1197 **** <category>Vendors\Weaver (Male)</category> </npc> <!-- A cook vendor --> ! <npc id="cook"> <inherit>base_male</inherit> <title>the Cook</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 1189,1206 ---- <category>Vendors\Weaver (Male)</category> </npc> + <npc id="weaver_female"> + <inherit>base_female</inherit> + <title>the Weaver</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable/> + </shopkeeper> + <category>Vendors\Weaver (Female)</category> + </npc> <!-- A cook vendor --> ! <npc id="cook_male"> <inherit>base_male</inherit> <title>the Cook</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 1199,1207 **** <category>Vendors\Cook (Male)</category> </npc> <!-- A butcher vendor --> ! <npc id="butcher"> <inherit>base_male</inherit> <title>the butcher</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 1208,1225 ---- <category>Vendors\Cook (Male)</category> </npc> + <npc id="cook_female"> + <inherit>base_female</inherit> + <title>the Cook</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable/> + </shopkeeper> + <category>Vendors\Cook (Female)</category> + </npc> <!-- A butcher vendor --> ! <npc id="butcher_male"> <inherit>base_male</inherit> <title>the butcher</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 1209,1217 **** <category>Vendors\Butcher (Male)</category> </npc> <!-- A architect vendor --> ! <npc id="architect"> <inherit>base_male</inherit> <title>the Architect</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 1227,1244 ---- <category>Vendors\Butcher (Male)</category> </npc> + <npc id="butcher_female"> + <inherit>base_female</inherit> + <title>the butcher</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable/> + </shopkeeper> + <category>Vendors\Butcher (Female)</category> + </npc> <!-- A architect vendor --> ! <npc id="architect_male"> <inherit>base_male</inherit> <title>the Architect</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 1219,1227 **** <category>Vendors\Architect (Male)</category> </npc> <!-- A carpenter vendor --> ! <npc id="carpenter"> <inherit>base_male</inherit> <title>the Carpenter</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 1246,1263 ---- <category>Vendors\Architect (Male)</category> </npc> + <npc id="architect_female"> + <inherit>base_female</inherit> + <title>the Architect</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable/> + </shopkeeper> + <category>Vendors\Architect (Female)</category> + </npc> <!-- A carpenter vendor --> ! <npc id="carpenter_male"> <inherit>base_male</inherit> <title>the Carpenter</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 1229,1237 **** <category>Vendors\Carpenter (Male)</category> </npc> <!-- A tinker vendor --> ! <npc id="tinker"> <inherit>base_male</inherit> <title>the Tinker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> --- 1265,1282 ---- <category>Vendors\Carpenter (Male)</category> </npc> + <npc id="carpenter_female"> + <inherit>base_female</inherit> + <title>the Carpenter</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable/> + </shopkeeper> + <category>Vendors\Carpenter (Female)</category> + </npc> <!-- A tinker vendor --> ! <npc id="tinker_male"> <inherit>base_male</inherit> <title>the Tinker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable/> *************** *** 1239,1247 **** <category>Vendors\Tinker (Male)</category> </npc> <!-- A mage vendor --> <npc id="mage_male"> <inherit>base_male</inherit> <title>the Mage</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 1284,1302 ---- <category>Vendors\Tinker (Male)</category> </npc> + <!-- A tinker vendor --> + <npc id="tinker_female"> + <inherit>base_female</inherit> + <title>the Tinker</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable/> + </shopkeeper> + <category>Vendors\Tinker (Female)</category> + </npc> <!-- A mage vendor --> <npc id="mage_male"> <inherit>base_male</inherit> <title>the Mage</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1359,1363 **** <inherit>base_female</inherit> <title>the Mage</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 1414,1418 ---- <inherit>base_female</inherit> <title>the Mage</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1476,1480 **** <inherit>base_male</inherit> <title>the Alchemist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 1531,1535 ---- <inherit>base_male</inherit> <title>the Alchemist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1720,1724 **** <inherit>base_female</inherit> <title>the Alchemist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 1775,1779 ---- <inherit>base_female</inherit> <title>the Alchemist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 1965,1969 **** <inherit>base_male</inherit> <title>the Herbalist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2020,2024 ---- <inherit>base_male</inherit> <title>the Herbalist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2009,2013 **** <inherit>base_female</inherit> <title>the Herbalist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2064,2068 ---- <inherit>base_female</inherit> <title>the Herbalist</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2109,2113 **** <inherit>base_male</inherit> <title>the Weaponsmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2164,2168 ---- <inherit>base_male</inherit> <title>the Weaponsmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2121,2125 **** <inherit>base_female</inherit> <title>the Weaponsmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2176,2180 ---- <inherit>base_female</inherit> <title>the Weaponsmith</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2134,2138 **** <inherit>base_male</inherit> <title>the Bard</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2189,2193 ---- <inherit>base_male</inherit> <title>the Bard</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2146,2150 **** <inherit>base_female</inherit> <title>the Bard</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2201,2205 ---- <inherit>base_female</inherit> <title>the Bard</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2172,2176 **** <inherit>base_male</inherit> <title>the Bowyer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2227,2231 ---- <inherit>base_male</inherit> <title>the Bowyer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2184,2188 **** <inherit>base_female</inherit> <title>the Bowyer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2239,2243 ---- <inherit>base_female</inherit> <title>the Bowyer</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2197,2201 **** <inherit>base_male</inherit> <title>the Leatherworker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2252,2256 ---- <inherit>base_male</inherit> <title>the Leatherworker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2209,2213 **** <inherit>base_female</inherit> <title>the Leatherworker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2264,2268 ---- <inherit>base_female</inherit> <title>the Leatherworker</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2235,2239 **** <inherit>base_male</inherit> <title>the Cobbler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2290,2294 ---- <inherit>base_male</inherit> <title>the Cobbler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2247,2251 **** <inherit>base_female</inherit> <title>the Cobbler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2302,2306 ---- <inherit>base_female</inherit> <title>the Cobbler</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2260,2264 **** <inherit>base_male</inherit> <title>the Fisherman</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2315,2319 ---- <inherit>base_male</inherit> <title>the Fisherman</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2273,2277 **** <inherit>base_female</inherit> <title>the Fisherlady</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2328,2332 ---- <inherit>base_female</inherit> <title>the Fisherlady</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2286,2290 **** <inherit>base_male</inherit> <title>the Spinner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2341,2345 ---- <inherit>base_male</inherit> <title>the Spinner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2298,2302 **** <inherit>base_female</inherit> <title>the Spinner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 2353,2357 ---- <inherit>base_female</inherit> <title>the Spinner</title> ! <ai>Human_Vendor</ai> <shopkeeper> <restockable> *************** *** 2306,2309 **** --- 2361,2389 ---- </shopkeeper> <category>Vendors\Spinner (Female)</category> + </npc> + <!-- A shipwright vendor --> + <npc id="shipwright_male"> + <inherit>base_male</inherit> + <title>the Shipwright</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Shipwright (Male)</category> + </npc> + <npc id="shipwright_female"> + <inherit>base_female</inherit> + <title>the Shipwright</title> + <ai>Human_Vendor</ai> + <shopkeeper> + <restockable> + </restockable> + <sellable> + </sellable> + </shopkeeper> + <category>Vendors\Shipwright (Female)</category> </npc> </definitions> |
|
From: <co...@us...> - 2003-09-26 13:00:38
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv6151
Modified Files:
wolfpack.pro
Log Message:
no message
Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** wolfpack.pro 26 Sep 2003 01:03:52 -0000 1.165
--- wolfpack.pro 26 Sep 2003 13:00:34 -0000 1.166
***************
*** 10,14 ****
TEMPLATE += app
CONFIG += qt console thread exceptions rtti
! INCLUDEPATH += lib/Python/include
OPTIONS += mysql
--- 10,14 ----
TEMPLATE += app
CONFIG += qt console thread exceptions rtti
! #INCLUDEPATH += lib/Python/include
OPTIONS += mysql
***************
*** 17,22 ****
# Common unix settings
# Lets try to figure some paths
! # MySQL includes first
contains( OPTIONS, mysql ) {
message("MySQL support specified, trying to locate required files")
--- 17,27 ----
# Common unix settings
# Lets try to figure some paths
+ message("HINT: ./configure script can simplify compilation")
! # MySQL includes first. Run configure script to initialize it.
! !isEmpty($(MYSQLINC))
! {
! INCLUDEPATH += $$(MYSQLINC)
! }
contains( OPTIONS, mysql ) {
message("MySQL support specified, trying to locate required files")
***************
*** 49,52 ****
--- 54,62 ----
LIBS += -lmysqlclient
}
+ }
+ # Python includes. Run configure script to initialize it.
+ !isEmpty($(PYTHONINC))
+ {
+ INCLUDEPATH += $$(PYTHONINC)
}
|
|
From: <co...@us...> - 2003-09-26 13:00:04
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv5911
Added Files:
configure
Log Message:
no message
--- NEW FILE: configure ---
#!/bin/sh
#################################################################
# ) (\_ # Wolfpack 13.0.0 Build Script #
# (( _/{ "-; # Created by: Wolfpack Development Team #
# )).-" {{ ;"` # Revised by: Wolfpack Development Team #
# ( ( ;._ \\ ctr # Last Modification: check cvs logs #
#################################################################
#Searching Include paths
#MYSQL
echo Searching Mysql include...
MYSQLINC=`mysql_config --cflags|awk '{print(substr($1,4,length($1)-4))}'`
#PYTHON
echo Searching Python include searching...
PYTHONINC=`perl -e 'print (substr(((\`find / -name Python.h\`)[0]),0,length()-10))'`
export MYSQLINC PYTHONINC
echo Running qmake...
$QTDIR/bin/qmake -o Makefile wolfpack.pro
echo Run make now!
|
|
From: <dr...@us...> - 2003-09-26 03:24:17
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1:/tmp/cvs-serv2845 Modified Files: wolfpack.sql Log Message: Using prevents errors with mysql :) Index: wolfpack.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wolfpack.sql 23 Sep 2003 15:37:13 -0000 1.27 --- wolfpack.sql 26 Sep 2003 03:22:33 -0000 1.28 *************** *** 1,259 **** ! CREATE TABLE boats ( ! serial int(11) NOT NULL default '0', ! autosail tinyint(1) NOT NULL default '0', ! boatdir tinyint(1) NOT NULL default '0', ! itemserial1 int(11) NOT NULL default '-1', ! itemserial2 int(11) NOT NULL default '-1', ! itemserial3 int(11) NOT NULL default '-1', ! itemserial4 int(11) NOT NULL default '-1', ! multi1 smallint(6) default '0', ! multi2 smallint(6) default '0', ! multi3 smallint(6) default '0', ! multi4 smallint(6) default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE boats_itemids ( ! serial int(11) NOT NULL default '0', ! a tinyint(1) NOT NULL default '0', ! b tinyint(1) NOT NULL default '0', ! id smallint(6) default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE boats_itemoffsets ( ! serial int(11) NOT NULL default '0', ! a tinyint(1) NOT NULL default '0', ! b tinyint(1) NOT NULL default '0', ! c tinyint(1) NOT NULL default '0', ! offset smallint(6) default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE bookpages ( ! serial int(11) NOT NULL default '0', ! page tinyint(3) NOT NULL default '0', ! text varchar(255) NOT NULL default '', ! PRIMARY KEY (serial,page) ); ! CREATE TABLE books ( ! serial int(11) NOT NULL default '0', ! title varchar(255) NOT NULL default '', ! author varchar(255) NOT NULL default '', ! readonly tinyint(1) NOT NULL default '0', ! predefined tinyint(1) NOT NULL default '0', ! section varchar(255) NOT NULL default '', ! pages smallint(5) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE characters ( ! serial int(11) NOT NULL default '0', ! name varchar(255) default NULL, ! title varchar(255) default NULL, ! creationdate varchar(255) default NULL, ! body smallint(5) NOT NULL default '0', ! orgbody smallint(5) NOT NULL default '0', ! skin smallint(5) NOT NULL default '0', ! orgskin smallint(5) NOT NULL default '0', ! saycolor smallint(5) NOT NULL default '0', ! emotecolor smallint(5) NOT NULL default '0', ! strength smallint(6) NOT NULL default '0', ! strengthmod smallint(6) NOT NULL default '0', ! dexterity smallint(6) NOT NULL default '0', ! dexteritymod smallint(6) NOT NULL default '0', ! intelligence smallint(6) NOT NULL default '0', ! intelligencemod smallint(6) NOT NULL default '0', ! maxhitpoints smallint(6) NOT NULL default '0', ! hitpoints smallint(6) NOT NULL default '0', ! maxstamina smallint(6) NOT NULL default '0', ! stamina smallint(6) NOT NULL default '0', ! maxmana smallint(6) default NULL, ! mana smallint(6) default NULL, ! karma int(11) NOT NULL default '0', ! fame int(11) NOT NULL default '0', ! kills int(10) NOT NULL default '0', ! deaths int(10) NOT NULL default '0', ! def int(10) NOT NULL default '0', ! hunger int(11) NOT NULL default '0', ! poison int(11) NOT NULL default '0', ! poisoned int(10) NOT NULL default '0', ! murderertime int(11) NOT NULL default '0', ! criminaltime int(11) NOT NULL default '0', ! nutriment int(10) NOT NULL default '0', ! gender tinyint(1) NOT NULL default '0', ! propertyflags int(11) NOT NULL default '0', ! attacker int(11) NOT NULL default '-1', ! combattarget int(11) NOT NULL default '-1', ! murderer int(11) NOT NULL default '-1', ! guarding int(11) NOT NULL default '-1', ! PRIMARY KEY (serial) ); ! CREATE TABLE corpses ( ! serial int(11) NOT NULL default '0', ! bodyid smallint(6) NOT NULL default '0', ! hairstyle smallint(6) NOT NULL default '0', ! haircolor smallint(6) NOT NULL default '0', ! beardstyle smallint(6) NOT NULL default '0', ! beardcolor smallint(6) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE corpses_equipment ( ! serial int(11) NOT NULL default '0', ! layer tinyint(3) NOT NULL default '0', ! item int(11) NOT NULL default '-1', ! PRIMARY KEY (serial,layer) ); ! CREATE TABLE houses ( ! serial int(11) NOT NULL default '0', ! nokey tinyint(1) NOT NULL default '0', ! charpos_x smallint(6) NOT NULL default '0', ! charpos_y smallint(6) NOT NULL default '0', ! charpos_z smallint(6) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE items ( ! serial int(11) NOT NULL default '0', ! id smallint(5) NOT NULL default '0', ! color smallint(5) NOT NULL default '0', ! cont int(11) NOT NULL default '-1', ! layer tinyint(3) NOT NULL default '0', ! type smallint(5) NOT NULL default '0', ! type2 smallint(5) NOT NULL default '0', ! amount smallint(5) NOT NULL default '0', ! decaytime int(10) NOT NULL default '0', ! def int(10) NOT NULL default '0', ! hidamage smallint(6) NOT NULL default '0', ! lodamage smallint(6) NOT NULL default '0', ! time_unused int(10) NOT NULL default '0', ! weight int(11) NOT NULL default '0', ! hp smallint(6) NOT NULL default '0', ! maxhp smallint(6) NOT NULL default '0', ! speed int(11) NOT NULL default '0', ! poisoned int(10) NOT NULL default '0', ! magic tinyint(3) NOT NULL default '0', ! owner int(11) NOT NULL default '-1', ! visible tinyint(3) NOT NULL default '0', ! spawnregion varchar(255) default NULL, ! priv tinyint(3) NOT NULL default '0', ! sellprice int(11) NOT NULL default '0', ! buyprice int(11) NOT NULL default '0', ! restock smallint(5) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE multis ( ! serial int(11) NOT NULL default '0', ! coowner int(11) NOT NULL default '-1', ! deedsection varchar(255) NOT NULL default '', ! PRIMARY KEY (serial) ); ! CREATE TABLE multis_bans ( ! serial int(11) NOT NULL default '0', ! ban int(11) NOT NULL default '-1', ! PRIMARY KEY (serial,ban) ); ! CREATE TABLE multis_friends ( ! serial int(11) NOT NULL default '0', ! friend int(11) NOT NULL default '-1', ! PRIMARY KEY (serial,friend) ); ! CREATE TABLE npcs ( ! serial int(11) NOT NULL default '0', ! mindamage smallint(6) NOT NULL default '0', ! maxdamage smallint(6) NOT NULL default '0', ! tamingminskill smallint(6) NOT NULL default '0', ! summontime int(11) NOT NULL default '0', ! additionalflags int(11) NOT NULL default '0', ! owner int(11) NOT NULL default '-1', ! carve varchar(255) default NULL, ! spawnregion varchar(255) default NULL, ! stablemaster int(11) NOT NULL default '-1', ! lootlist varchar(255) default NULL, ! ai varchar(255) default NULL, ! wandertype smallint(3) NOT NULL default '0', ! wanderx1 smallint(6) NOT NULL default '0', ! wanderx2 smallint(6) NOT NULL default '0', ! wandery1 smallint(6) NOT NULL default '0', ! wandery2 smallint(6) NOT NULL default '0', ! wanderradius smallint(6) NOT NULL default '0', ! fleeat smallint(3) NOT NULL default '10', ! spellslow int(11) NOT NULL default '0', ! spellshigh int(11) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE players ( ! serial int(11) NOT NULL default '0', ! account varchar(255) default NULL, ! additionalflags int(10) NOT NULL default '0', ! visualrange tinyint(3) NOT NULL default '0', ! profile longtext, ! fixedlight tinyint(3) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE skills ( ! serial int(11) NOT NULL default '0', ! skill tinyint(3) NOT NULL default '0', ! value smallint(6) NOT NULL default '0', ! locktype tinyint(4) default '0', ! cap smallint(6) default '0', ! PRIMARY KEY (serial,skill) ); ! CREATE TABLE tags ( ! serial int(11) NOT NULL default '0', ! name varchar(64) NOT NULL default '', ! type varchar(6) NOT NULL default '', ! value longtext NOT NULL, ! PRIMARY KEY (serial,name) ); ! CREATE TABLE uobject ( ! name varchar(255) default NULL, ! serial int(11) NOT NULL default '0', ! multis int(11) NOT NULL default '-1', ! direction char(1) NOT NULL default '0', ! pos_x smallint(6) NOT NULL default '0', ! pos_y smallint(6) NOT NULL default '0', ! pos_z smallint(6) NOT NULL default '0', ! pos_map tinyint(4) NOT NULL default '0', ! events varchar(255) default NULL, ! bindmenu varchar(255) default NULL, ! havetags tinyint(1) NOT NULL default '0', ! PRIMARY KEY (serial) ); ! CREATE TABLE uobjectmap ( ! serial int(11) NOT NULL default '0', ! type varchar(80) NOT NULL default '', ! PRIMARY KEY (serial) ); ! CREATE TABLE effects ( ! id int(11) NOT NULL default '0', ! objectid varchar(64) NOT NULL default '', ! expiretime int(11) NOT NULL default '0', ! dispellable tinyint(4) NOT NULL default '0', ! source int(11) NOT NULL default '-1', ! destination int(11) NOT NULL default '-1', ! PRIMARY KEY (id) ); ! CREATE TABLE effects_properties ( ! id int(11) NOT NULL default '0', ! key varchar(64) NOT NULL default '', ! type varchar(64) NOT NULL default '', ! value text NOT NULL, ! PRIMARY KEY (id,key) ); --- 1,259 ---- ! CREATE TABLE `boats` ( ! `serial` int(11) NOT NULL default '0', ! `autosail` tinyint(1) NOT NULL default '0', ! `boatdir` tinyint(1) NOT NULL default '0', ! `itemserial1` int(11) NOT NULL default '-1', ! `itemserial2` int(11) NOT NULL default '-1', ! `itemserial3` int(11) NOT NULL default '-1', ! `itemserial4` int(11) NOT NULL default '-1', ! `multi1` smallint(6) default '0', ! `multi2` smallint(6) default '0', ! `multi3` smallint(6) default '0', ! `multi4` smallint(6) default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `boats_itemids` ( ! `serial` int(11) NOT NULL default '0', ! `a` tinyint(1) NOT NULL default '0', ! `b` tinyint(1) NOT NULL default '0', ! `id` smallint(6) default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `boats_itemoffsets` ( ! `serial` int(11) NOT NULL default '0', ! `a` tinyint(1) NOT NULL default '0', ! `b` tinyint(1) NOT NULL default '0', ! `c` tinyint(1) NOT NULL default '0', ! `offset` smallint(6) default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `bookpages` ( ! `serial` int(11) NOT NULL default '0', ! `page` tinyint(3) NOT NULL default '0', ! `text` varchar(255) NOT NULL default '', ! PRIMARY KEY (`serial`,`page`) ); ! CREATE TABLE `books` ( ! `serial` int(11) NOT NULL default '0', ! `title` varchar(255) NOT NULL default '', ! `author` varchar(255) NOT NULL default '', ! `readonly` tinyint(1) NOT NULL default '0', ! `predefined` tinyint(1) NOT NULL default '0', ! `section` varchar(255) NOT NULL default '', ! `pages` smallint(5) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `characters` ( ! `serial` int(11) NOT NULL default '0', ! `name` varchar(255) default NULL, ! `title` varchar(255) default NULL, ! `creationdate` varchar(255) default NULL, ! `body` smallint(5) NOT NULL default '0', ! `orgbody` smallint(5) NOT NULL default '0', ! `skin` smallint(5) NOT NULL default '0', ! `orgskin` smallint(5) NOT NULL default '0', ! `saycolor` smallint(5) NOT NULL default '0', ! `emotecolor` smallint(5) NOT NULL default '0', ! `strength` smallint(6) NOT NULL default '0', ! `strengthmod` smallint(6) NOT NULL default '0', ! `dexterity` smallint(6) NOT NULL default '0', ! `dexteritymod` smallint(6) NOT NULL default '0', ! `intelligence` smallint(6) NOT NULL default '0', ! `intelligencemod` smallint(6) NOT NULL default '0', ! `maxhitpoints` smallint(6) NOT NULL default '0', ! `hitpoints` smallint(6) NOT NULL default '0', ! `maxstamina` smallint(6) NOT NULL default '0', ! `stamina` smallint(6) NOT NULL default '0', ! `maxmana` smallint(6) default NULL, ! `mana` smallint(6) default NULL, ! `karma` int(11) NOT NULL default '0', ! `fame` int(11) NOT NULL default '0', ! `kills` int(10) NOT NULL default '0', ! `deaths` int(10) NOT NULL default '0', ! `def` int(10) NOT NULL default '0', ! `hunger` int(11) NOT NULL default '0', ! `poison` int(11) NOT NULL default '0', ! `poisoned` int(10) NOT NULL default '0', ! `murderertime` int(11) NOT NULL default '0', ! `criminaltime` int(11) NOT NULL default '0', ! `nutriment` int(10) NOT NULL default '0', ! `gender` tinyint(1) NOT NULL default '0', ! `propertyflags` int(11) NOT NULL default '0', ! `attacker` int(11) NOT NULL default '-1', ! `combattarget` int(11) NOT NULL default '-1', ! `murderer` int(11) NOT NULL default '-1', ! `guarding` int(11) NOT NULL default '-1', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `corpses` ( ! `serial` int(11) NOT NULL default '0', ! `bodyid` smallint(6) NOT NULL default '0', ! `hairstyle` smallint(6) NOT NULL default '0', ! `haircolor` smallint(6) NOT NULL default '0', ! `beardstyle` smallint(6) NOT NULL default '0', ! `beardcolor` smallint(6) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `corpses_equipment` ( ! `serial` int(11) NOT NULL default '0', ! `layer` tinyint(3) NOT NULL default '0', ! `item` int(11) NOT NULL default '-1', ! PRIMARY KEY (`serial`,`layer`) ); ! CREATE TABLE `houses` ( ! `serial` int(11) NOT NULL default '0', ! `nokey` tinyint(1) NOT NULL default '0', ! `charpos_x` smallint(6) NOT NULL default '0', ! `charpos_y` smallint(6) NOT NULL default '0', ! `charpos_z` smallint(6) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `items` ( ! `serial` int(11) NOT NULL default '0', ! `id` smallint(5) NOT NULL default '0', ! `color` smallint(5) NOT NULL default '0', ! `cont` int(11) NOT NULL default '-1', ! `layer` tinyint(3) NOT NULL default '0', ! `type` smallint(5) NOT NULL default '0', ! `type2` smallint(5) NOT NULL default '0', ! `amount` smallint(5) NOT NULL default '0', ! `decaytime` int(10) NOT NULL default '0', ! `def` int(10) NOT NULL default '0', ! `hidamage` smallint(6) NOT NULL default '0', ! `lodamage` smallint(6) NOT NULL default '0', ! `time_unused` int(10) NOT NULL default '0', ! `weight` int(11) NOT NULL default '0', ! `hp` smallint(6) NOT NULL default '0', ! `maxhp` smallint(6) NOT NULL default '0', ! `speed` int(11) NOT NULL default '0', ! `poisoned` int(10) NOT NULL default '0', ! `magic` tinyint(3) NOT NULL default '0', ! `owner` int(11) NOT NULL default '-1', ! `visible` tinyint(3) NOT NULL default '0', ! `spawnregion` varchar(255) default NULL, ! `priv` tinyint(3) NOT NULL default '0', ! `sellprice` int(11) NOT NULL default '0', ! `buyprice` int(11) NOT NULL default '0', ! `restock` smallint(5) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `multis` ( ! `serial` int(11) NOT NULL default '0', ! `coowner` int(11) NOT NULL default '-1', ! `deedsection` varchar(255) NOT NULL default '', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `multis_bans` ( ! `serial` int(11) NOT NULL default '0', ! `ban` int(11) NOT NULL default '-1', ! PRIMARY KEY (`serial`,`ban`) ); ! CREATE TABLE `multis_friends` ( ! `serial` int(11) NOT NULL default '0', ! `friend` int(11) NOT NULL default '-1', ! PRIMARY KEY (`serial`,`friend`) ); ! CREATE TABLE `npcs` ( ! `serial` int(11) NOT NULL default '0', ! `mindamage` smallint(6) NOT NULL default '0', ! `maxdamage` smallint(6) NOT NULL default '0', ! `tamingminskill` smallint(6) NOT NULL default '0', ! `summontime` int(11) NOT NULL default '0', ! `additionalflags` int(11) NOT NULL default '0', ! `owner` int(11) NOT NULL default '-1', ! `carve` varchar(255) default NULL, ! `spawnregion` varchar(255) default NULL, ! `stablemaster` int(11) NOT NULL default '-1', ! `lootlist` varchar(255) default NULL, ! `ai` varchar(255) default NULL, ! `wandertype` smallint(3) NOT NULL default '0', ! `wanderx1` smallint(6) NOT NULL default '0', ! `wanderx2` smallint(6) NOT NULL default '0', ! `wandery1` smallint(6) NOT NULL default '0', ! `wandery2` smallint(6) NOT NULL default '0', ! `wanderradius` smallint(6) NOT NULL default '0', ! `fleeat` smallint(3) NOT NULL default '10', ! `spellslow` int(11) NOT NULL default '0', ! `spellshigh` int(11) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `players` ( ! `serial` int(11) NOT NULL default '0', ! `account` varchar(255) default NULL, ! `additionalflags` int(10) NOT NULL default '0', ! `visualrange` tinyint(3) NOT NULL default '0', ! `profile` longtext, ! `fixedlight` tinyint(3) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `skills` ( ! `serial` int(11) NOT NULL default '0', ! `skill` tinyint(3) NOT NULL default '0', ! `value` smallint(6) NOT NULL default '0', ! `locktype` tinyint(4) default '0', ! `cap` smallint(6) default '0', ! PRIMARY KEY (`serial`,`skill`) ); ! CREATE TABLE `tags` ( ! `serial` int(11) NOT NULL default '0', ! `name` varchar(64) NOT NULL default '', ! `type` varchar(6) NOT NULL default '', ! `value` longtext NOT NULL, ! PRIMARY KEY (`serial`,`name`) ); ! CREATE TABLE `uobject` ( ! `name` varchar(255) default NULL, ! `serial` int(11) NOT NULL default '0', ! `multis` int(11) NOT NULL default '-1', ! `direction` char(1) NOT NULL default '0', ! `pos_x` smallint(6) NOT NULL default '0', ! `pos_y` smallint(6) NOT NULL default '0', ! `pos_z` smallint(6) NOT NULL default '0', ! `pos_map` tinyint(4) NOT NULL default '0', ! `events` varchar(255) default NULL, ! `bindmenu` varchar(255) default NULL, ! `havetags` tinyint(1) NOT NULL default '0', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `uobjectmap` ( ! `serial` int(11) NOT NULL default '0', ! `type` varchar(80) NOT NULL default '', ! PRIMARY KEY (`serial`) ); ! CREATE TABLE `effects` ( ! `id` int(11) NOT NULL default '0', ! `objectid` varchar(64) NOT NULL default '', ! `expiretime` int(11) NOT NULL default '0', ! `dispellable` tinyint(4) NOT NULL default '0', ! `source` int(11) NOT NULL default '-1', ! `destination` int(11) NOT NULL default '-1', ! PRIMARY KEY (`id`) ); ! CREATE TABLE `effects_properties` ( ! `id` int(11) NOT NULL default '0', ! `key` varchar(64) NOT NULL default '', ! `type` varchar(64) NOT NULL default '', ! `value` text NOT NULL, ! PRIMARY KEY (`id`,`key`) ); |
|
From: <dr...@us...> - 2003-09-26 03:24:13
|
Update of /cvsroot/wpdev/xmlscripts In directory sc8-pr-cvs1:/tmp/cvs-serv3084 Modified Files: accounts.sql Log Message: Using prevents errors with mysql :) Index: accounts.sql =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/accounts.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** accounts.sql 10 Sep 2003 21:09:20 -0000 1.3 --- accounts.sql 26 Sep 2003 03:24:03 -0000 1.4 *************** *** 1,9 **** ! CREATE TABLE accounts ( ! login varchar(255) NOT NULL default '', ! password varchar(255) NOT NULL default '', ! flags int NOT NULL default '0', ! acl varchar(255) NOT NULL default 'player', ! lastlogin int NOT NULL default '0', ! blockuntil int NOT NULL default '0', ! PRIMARY KEY (login) ); --- 1,9 ---- ! CREATE TABLE `accounts` ( ! `login` varchar(255) NOT NULL default '', ! `password` varchar(255) NOT NULL default '', ! `flags` int NOT NULL default '0', ! `acl` varchar(255) NOT NULL default 'player', ! `lastlogin` int NOT NULL default '0', ! `blockuntil` int NOT NULL default '0', ! PRIMARY KEY (`login`) ); |
|
From: <dar...@us...> - 2003-09-26 01:52:40
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv20168
Modified Files:
log.cpp sectors.cpp
Log Message:
bugfixes
Index: log.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** log.cpp 20 Sep 2003 01:26:54 -0000 1.8
--- log.cpp 26 Sep 2003 01:52:35 -0000 1.9
***************
*** 69,73 ****
if ( !d.exists(path) )
{
- Console::instance()->log( LOG_WARNING, QString("log path (%1) doesn't exist, creating.\n").arg(path) );
d.mkdir( path );
}
--- 69,72 ----
***************
*** 80,84 ****
if( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) )
{
! Console::instance()->log( LOG_ERROR, QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) );
return false;
}
--- 79,83 ----
if( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) )
{
! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) );
return false;
}
Index: sectors.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/sectors.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** sectors.cpp 8 Sep 2003 10:58:47 -0000 1.16
--- sectors.cpp 26 Sep 2003 01:52:35 -0000 1.17
***************
*** 42,55 ****
}
- #undef realloc
-
- inline void *realloc( void *ptr, unsigned int size )
- {
- void *newPtr = malloc( size );
- memcpy( newPtr, ptr, size );
- free( ptr );
- return newPtr;
- }
-
unsigned int cSectorMap::gridHeight() const
{
--- 42,45 ----
|
|
From: <dar...@us...> - 2003-09-26 01:03:56
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv10799
Modified Files:
console_unix.cpp preferences.cpp preferences.h
scriptmanager.cpp wolfpack.cpp wolfpack.pro
Log Message:
Linux Fixes
Index: console_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_unix.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** console_unix.cpp 20 Sep 2003 01:26:54 -0000 1.9
--- console_unix.cpp 26 Sep 2003 01:03:52 -0000 1.10
***************
*** 178,182 ****
break;
case WPC_BROWN: cb = "\e[0;33m";
! break
default: cb = "\e[0m";
--- 178,182 ----
break;
case WPC_BROWN: cb = "\e[0;33m";
! break;
default: cb = "\e[0m";
Index: preferences.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/preferences.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** preferences.cpp 19 Sep 2003 20:41:08 -0000 1.3
--- preferences.cpp 26 Sep 2003 01:03:52 -0000 1.4
***************
*** 277,281 ****
for ( uint n = 0; n < nodes.count(); ++n ) {
if ( nodes.item(n).isElement() ) {
! processGroup(nodes.item(n).toElement());
}
}
--- 277,281 ----
for ( uint n = 0; n < nodes.count(); ++n ) {
if ( nodes.item(n).isElement() ) {
! processGroup( nodes.item(n).toElement() );
}
}
***************
*** 283,287 ****
}
! void Preferences::processGroup( QDomElement& group)
{
QDomElement elem;
--- 283,287 ----
}
! void Preferences::processGroup( const QDomElement& group)
{
QDomElement elem;
Index: preferences.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/preferences.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** preferences.h 19 Sep 2003 20:41:08 -0000 1.2
--- preferences.h 26 Sep 2003 01:03:52 -0000 1.3
***************
*** 80,84 ****
void readData();
void writeData();
! void processGroup(QDomElement& group);
private:
--- 80,84 ----
void readData();
void writeData();
! void processGroup( const QDomElement& group );
private:
Index: scriptmanager.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** scriptmanager.cpp 23 Sep 2003 12:40:18 -0000 1.7
--- scriptmanager.cpp 26 Sep 2003 01:03:52 -0000 1.8
***************
*** 131,135 ****
const QValueVector< cElement* > §ions = DefManager->getDefinitions( WPDT_SCRIPT );
! for( unsigned int i = 0; i < sections.size(); ++i )
{
const cElement *element = sections[i];
--- 131,137 ----
const QValueVector< cElement* > §ions = DefManager->getDefinitions( WPDT_SCRIPT );
! unsigned int i;
!
! for( i = 0; i < sections.size(); ++i )
{
const cElement *element = sections[i];
Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.471
retrieving revision 1.472
diff -C2 -d -r1.471 -r1.472
*** wolfpack.cpp 23 Sep 2003 12:40:19 -0000 1.471
--- wolfpack.cpp 26 Sep 2003 01:03:52 -0000 1.472
***************
*** 104,108 ****
Resources::instance()->reload();
MakeMenus::instance()->reload();
! ScriptManager->reload();
ContextMenus::instance()->reload();
Skills->reload();
--- 104,108 ----
Resources::instance()->reload();
MakeMenus::instance()->reload();
! ScriptManager::instance()->reload();
ContextMenus::instance()->reload();
Skills->reload();
Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** wolfpack.pro 22 Sep 2003 18:19:37 -0000 1.164
--- wolfpack.pro 26 Sep 2003 01:03:52 -0000 1.165
***************
*** 158,161 ****
--- 158,162 ----
ai.cpp \
ai_animals.cpp \
+ ai_humans.cpp \
ai_monsters.cpp \
basechar.cpp \
|
|
From: <dar...@us...> - 2003-09-26 00:01:56
|
Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv30718/python
Modified Files:
char.cpp
Log Message:
Work in Progress
on wolfpack.magic
Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** char.cpp 25 Sep 2003 03:05:59 -0000 1.108
--- char.cpp 26 Sep 2003 00:01:52 -0000 1.109
***************
*** 520,529 ****
return 0;
- if( amount < 1 )
- {
- PyErr_BadArgument();
- return 0;
- }
-
cUObject *pSource = 0;
if( checkWpItem( source ) )
--- 520,523 ----
|
|
From: <dar...@us...> - 2003-09-25 23:44:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic
In directory sc8-pr-cvs1:/tmp/cvs-serv27604/wolfpack/magic
Modified Files:
circle1.py circle2.py spell.py utilities.py
Added Files:
circle3.py trap.py
Log Message:
Work in Progress
on wolfpack.magic
--- NEW FILE: circle3.py ---
from wolfpack.magic import registerspell
from wolfpack.magic.spell import CharEffectSpell, Spell, DelayedDamageSpell
from wolfpack.magic.utilities import *
import random
import wolfpack
from wolfpack.utilities import tobackpack
class Bless ( CharEffectSpell ):
def __init__( self ):
CharEffectSpell.__init__( self, 3 )
self.reagents = { REAGENT_MANDRAKE: 1, REAGENT_GARLIC: 1 }
self.mantra = 'Rel Sanct'
def effect( self, char, target ):
statmodifier( char, target, 3, 0 )
target.effect( 0x373a, 10, 15 )
target.soundeffect( 0x1ea )
class Fireball ( DelayedDamageSpell ):
def __init__( self ):
DelayedDamageSpell.__init__( self, 2 )
self.reagents = { REAGENT_BLACKPEARL: 1 }
self.mantra = 'Vas Flam'
self.sound = 0x44b
self.missile = [ 0x36D4, 0, 1, 7, 0 ]
def damage( self, char, target ):
damage = self.scaledamage( char, target, random.randint( 10, 17 ) )
target.damage( DAMAGE_MAGICAL, damage, char )
def onLoad():
Bless().register( 17 )
Fireball().register( 18 )
#MagicLock().register( 19 )
#Poison().register( 20 )
#Telekinesis().register( 21 )
#Teleport().register( 22 )
#Unlock().register( 23 )
#WallOfStone().register( 24 )
--- NEW FILE: trap.py ---
#
# This event should be assigned to trapped containers
# As soon as they are opened, the trap sets off.
#
import wolfpack
from wolfpack.consts import *
def onUse( char, item ):
try:
type = item.gettag( 'trap_type' )
damage = item.gettag( 'trap_damage' )
owner = item.gettag( 'trap_owner' )
except:
item.events.remove( 'wolfpack.magic.trap' )
return 0
char.message( 502999 )
pos = item.pos
wolfpack.effect( 0x36bd, wolfpack.coord( pos.x + 1, pos.y, pos.z, pos.map ), 15, 15 )
wolfpack.effect( 0x36bd, wolfpack.coord( pos.x, pos.y - 1, pos.z, pos.map ), 15, 15 )
wolfpack.effect( 0x36bd, wolfpack.coord( pos.x - 1, pos.y, pos.z, pos.map ), 15, 15 )
wolfpack.effect( 0x36bd, wolfpack.coord( pos.x, pos.y + 1, pos.z, pos.map ), 15, 15 )
item.soundeffect( 0x307 )
events = item.events
events.remove( 'wolfpack.magic.trap' )
item.events = events
# Now Damage the Character
source = wolfpack.findchar( owner )
char.damage( DAMAGE_MAGICAL, damage, source )
return 1
Index: circle1.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/circle1.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** circle1.py 25 Sep 2003 14:28:43 -0000 1.2
--- circle1.py 25 Sep 2003 23:44:42 -0000 1.3
***************
*** 9,14 ****
class Clumsy ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
self.reagents = { REAGENT_BLOODMOSS: 1, REAGENT_NIGHTSHADE: 1 }
self.mantra = 'Uus Jux'
--- 9,13 ----
class Clumsy ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self, 1 )
self.reagents = { REAGENT_BLOODMOSS: 1, REAGENT_NIGHTSHADE: 1 }
self.mantra = 'Uus Jux'
***************
*** 23,28 ****
class Feeblemind ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
self.reagents = { REAGENT_GINSENG: 1, REAGENT_NIGHTSHADE: 1 }
self.mantra = 'Rel Wis'
--- 22,26 ----
class Feeblemind ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self, 1 )
self.reagents = { REAGENT_GINSENG: 1, REAGENT_NIGHTSHADE: 1 }
self.mantra = 'Rel Wis'
***************
*** 37,42 ****
class Weaken ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
self.reagents = { REAGENT_GARLIC: 1, REAGENT_NIGHTSHADE: 1 }
self.mantra = 'Des Mani'
--- 35,39 ----
class Weaken ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self, 1 )
self.reagents = { REAGENT_GARLIC: 1, REAGENT_NIGHTSHADE: 1 }
self.mantra = 'Des Mani'
***************
*** 51,55 ****
class CreateFood( Spell ):
def __init__( self ):
! self.mana = 4
self.reagents = { REAGENT_GARLIC: 1, REAGENT_GINSENG: 1, REAGENT_MANDRAKE: 1 }
self.mantra = 'In Mani Ylem'
--- 48,52 ----
class CreateFood( Spell ):
def __init__( self ):
! Spell.__init__( self, 1 )
self.reagents = { REAGENT_GARLIC: 1, REAGENT_GINSENG: 1, REAGENT_MANDRAKE: 1 }
self.mantra = 'In Mani Ylem'
***************
*** 72,77 ****
class Heal ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
self.reagents = { REAGENT_GARLIC: 1, REAGENT_GINSENG: 1, REAGENT_SPIDERSILK: 1 }
self.mantra = 'In Mani'
--- 69,73 ----
class Heal ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self, 1 )
self.reagents = { REAGENT_GARLIC: 1, REAGENT_GINSENG: 1, REAGENT_SPIDERSILK: 1 }
self.mantra = 'In Mani'
***************
*** 88,93 ****
class MagicArrow ( DelayedDamageSpell ):
def __init__( self ):
! DelayedDamageSpell.__init__( self )
! self.mana = 4
self.reagents = { REAGENT_SULFURASH: 1 }
self.mantra = 'In Por Ylem'
--- 84,88 ----
class MagicArrow ( DelayedDamageSpell ):
def __init__( self ):
! DelayedDamageSpell.__init__( self, 1 )
self.reagents = { REAGENT_SULFURASH: 1 }
self.mantra = 'In Por Ylem'
***************
*** 96,105 ****
def damage( self, char, target ):
! damage = self.scaledamage( char, target, 4 )
target.damage( DAMAGE_MAGICAL, damage, char )
class ReactiveArmor( Spell ):
def __init__( self ):
! self.mana = 4
self.reagents = { REAGENT_GARLIC: 1, REAGENT_SPIDERSILK: 1, REAGENT_SULFURASH: 1 }
self.mantra = 'Flam Sanct'
--- 91,100 ----
def damage( self, char, target ):
! damage = self.scaledamage( char, target, random.randint( 4, 8 ) )
target.damage( DAMAGE_MAGICAL, damage, char )
class ReactiveArmor( Spell ):
def __init__( self ):
! Spell.__init__( self, 1 )
self.reagents = { REAGENT_GARLIC: 1, REAGENT_SPIDERSILK: 1, REAGENT_SULFURASH: 1 }
self.mantra = 'Flam Sanct'
***************
*** 128,137 ****
# Register the spells in this module (wolfpack.magic.circle1)
def onLoad():
! Clumsy().register( 1, 1 )
! CreateFood().register( 1, 2 )
! Feeblemind().register( 1, 3 )
! Heal().register( 1, 4 )
! MagicArrow().register( 1, 5 )
! #NightSight().register( 1, 6 )
! ReactiveArmor().register( 1, 7 )
! Weaken().register( 1, 8 )
--- 123,132 ----
# Register the spells in this module (wolfpack.magic.circle1)
def onLoad():
! Clumsy().register( 1 )
! CreateFood().register( 2 )
! Feeblemind().register( 3 )
! Heal().register( 4 )
! MagicArrow().register( 5 )
! #NightSight().register( 6 )
! ReactiveArmor().register( 7 )
! Weaken().register( 8 )
Index: circle2.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/circle2.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** circle2.py 25 Sep 2003 14:28:43 -0000 1.1
--- circle2.py 25 Sep 2003 23:44:42 -0000 1.2
***************
*** 7,10 ****
from wolfpack.utilities import tobackpack
def onLoad():
!
\ No newline at end of file
--- 7,143 ----
from wolfpack.utilities import tobackpack
+ class Agility ( CharEffectSpell ):
+ def __init__( self ):
+ CharEffectSpell.__init__( self, 2 )
+ self.reagents = { REAGENT_MANDRAKE: 1, REAGENT_BLOODMOSS: 1 }
+ self.mantra = 'Ex Uus'
+
+ def effect( self, char, target ):
+ statmodifier( char, target, 1, 0 )
+
+ target.effect( 0x375a, 10, 15 )
+ target.soundeffect( 0x28e )
+
+ class Cunning ( CharEffectSpell ):
+ def __init__( self ):
+ CharEffectSpell.__init__( self, 2 )
+ self.reagents = { REAGENT_MANDRAKE: 1, REAGENT_NIGHTSHADE: 1 }
+ self.mantra = 'Uus Wis'
+
+ def effect( self, char, target ):
+ statmodifier( char, target, 2, 0 )
+
+ target.effect( 0x375a, 10, 15 )
+ target.soundeffect( 0x1eb )
+
+ class Strength ( CharEffectSpell ):
+ def __init__( self ):
+ CharEffectSpell.__init__( self, 2 )
+ self.reagents = { REAGENT_MANDRAKE: 1, REAGENT_NIGHTSHADE: 1 }
+ self.mantra = 'Uus Mani'
+
+ def effect( self, char, target ):
+ statmodifier( char, target, 0, 0 )
+
+ target.effect( 0x375a, 10, 15 )
+ target.soundeffect( 0x1ee )
+
+ class Harm ( DelayedDamageSpell ):
+ def __init__( self ):
+ DelayedDamageSpell.__init__( self, 2 )
+ self.delay = None
+ self.reagents = { REAGENT_SPIDERSILK: 1, REAGENT_NIGHTSHADE: 1 }
+ self.mantra = 'An Mani'
+ self.sound = 0x1f1
+
+ def damage( self, char, target ):
+ distance = target.distanceto( char )
+
+ char.message( 'Distance to target: ' + str( distance ) )
+
+ damage = random.randint( 1, 15 )
+
+ # One field between us and the target
+ if distance == 2:
+ damage *= 0.5
+
+ elif distance > 2:
+ damage *= 0.25
+
+ damage = self.scaledamage( char, target, int( damage ) )
+ target.effect( 0x374a, 10, 15 )
+ target.damage( DAMAGE_MAGICAL, damage, char )
+
+ class MagicTrap ( Spell ):
+ def __init__( self ):
+ Spell.__init__( self, 2 )
+ self.validtarget = TARGET_ITEM
+ self.reagents = { REAGENT_GARLIC: 1, REAGENT_SPIDERSILK: 1, REAGENT_SULFURASH: 1 }
+ self.mantra = 'In Jux'
+
+ def target( self, char, mode, targettype, target ):
+ char.turnto( target )
+
+ if not self.consumerequirements( char, mode ):
+ return
+
+ # Can this be trapped?
+ if target.type != 1:
+ char.message( 'You cannot trap that.' )
+
+ # Already Trapped?
+ if 'wolfpack.magic.trap' in target.events:
+ fizzle( char )
+ return
+
+ pos = target.pos
+ wolfpack.effect( 0x376a, wolfpack.coord( pos.x + 1, pos.y, pos.z, pos.map ), 9, 10 )
+ wolfpack.effect( 0x376a, wolfpack.coord( pos.x, pos.y - 1, pos.z, pos.map ), 9, 10 )
+ wolfpack.effect( 0x376a, wolfpack.coord( pos.x - 1, pos.y, pos.z, pos.map ), 9, 10 )
+ wolfpack.effect( 0x376a, wolfpack.coord( pos.x, pos.y + 1, pos.z, pos.map ), 9, 10 )
+ target.soundeffect( 0x1ef )
+
+ # Add the Trap Properties to the Item
+ target.settag( 'trap_owner', char.serial )
+ target.settag( 'trap_damage', random.randint( 10, 50 ) )
+ target.settag( 'trap_type', 'magic' )
+ target.events = target.events + [ 'wolfpack.magic.trap' ]
+
+ class RemoveTrap ( Spell ):
+ def __init__( self ):
+ Spell.__init__( self, 2 )
+ self.validtarget = TARGET_ITEM
+ self.reagents = { REAGENT_BLOODMOSS: 1, REAGENT_SULFURASH: 1 }
+ self.mantra = 'An Jux'
+
+ def target( self, char, mode, targettype, target ):
+ char.turnto( target )
+
+ if not self.consumerequirements( char, mode ):
+ return
+
+ # Already Trapped?
+ if not'wolfpack.magic.trap' in target.events:
+ fizzle( char )
+ return
+
+ wolfpack.effect( 0x376a, target.pos, 9, 32 )
+ target.soundeffect( 0x1f0 )
+
+ # Add the Trap Properties to the Item
+ target.deltag( 'trap_owner', char.serial )
+ target.deltag( 'trap_damage', random.randint( 10, 50 ) )
+ target.deltag( 'trap_type', 'magic' )
+ events = target.events
+ events.remove( 'wolfpack.magic.trap' )
+ target.events = events
+
def onLoad():
! Agility().register( 9 )
! Cunning().register( 10 )
! #Cure().register( 11 )
! Harm().register( 12 )
! MagicTrap().register( 13 )
! RemoveTrap().register( 14 )
! #Protection().register( 15 )
! Strength().register( 16 )
Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/spell.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spell.py 25 Sep 2003 14:28:43 -0000 1.2
--- spell.py 25 Sep 2003 23:44:42 -0000 1.3
***************
*** 52,69 ****
return 1
! def register( self, circle, id ):
self.spellid = id
- self.circle = circle
wolfpack.magic.registerspell( self.spellid, self )
! def __init__( self ):
! pass
def calcdelay( self ):
return 250 + ( 250 * self.circle )
!
! # I decided against using a predefined table because
! # this gives shards more ways to customize their magic system
! # 4, 6, 9, 11, 14, 20, 40, 50
def checkrequirements( self, char, mode ):
if char.dead:
--- 52,68 ----
return 1
! def register( self, id ):
self.spellid = id
wolfpack.magic.registerspell( self.spellid, self )
! def __init__( self, circle ):
! # Set Mana
! self.circle = circle
! mana_table = [ 4, 6, 9, 11, 14, 20, 40, 50 ]
! self.mana = mana_table[ self.circle - 1 ]
def calcdelay( self ):
return 250 + ( 250 * self.circle )
!
def checkrequirements( self, char, mode ):
if char.dead:
***************
*** 144,148 ****
class CharEffectSpell ( Spell ):
! def __init__( self ):
self.validtarget = TARGET_CHAR
self.resistable = 1 # Most of them are resistable
--- 143,148 ----
class CharEffectSpell ( Spell ):
! def __init__( self, circle ):
! Spell.__init__( self, circle )
self.validtarget = TARGET_CHAR
self.resistable = 1 # Most of them are resistable
***************
*** 166,170 ****
class DelayedDamageSpell( CharEffectSpell ):
! def __init__( self ):
self.validtarget = TARGET_CHAR
self.harmful = 1 # All of them are harmful
--- 166,171 ----
class DelayedDamageSpell( CharEffectSpell ):
! def __init__( self, circle ):
! CharEffectSpell.__init__( self, circle )
self.validtarget = TARGET_CHAR
self.harmful = 1 # All of them are harmful
Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/utilities.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utilities.py 25 Sep 2003 14:28:43 -0000 1.2
--- utilities.py 25 Sep 2003 23:44:42 -0000 1.3
***************
*** 55,69 ****
amount = args[1]
! if stat == 0:
char.strength -= amount
char.maxhitpoints -= amount
char.hitpoints = min( char.hitpoints, char.maxhitpoints )
! elif stat == 1:
char.dexterity -= amount
char.maxstamina -= amount
char.stamina = min( char.stamina, char.maxstamina )
! elif stat == 2:
char.intelligence -= amount
char.maxmana -= amount
--- 55,69 ----
amount = args[1]
! if stat == 0 or stat == 3:
char.strength -= amount
char.maxhitpoints -= amount
char.hitpoints = min( char.hitpoints, char.maxhitpoints )
! elif stat == 1 or stat == 3:
char.dexterity -= amount
char.maxstamina -= amount
char.stamina = min( char.stamina, char.maxstamina )
! elif stat == 2 or stat == 3:
char.intelligence -= amount
char.maxmana -= amount
***************
*** 82,86 ****
amount = args[1]
! if stat == 0:
char.strength -= amount
char.maxhitpoints -= amount
--- 82,86 ----
amount = args[1]
! if stat == 0 or stat == 3:
char.strength -= amount
char.maxhitpoints -= amount
***************
*** 88,97 ****
char.updatehealth()
! elif stat == 1:
char.dexterity -= amount
char.maxstamina -= amount
char.stamina = min( char.stamina, char.maxstamina )
! elif stat == 2:
char.intelligence -= amount
char.maxmana -= amount
--- 88,97 ----
char.updatehealth()
! elif stat == 1 or stat == 3:
char.dexterity -= amount
char.maxstamina -= amount
char.stamina = min( char.stamina, char.maxstamina )
! elif stat == 2 or stat == 3:
char.intelligence -= amount
char.maxmana -= amount
***************
*** 114,118 ****
char.dispel( char, 0, "magic_statmodifier", [ "silent" ] )
! if stat == 0:
if target.strength + amount < 1:
amount = - ( target.strength - 1 )
--- 114,118 ----
char.dispel( char, 0, "magic_statmodifier", [ "silent" ] )
! if stat == 0 or stat == 3:
if target.strength + amount < 1:
amount = - ( target.strength - 1 )
***************
*** 123,127 ****
target.updatehealth()
! elif stat == 1:
if target.dexterity + amount < 1:
amount = - ( target.dexterity - 1 )
--- 123,127 ----
target.updatehealth()
! elif stat == 1 or stat == 3:
if target.dexterity + amount < 1:
amount = - ( target.dexterity - 1 )
***************
*** 131,135 ****
target.stamina = min( target.stamina, target.maxstamina )
! elif stat == 2:
if target.intelligence + amount < 1:
amount = - ( target.intelligence - 1 )
--- 131,135 ----
target.stamina = min( target.stamina, target.maxstamina )
! elif stat == 2 or stat == 3:
if target.intelligence + amount < 1:
amount = - ( target.intelligence - 1 )
|
|
From: <dar...@us...> - 2003-09-25 14:28:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic
In directory sc8-pr-cvs1:/tmp/cvs-serv18232/wolfpack/magic
Modified Files:
__init__.py circle1.py spell.py utilities.py
Added Files:
circle2.py reactivearmor.py
Log Message:
Work in Progress
on wolfpack.magic
--- NEW FILE: circle2.py ---
from wolfpack.magic import registerspell
from wolfpack.magic.spell import CharEffectSpell, Spell, DelayedDamageSpell
from wolfpack.magic.utilities import *
import random
import wolfpack
from wolfpack.utilities import tobackpack
def onLoad():
--- NEW FILE: reactivearmor.py ---
from wolfpack.consts import *
# ReactiveArmor EventSet
# This is basically a helper to override onDamage
# and reduce the physical damage by up to 75% and
# probably throw back damage
def onDamage( char, type, damage, source ):
# No source ?
# Resistance is futile
if not char.hastag( 'damage_absorb' ):
events = char.events
events.remove( 'wolfpack.magic.reactivearmor' )
char.events = events
if type == DAMAGE_PHYSICAL and source and source.distanceto( char ) <= 1:
absorb = int( char.gettag( 'damage_absorb' ) )
reflect = max( 1, int( damage / 5 ) )
source.damage( DAMAGE_MAGICAL, reflect, char )
source.soundeffect( 0x1f1 )
source.effect( 0x374a, 10, 16 )
if damage < absorb:
char.settag( 'damage_absorb', absorb - damage )
damage = 0
else:
damage -= absorb
char.message( 1005556 )
char.deltag( 'damage_absorb' )
events = char.events
events.remove( 'wolfpack.magic.reactivearmor' )
char.events = events
return damage
Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py 23 Sep 2003 12:17:39 -0000 1.1
--- __init__.py 25 Sep 2003 14:28:43 -0000 1.2
***************
*** 90,108 ****
char.events = eventlist
! if char.socket:
! char.socket.settag( 'cast_target', 1 )
! char.socket.attachtarget( 'wolfpack.magic.target_response', args, 'wolfpack.magic.target_cancel', 'wolfpack.magic.target_timeout', 8000 ) # Don't forget the timeout later on
! else:
! # Callback to the NPC AI ??
! pass
# Target Cancel
def target_cancel( char ):
! if char.hastag( 'cast_target' ):
! char.deltag( 'cast_target' )
# Target Timeout
def target_timeout( char ):
! char.message( 'You loose your concentration.' )
fizzle( char )
--- 90,105 ----
char.events = eventlist
! spell = spells[ args[0] ]
! spell.cast( char, args[1] )
# Target Cancel
def target_cancel( char ):
! if char.socket.hastag( 'cast_target' ):
! char.socket.deltag( 'cast_target' )
# Target Timeout
def target_timeout( char ):
! char.socket.deltag( 'cast_target' )
! char.message( 'You loose your concentration.' )
fizzle( char )
***************
*** 110,116 ****
def target_response( char, args, target ):
# No more npc saftey from here
- if not char.socket.hastag( 'cast_target' ):
- return
-
char.socket.deltag( 'cast_target' )
--- 107,110 ----
***************
*** 127,130 ****
--- 121,131 ----
# Ground Target
+ elif ( target.item or target.char or target.pos ) and ( spell.validtarget == TARGET_IGNORE or spell.validtarget == TARGET_GROUND ):
+ pos = target.pos
+ if target.item:
+ pos = target.item.pos
+ elif target.char:
+ pos = target.char.pos
+ spell.target( char, mode, TARGET_GROUND, pos )
else:
Index: circle1.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/circle1.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** circle1.py 23 Sep 2003 12:17:39 -0000 1.1
--- circle1.py 25 Sep 2003 14:28:43 -0000 1.2
***************
*** 1,22 ****
from wolfpack.magic import registerspell
! from wolfpack.magic.spell import Spell
from wolfpack.magic.utilities import *
! class Clumsy ( Spell ):
def __init__( self ):
! self.mana = 0
! self.reagents = {}
! self.valid_targets = TARGET_CHAR
! self.spellid = 1
! self.circle = 1
! self.mantra = 'In Jux Sanct'
! def target( self, char, mode, targettype, target ):
! char.message( 'You targetted something' )
! pass
# Register the spells in this module (wolfpack.magic.circle1)
def onLoad():
! Clumsy().register()
! pass
--- 1,137 ----
from wolfpack.magic import registerspell
! from wolfpack.magic.spell import CharEffectSpell, Spell, DelayedDamageSpell
from wolfpack.magic.utilities import *
+ import random
+ import wolfpack
+ from wolfpack.utilities import tobackpack
! class Clumsy ( CharEffectSpell ):
def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
! self.reagents = { REAGENT_BLOODMOSS: 1, REAGENT_NIGHTSHADE: 1 }
! self.mantra = 'Uus Jux'
! self.harmful = 1
! def effect( self, char, target ):
! statmodifier( char, target, 1, 1 )
!
! target.effect( 0x3779, 10, 15 )
! target.soundeffect( 0x1df )
!
! class Feeblemind ( CharEffectSpell ):
! def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
! self.reagents = { REAGENT_GINSENG: 1, REAGENT_NIGHTSHADE: 1 }
! self.mantra = 'Rel Wis'
! self.harmful = 1
!
! def effect( self, char, target ):
! statmodifier( char, target, 2, 1 )
!
! target.effect( 0x3779, 10, 15 )
! target.soundeffect( 0x1e5 )
!
! class Weaken ( CharEffectSpell ):
! def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
! self.reagents = { REAGENT_GARLIC: 1, REAGENT_NIGHTSHADE: 1 }
! self.mantra = 'Des Mani'
! self.harmful = 1
!
! def effect( self, char, target ):
! statmodifier( char, target, 0, 1 )
!
! target.effect( 0x3779, 10, 15 )
! target.soundeffect( 0x1e6 )
!
! class CreateFood( Spell ):
! def __init__( self ):
! self.mana = 4
! self.reagents = { REAGENT_GARLIC: 1, REAGENT_GINSENG: 1, REAGENT_MANDRAKE: 1 }
! self.mantra = 'In Mani Ylem'
!
! def cast( self, char, mode ):
! if not self.consumerequirements( char, mode ):
! return
!
! # Randomly select one id of food
! food = [ "9d1", "9d2", "9d3", "97c", "9eb", "97a", "9f2", "97b", "9b7" ]
!
! item = wolfpack.additem( random.choice( food ) )
! id = item.id
! if not tobackpack( item, char ):
! item.update()
!
! char.message( 1042695, "", " " + item.getname() )
! char.soundeffect( 0x1e2 )
!
! class Heal ( CharEffectSpell ):
! def __init__( self ):
! CharEffectSpell.__init__( self )
! self.mana = 4
! self.reagents = { REAGENT_GARLIC: 1, REAGENT_GINSENG: 1, REAGENT_SPIDERSILK: 1 }
! self.mantra = 'In Mani'
!
! def effect( self, char, target ):
! # 10% of Magery + 1-5
! amount = int( 0.01 * char.skill[ MAGERY ] ) + random.randint( 1, 5 )
! target.hitpoints = min( target.maxhitpoints, target.hitpoints + amount )
! target.updatehealth()
!
! target.effect( 0x376A, 9, 32 )
! target.soundeffect( 0x1f2 )
!
! class MagicArrow ( DelayedDamageSpell ):
! def __init__( self ):
! DelayedDamageSpell.__init__( self )
! self.mana = 4
! self.reagents = { REAGENT_SULFURASH: 1 }
! self.mantra = 'In Por Ylem'
! self.missile = [ 0x36e4, 0, 1, 5, 0 ]
! self.sound = 0x1e5
!
! def damage( self, char, target ):
! damage = self.scaledamage( char, target, 4 )
! target.damage( DAMAGE_MAGICAL, damage, char )
!
! class ReactiveArmor( Spell ):
! def __init__( self ):
! self.mana = 4
! self.reagents = { REAGENT_GARLIC: 1, REAGENT_SPIDERSILK: 1, REAGENT_SULFURASH: 1 }
! self.mantra = 'Flam Sanct'
!
! def cast( self, char, mode ):
! # Do we still have damage to absorb?
! if char.hastag( 'damage_absorb' ) and 'wolfpack.magic.reactivearmor' in char.events:
! char.message( 1005559 )
! return
!
! if not self.consumerequirements( char, mode ):
! return
!
! amount = min( 75, int( ( char.skill[ MAGERY ] + char.skill[ MEDITATION ] + char.skill[ INSCRIPTION ] ) / 30 ) )
!
! events = char.events
! if not 'wolfpack.magic.reactivearmor' in events:
! events.append( 'wolfpack.magic.reactivearmor' )
! char.events = events
!
! char.settag( 'damage_absorb', amount )
!
! char.effect( 0x376a, 9, 32 )
! char.soundeffect( 0x1f2 )
# Register the spells in this module (wolfpack.magic.circle1)
def onLoad():
! Clumsy().register( 1, 1 )
! CreateFood().register( 1, 2 )
! Feeblemind().register( 1, 3 )
! Heal().register( 1, 4 )
! MagicArrow().register( 1, 5 )
! #NightSight().register( 1, 6 )
! ReactiveArmor().register( 1, 7 )
! Weaken().register( 1, 8 )
Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/spell.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spell.py 23 Sep 2003 12:17:39 -0000 1.1
--- spell.py 25 Sep 2003 14:28:43 -0000 1.2
***************
*** 1,5 ****
--- 1,7 ----
import wolfpack.magic
+ from wolfpack.consts import *
from wolfpack.magic.utilities import *
+ import wolfpack.console
# Recursive Function for counting reagents
***************
*** 14,32 ****
return items
# Basic Spell Class
class Spell:
mana = 0
- circle = 0
reagents = {}
validtarget = TARGET_IGNORE
spellid = None
mantra = None
!
! # Static Method
! def register( self ):
! if not self.spellid:
! raise Exception, 'Trying to register a spell with an unset id: ' + str( self.__class__.__name__ )
wolfpack.magic.registerspell( self.spellid, self )
--- 16,58 ----
return items
+
+ # Recursive Function for removing reagents
+ def consumeReagents( item, items ):
+ for ( key, value ) in items.items():
+ if key == item.id and item.color == 0:
+ if item.amount <= value:
+ items[ key ] -= item.amount
+ item.remove()
+ else:
+ item.amount -= value
+ item.update()
+ del items[key]
+
+ return items # Reagents normally dont have content
+
+ for subitem in item.content:
+ items = consumeReagents( subitem, items )
+
+ return items
# Basic Spell Class
class Spell:
mana = 0
reagents = {}
validtarget = TARGET_IGNORE
spellid = None
+ circle = None
mantra = None
! harmful = 0
! affectdead = 0
! resistable = 0
+ # We affect another character
+ def affectchar( self, char, mode, target ):
+ return 1
+
+ def register( self, circle, id ):
+ self.spellid = id
+ self.circle = circle
wolfpack.magic.registerspell( self.spellid, self )
***************
*** 37,41 ****
--- 63,73 ----
return 250 + ( 250 * self.circle )
+ # I decided against using a predefined table because
+ # this gives shards more ways to customize their magic system
+ # 4, 6, 9, 11, 14, 20, 40, 50
def checkrequirements( self, char, mode ):
+ if char.dead:
+ return 0
+
if mode == MODE_BOOK:
# Check for Mana
***************
*** 43,50 ****
char.message( 502625 )
return 0
!
! # Check for Reagents
if len( self.reagents ) > 0:
! items = countReagents( char.getbackpack(), self.reagents )
for item in items.keys():
--- 75,82 ----
char.message( 502625 )
return 0
!
! # Check for Reagents
if len( self.reagents ) > 0:
! items = countReagents( char.getbackpack(), self.reagents.copy() )
for item in items.keys():
***************
*** 56,61 ****
def consumerequirements( self, char, mode ):
return 0
def target( self, char, mode, targettype, target ):
! return 0
--- 88,198 ----
def consumerequirements( self, char, mode ):
+ # Check Basic Requirements before proceeding (Includes Death of Caster etc.)
+ if not self.checkrequirements( char, mode ):
+ fizzle( char )
+ return 0
+
+ # Consume Mana
+ if mode == MODE_BOOK:
+ if self.mana != 0:
+ char.mana -= self.mana
+ char.updatemana()
+
+ # Consume Reagents
+ if len( self.reagents ) > 0:
+ consumeReagents( char.getbackpack(), self.reagents.copy() )
+
+ # Check Skill
+ # Inspired by RunUO :)
+ minskill = max( 0, ( 100 / 7 ) - 20 )
+ maxskill = min( 120, ( 100 / 7 ) + 20 )
+
+ if not char.checkskill( MAGERY, int( minskill ), int( maxskill ) ):
+ fizzle( char )
+ char.message( 502632 )
+ return 0
+
+ return 1
+
+ # Not implemented yet
+ def checkreflect( self, char, mode, targettype, target ):
return 0
+
+ def scaledamage( self, char, target, damage ):
+ if self.checkresist( char, target ):
+ target.message( 501783 )
+ damage *= 0.75
+
+ if not target.socket:
+ damage *= 2
+
+ return damage
+
+ def checkresist( self, char, target ):
+ return 0
+
+ def cast( self, char, mode ):
+ if char.socket:
+ char.socket.settag( 'cast_target', 1 )
+ char.socket.attachtarget( 'wolfpack.magic.target_response', [ self.spellid, mode ], 'wolfpack.magic.target_cancel', 'wolfpack.magic.target_timeout', 8000 ) # Don't forget the timeout later on
+ else:
+ # Callback to the NPC AI ??
+ wolfpack.console.log( LOG_ERROR, "A NPC is trying to cast a spell." )
def target( self, char, mode, targettype, target ):
! raise Exception, "Spell without target method: " + str( self.__class__.__name__ )
!
! class CharEffectSpell ( Spell ):
! def __init__( self ):
! self.validtarget = TARGET_CHAR
! self.resistable = 1 # Most of them are resistable
!
! def effect( self, char, target ):
! raise Exception, "CharEffectSpell with unimplemented effect method: " + str( self.__clas__.__name__ )
!
! def target( self, char, mode, targettype, target ):
! if not self.consumerequirements( char, mode ):
! return
!
! if not self.affectchar( char, mode, target ):
! return
!
! char.turnto( target )
!
! if self.checkreflect( char, mode, targettype, target ):
! target = char
!
! self.effect( char, target )
!
! class DelayedDamageSpell( CharEffectSpell ):
! def __init__( self ):
! self.validtarget = TARGET_CHAR
! self.harmful = 1 # All of them are harmful
! self.missile = None # If set, a missile will be shot [ id, fixed-direction, explode, speed ]
! self.delay = 1000 # Default Delay
! self.sound = None
!
! def effect( self, char, target ):
! # Shoot a missile?
! if self.missile:
! char.movingeffect( self.missile[0], target, self.missile[1], self.missile[2], self.missile[3] )
!
! if self.sound:
! char.soundeffect( self.sound )
!
! # The damage will be dealt in one second
! if not self.delay:
! self.damage( char, target )
! else:
! target.addtimer( 1000, 'wolfpack.magic.spell.damage_callback', [ self.spellid, char.serial ], 0, 0 )
!
! def damage_callback( target, args ):
! spell = wolfpack.magic.spells[ args[0] ]
! char = wolfpack.findchar( args[1] )
!
! # Something went out of scope
! if not char or not spell:
! wolfpack.console.log( LOG_WARNING, "Either Caster or Spell went out of scope in damage_callback.\n" )
! return
!
! spell.damage( char, target )
Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/magic/utilities.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** utilities.py 23 Sep 2003 12:17:39 -0000 1.1
--- utilities.py 25 Sep 2003 14:28:43 -0000 1.2
***************
*** 1,4 ****
--- 1,5 ----
import spellbook
+ from wolfpack.utilities import *
TARGET_CHAR = 1
***************
*** 25,30 ****
eventlist = char.events
! eventlist.remove( 'wolfpack.magic' )
! char.events = eventlist
char.effect( 0x3735, 1, 30 )
--- 26,35 ----
eventlist = char.events
! if 'wolfpack.magic' in eventlist:
! eventlist.remove( 'wolfpack.magic' )
! char.events = eventlist
!
! if char.socket:
! char.socket.deltag( 'cast_target' )
char.effect( 0x3735, 1, 30 )
***************
*** 43,44 ****
--- 48,144 ----
return 0
+
+ # A general purpose function for chaning some users stats
+ # This is shared among: curse, bless, all single stat modifying spells
+ def statmodifier_dispel( char, args, source, dispelargs ):
+ stat = args[0]
+ amount = args[1]
+
+ if stat == 0:
+ char.strength -= amount
+ char.maxhitpoints -= amount
+ char.hitpoints = min( char.hitpoints, char.maxhitpoints )
+
+ elif stat == 1:
+ char.dexterity -= amount
+ char.maxstamina -= amount
+ char.stamina = min( char.stamina, char.maxstamina )
+
+ elif stat == 2:
+ char.intelligence -= amount
+ char.maxmana -= amount
+ char.mana = min( char.mana, char.maxmana )
+
+ if not "silent" in dispelargs:
+ if stat == 0:
+ char.updatehealth()
+
+ char.updatestats()
+
+ return
+
+ def statmodifier_expire( char, args ):
+ stat = args[0]
+ amount = args[1]
+
+ if stat == 0:
+ char.strength -= amount
+ char.maxhitpoints -= amount
+ char.hitpoints = min( char.hitpoints, char.maxhitpoints )
+ char.updatehealth()
+
+ elif stat == 1:
+ char.dexterity -= amount
+ char.maxstamina -= amount
+ char.stamina = min( char.stamina, char.maxstamina )
+
+ elif stat == 2:
+ char.intelligence -= amount
+ char.maxmana -= amount
+ char.mana = min( char.mana, char.maxmana )
+
+ char.updatestats()
+
+ return
+
+ def statmodifier( char, target, stat, curse ):
+ duration = int( char.skill[ MAGERY ] * 0.12 ) * 1000
+ amount = 1 + int( char.skill[ MAGERY ] * 0.01 )
+
+ # Reverse if it's a curse
+ if curse:
+ amount *= -1
+
+ # Dispel any old stat modifiers on this character
+ # And readd a new one (remove the old ones silently)
+ char.dispel( char, 0, "magic_statmodifier", [ "silent" ] )
+
+ if stat == 0:
+ if target.strength + amount < 1:
+ amount = - ( target.strength - 1 )
+
+ target.strength += amount
+ target.maxhitpoints += amount
+ target.hitpoints = min( target.hitpoints, target.maxhitpoints )
+ target.updatehealth()
+
+ elif stat == 1:
+ if target.dexterity + amount < 1:
+ amount = - ( target.dexterity - 1 )
+
+ target.dexterity += amount
+ target.maxstamina += amount
+ target.stamina = min( target.stamina, target.maxstamina )
+
+ elif stat == 2:
+ if target.intelligence + amount < 1:
+ amount = - ( target.intelligence - 1 )
+
+ target.intelligence += amount
+ target.maxmana += amount
+ target.mana = min( target.mana, target.maxmana )
+
+ target.updatestats()
+
+ # Save the values in a tempeffect to remove them later
+ target.addtimer( duration, "wolfpack.magic.utilities.statmodifier_expire", [ stat, amount ], 1, 1, "magic_statmodifier", "wolfpack.magic.utilities.statmodifier_dispel" )
|
|
From: <dar...@us...> - 2003-09-25 14:28:46
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv18232/wolfpack
Modified Files:
console.py utilities.py
Log Message:
Work in Progress
on wolfpack.magic
Index: console.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/console.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** console.py 24 Mar 2003 13:02:23 -0000 1.5
--- console.py 25 Sep 2003 14:28:43 -0000 1.6
***************
*** 13,20 ****
return _wolfpack.console.getbuffer()
- def send():
- return _wolfpack.console.send( sring2console )
-
def reloadScripts():
return _wolfpack.console.reloadScripts()
--- 13,19 ----
return _wolfpack.console.getbuffer()
def reloadScripts():
return _wolfpack.console.reloadScripts()
+ log = _wolfpack.console.log
+ send = _wolfpack.console.send
Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** utilities.py 1 Sep 2003 04:56:44 -0000 1.16
--- utilities.py 25 Sep 2003 14:28:43 -0000 1.17
***************
*** 89,93 ****
return
! def statmodifier( char, time, mStr, mDex, mInt ):
# Dispel any old stat modifiers on this character
# And readd a new one (remove the old ones silently)
--- 89,93 ----
return
! def statmodifier( char, time, mStr = 0, mDex = 0, mInt = 0 ):
# Dispel any old stat modifiers on this character
# And readd a new one (remove the old ones silently)
|
|
From: <dar...@us...> - 2003-09-25 14:28:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1:/tmp/cvs-serv18159 Modified Files: scripts.xml Log Message: Work in Progress on wolfpack.magic Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** scripts.xml 23 Sep 2003 12:18:24 -0000 1.61 --- scripts.xml 25 Sep 2003 14:28:19 -0000 1.62 *************** *** 48,52 **** --- 48,54 ---- <script>scroll</script> <script>wolfpack.magic</script> + <script>wolfpack.magic.reactivearmor</script> <script>wolfpack.magic.circle1</script> + <script>wolfpack.magic.circle2</script> <!-- Multis --> |
|
From: <dar...@us...> - 2003-09-25 03:06:31
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1:/tmp/cvs-serv1069/network Modified Files: uotxpackets.h Log Message: Several changes and fixes. Fixed Python TempEffect Error Reporting and added correct line breaks to the windows console. Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** uotxpackets.h 15 Sep 2003 16:49:03 -0000 1.89 --- uotxpackets.h 25 Sep 2003 03:05:59 -0000 1.90 *************** *** 1081,1085 **** QString tmpData = data; // go around the const stuff. this->setUnicodeString( PacketLen, tmpData, data.length()*2 ); ! setShort ( 1, PacketLen+data.length()*2 ); setShort ( PacketLen+data.length()*2, 0 ); } --- 1081,1085 ---- QString tmpData = data; // go around the const stuff. this->setUnicodeString( PacketLen, tmpData, data.length()*2 ); ! setShort ( 1, PacketLen+data.length()*2+2 ); setShort ( PacketLen+data.length()*2, 0 ); } |
|
From: <dar...@us...> - 2003-09-25 03:06:31
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv1069
Modified Files:
console_win.cpp items.cpp persistentbroker.cpp
persistentbroker.h
Log Message:
Several changes and fixes.
Fixed Python TempEffect Error Reporting and added correct line breaks to the windows console.
Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** console_win.cpp 20 Sep 2003 01:26:54 -0000 1.11
--- console_win.cpp 25 Sep 2003 03:05:58 -0000 1.12
***************
*** 97,101 ****
case WM_CREATE:
// Create Richedit Box
! logWindow = CreateWindow( RICHEDIT_CLASS, 0, ES_LEFT|ES_MULTILINE|ES_AUTOVSCROLL|ES_AUTOHSCROLL|ES_READONLY|WS_CHILD|WS_VISIBLE|WS_VSCROLL, 0, 0, 10, 10, hwnd, (HMENU)CONTROL_LOGWINDOW, appInstance, 0 );
if( logWindow == 0 )
--- 97,101 ----
case WM_CREATE:
// Create Richedit Box
! logWindow = CreateWindow( RICHEDIT_CLASS, 0, ES_LEFT|ES_MULTILINE|ES_AUTOVSCROLL|ES_READONLY|WS_CHILD|WS_VISIBLE|WS_VSCROLL, 0, 0, 10, 10, hwnd, (HMENU)CONTROL_LOGWINDOW, appInstance, 0 );
if( logWindow == 0 )
Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.356
retrieving revision 1.357
diff -C2 -d -r1.356 -r1.357
*** items.cpp 23 Sep 2003 23:55:23 -0000 1.356
--- items.cpp 25 Sep 2003 03:05:58 -0000 1.357
***************
*** 409,441 ****
setTable( "items" );
! addField("serial", serial());
! addField("id", id());
! addField("color", color());
SERIAL contserial = INVALID_SERIAL;
if ( container_ )
contserial = container_->serial();
! addField("cont", contserial);
! addField("layer", layer_);
! addField("type", type_);
! addField("type2", type2_);
! addField("amount", amount_);
! addField("decaytime", (decaytime_ > uiCurrentTime) ? decaytime_ - uiCurrentTime : 0 );
! addField("def", def_);
addField("hidamage", hidamage_);
addField("lodamage", lodamage_);
! addField("time_unused", time_unused);
! addField("weight", weight_);
! addField("hp", hp_);
! addField("maxhp", maxhp_);
! addField("speed", speed_);
! addField("poisoned", poisoned_);
! addField("magic", magic_);
! addField("owner", ownserial_);
! addField("visible", visible_);
! addStrField("spawnregion", spawnregion_);
! addField("priv", priv_);
! addField("sellprice", sellprice_);
! addField("buyprice", buyprice_);
! addField("restock", restock_);
addCondition( "serial", serial() );
--- 409,441 ----
setTable( "items" );
! addField("serial", serial() );
! addField("id", id() );
! addField("color", color() );
SERIAL contserial = INVALID_SERIAL;
if ( container_ )
contserial = container_->serial();
! addField("cont", contserial);
! addField("layer", layer_);
! addField("type", type_);
! addField("type2", type2_);
! addField("amount", amount_);
! addField("decaytime", (decaytime_ > uiCurrentTime) ? decaytime_ - uiCurrentTime : 0 );
! addField("def", def_);
addField("hidamage", hidamage_);
addField("lodamage", lodamage_);
! addField("time_unused", time_unused);
! addField("weight", weight_);
! addField("hp", hp_ );
! addField("maxhp", maxhp_ );
! addField("speed", speed_ );
! addField("poisoned", poisoned_ );
! addField("magic", magic_ );
! addField("owner", ownserial_ );
! addField("visible", visible_ );
! addStrField("spawnregion", spawnregion_ );
! addField("priv", priv_ );
! addField("sellprice", sellprice_ );
! addField("buyprice", buyprice_ );
! addField("restock", restock_ );
addCondition( "serial", serial() );
***************
*** 1857,1861 ****
ownserial_ = atoi( result[offset++] );
visible_ = atoi( result[offset++] );
! spawnregion_ = atoi( result[offset++] );
priv_ = atoi( result[offset++] );
sellprice_ = atoi( result[offset++] );
--- 1857,1867 ----
ownserial_ = atoi( result[offset++] );
visible_ = atoi( result[offset++] );
!
! if( strlen( result[offset] ) == 0 )
! spawnregion_ = QString::null;
! else
! spawnregion_ = QString::fromUtf8( result[offset] );
! offset++;
!
priv_ = atoi( result[offset++] );
sellprice_ = atoi( result[offset++] );
Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** persistentbroker.cpp 24 Sep 2003 21:19:48 -0000 1.30
--- persistentbroker.cpp 25 Sep 2003 03:05:58 -0000 1.31
***************
*** 238,244 ****
QString PersistentBroker::quoteString( QString s )
{
if( d->sqlite )
! return s.replace( QRegExp("'"), "''" );
else
! return s.replace( QRegExp("'"), "\\'" );
}
--- 238,247 ----
QString PersistentBroker::quoteString( QString s )
{
+ if( s == QString::null )
+ return "";
+
if( d->sqlite )
! return s.replace( QRegExp("'"), "''" ).utf8().data();
else
! return s.replace( QRegExp("'"), "\\'" ).utf8().data();
}
Index: persistentbroker.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** persistentbroker.h 24 Sep 2003 21:19:48 -0000 1.26
--- persistentbroker.h 25 Sep 2003 03:05:58 -0000 1.27
***************
*** 57,61 ****
void clearDeleteQueue();
void addToDeleteQueue( const QString &tables, const QString &conditions );
!
QString quoteString( QString d );
--- 57,61 ----
void clearDeleteQueue();
void addToDeleteQueue( const QString &tables, const QString &conditions );
!
QString quoteString( QString d );
***************
*** 96,100 ****
{ \
/* fields.push_back( name ); */ \
! values.push_back( "'" + ( value.isNull() ? QString( "" ) : persistentBroker->quoteString( value ) ) + "'" ); \
}
--- 96,100 ----
{ \
/* fields.push_back( name ); */ \
! values.push_back( "'" + persistentBroker->quoteString( value ) + "'" ); \
}
|
|
From: <dar...@us...> - 2003-09-25 03:06:31
|
Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv1069/python
Modified Files:
char.cpp tempeffect.h
Log Message:
Several changes and fixes.
Fixed Python TempEffect Error Reporting and added correct line breaks to the windows console.
Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** char.cpp 23 Sep 2003 23:55:25 -0000 1.107
--- char.cpp 25 Sep 2003 03:05:59 -0000 1.108
***************
*** 161,178 ****
{
// Affix?
! QString clilocargs = QString::null;
! QString affix = QString::null;
!
! if( checkArgStr( 1 ) )
! clilocargs = getArgStr( 1 );
! if( checkArgStr( 2 ) )
! affix = getArgStr( 2 );
// Cliloc Message
! if( !affix.isNull() )
! player->socket()->clilocMessageAffix( getArgInt( 0 ), clilocargs, affix, 0x3b2, 3, player, false, false );
else
! player->socket()->clilocMessage( getArgInt( 0 ), clilocargs, 0x3b2, 3, player );
}
else
--- 161,176 ----
{
// Affix?
! unsigned int id;
! char *clilocargs = 0;
! char *affix = 0;
! if( !PyArg_ParseTuple( args, "i|ss:char.message( clilocid, [args], [affix] )", &id, &clilocargs, &affix ) )
! return 0;
// Cliloc Message
! if( affix )
! player->socket()->clilocMessageAffix( id, clilocargs, affix, 0x3b2, 3, player, false, false );
else
! player->socket()->clilocMessage( id, clilocargs, 0x3b2, 3, player );
}
else
Index: tempeffect.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tempeffect.h 12 Sep 2003 15:29:00 -0000 1.9
--- tempeffect.h 25 Sep 2003 03:05:59 -0000 1.10
***************
*** 106,115 ****
PyTuple_SetItem( p_args, 3, disp_args );
! PyEval_CallObject( pFunc, p_args );
!
! if( PyErr_Occurred() )
! PyErr_Print();
}
}
}
--- 106,119 ----
PyTuple_SetItem( p_args, 3, disp_args );
! PyObject *result = PyEval_CallObject( pFunc, p_args );
! Py_XDECREF( result );
!
! reportPythonError( sModule );
! Py_DECREF( p_args );
}
+
+ Py_XDECREF( pFunc );
}
+ Py_XDECREF( pModule );
}
***************
*** 145,154 ****
PyTuple_SetItem( p_args, 1, args );
! PyEval_CallObject( pFunc, p_args );
!
! if( PyErr_Occurred() )
! PyErr_Print();
}
}
}
--- 149,161 ----
PyTuple_SetItem( p_args, 1, args );
! PyObject *result = PyEval_CallObject( pFunc, p_args );
! Py_XDECREF( result );
! reportPythonError( sModule );
!
! Py_DECREF( p_args );
}
+ Py_DECREF( pFunc );
}
+ Py_XDECREF( pModule );
}
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv31063
Modified Files:
boats.cpp console.cpp console.h dbdriver.cpp log.h
persistentbroker.cpp persistentbroker.h
Log Message:
- some #include clean up.
- made INSERTs 25% faster, possibly updates as well ( didn't measure )
- cleanned some code.
Index: boats.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/boats.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** boats.cpp 23 Sep 2003 23:55:19 -0000 1.115
--- boats.cpp 24 Sep 2003 21:19:47 -0000 1.116
***************
*** 1290,1298 ****
INT32 i, j, k;
! for( i = 0; i < 4; ++i )
! addField( QString( "itemserial%1" ).arg( i ), itemserials[i] );
! for( i = 0; i < 4; ++i )
! addField( QString( "multi%1" ).arg( i ), multiids_[i] );
addCondition( "serial", serial() );
--- 1290,1302 ----
INT32 i, j, k;
! addField( "itemserial0", itemserials[0] );
! addField( "itemserial1", itemserials[1] );
! addField( "itemserial2", itemserials[2] );
! addField( "itemserial3", itemserials[3] );
! addField( "multi0", multiids_[0] );
! addField( "multi1", multiids_[1] );
! addField( "multi2", multiids_[2] );
! addField( "multi3", multiids_[3] );
addCondition( "serial", serial() );
Index: console.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** console.cpp 20 Sep 2003 01:05:10 -0000 1.6
--- console.cpp 24 Sep 2003 21:19:48 -0000 1.7
***************
*** 47,50 ****
--- 47,51 ----
#include <qglobal.h>
#include <qthread.h>
+ #include <qmutex.h>
#if defined(Q_OS_WIN32)
***************
*** 240,246 ****
void cConsole::queueCommand( const QString &command )
{
! commandMutex.lock();
commandQueue.push_back( command );
- commandMutex.unlock();
}
--- 241,246 ----
void cConsole::queueCommand( const QString &command )
{
! QMutexLocker lock(&commandMutex);
commandQueue.push_back( command );
}
Index: console.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** console.h 20 Sep 2003 01:26:54 -0000 1.7
--- console.h 24 Sep 2003 21:19:48 -0000 1.8
***************
*** 37,43 ****
// System Includes
- #include <iosfwd>
- #include <cstdarg>
- #include <cstdio>
#include <qstringlist.h>
#include <qstring.h>
--- 37,40 ----
***************
*** 45,51 ****
// Third Party includes
-
- // Forward class declaration
- class cPythonScript;
// Wolfpack Includes
--- 42,45 ----
Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** dbdriver.cpp 12 Sep 2003 20:02:44 -0000 1.23
--- dbdriver.cpp 24 Sep 2003 21:19:48 -0000 1.24
***************
*** 184,187 ****
--- 184,193 ----
}
+ exec( "PRAGMA synchronous = OFF;" );
+ exec( "PRAGMA default_synchronous = OFF;" );
+ exec( "PRAGMA full_column_names = OFF;" );
+ exec( "PRAGMA show_datatypes = OFF;" );
+ exec( "PRAGMA parser_trace = OFF;" );
+
return true;
}
Index: log.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** log.h 15 Sep 2003 02:00:41 -0000 1.3
--- log.h 24 Sep 2003 21:19:48 -0000 1.4
***************
*** 44,48 ****
class cLog
{
! protected:
eLogLevel loglevel;
QFile logfile;
--- 44,48 ----
class cLog
{
! private:
eLogLevel loglevel;
QFile logfile;
Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** persistentbroker.cpp 13 Sep 2003 15:37:06 -0000 1.29
--- persistentbroker.cpp 24 Sep 2003 21:19:48 -0000 1.30
***************
*** 41,46 ****
#include <qstring.h>
! PersistentBroker::PersistentBroker() : connection(0)
{
}
--- 41,64 ----
#include <qstring.h>
+ #include <list>
! struct stDeleteItem
! {
! QString tables;
! QString conditions;
! };
!
! class PersistentBrokerPrivate
! {
! public:
! PersistentBrokerPrivate() : connection(0) {}
! ~PersistentBrokerPrivate() { delete connection; }
!
! cDBDriver* connection;
! bool sqlite;
! std::list< stDeleteItem > deleteQueue;
! };
!
! PersistentBroker::PersistentBroker() : d( new PersistentBrokerPrivate )
{
}
***************
*** 48,73 ****
PersistentBroker::~PersistentBroker()
{
! delete connection;
}
bool PersistentBroker::openDriver( const QString& driver )
{
! if( connection != 0 )
{
! connection->close();
! delete connection;
! connection = 0;
}
if( driver == "sqlite" )
{
! connection = new cSQLiteDriver();
! sqlite = true;
}
else if( driver == "mysql" )
{
#ifdef MYSQL_DRIVER
! connection = new cMySQLDriver;
! sqlite = false;
#else
throw QString( "Sorry, you have to define MYSQL_DRIVER to make wolfpack work with MySQL.\n" );
--- 66,91 ----
PersistentBroker::~PersistentBroker()
{
! delete d;
}
bool PersistentBroker::openDriver( const QString& driver )
{
! if( d->connection != 0 )
{
! d->connection->close();
! delete d->connection;
! d->connection = 0;
}
if( driver == "sqlite" )
{
! d->connection = new cSQLiteDriver();
! d->sqlite = true;
}
else if( driver == "mysql" )
{
#ifdef MYSQL_DRIVER
! d->connection = new cMySQLDriver;
! d->sqlite = false;
#else
throw QString( "Sorry, you have to define MYSQL_DRIVER to make wolfpack work with MySQL.\n" );
***************
*** 75,79 ****
}
! if ( !connection )
return false;
--- 93,97 ----
}
! if ( !d->connection )
return false;
***************
*** 83,108 ****
bool PersistentBroker::connect( const QString& host, const QString& db, const QString& username, const QString& password )
{
! if (!connection)
return false;
// This does nothing but a little test-connection
! connection->setDatabaseName( db );
! connection->setUserName( username );
! connection->setPassword( password );
! connection->setHostName( host );
! if( !connection->open() )
return false;
- // Disable fsynch for sqlite
- if( this->sqlite )
- {
- connection->exec( "PRAGMA synchronous = OFF;" );
- connection->exec( "PRAGMA default_synchronous = OFF;" );
- connection->exec( "PRAGMA full_column_names = OFF;" );
- connection->exec( "PRAGMA show_datatypes = OFF;" );
- connection->exec( "PRAGMA parser_trace = OFF;" );
- }
-
return true;
}
--- 101,116 ----
bool PersistentBroker::connect( const QString& host, const QString& db, const QString& username, const QString& password )
{
! if (!d->connection)
return false;
// This does nothing but a little test-connection
! d->connection->setDatabaseName( db );
! d->connection->setUserName( username );
! d->connection->setPassword( password );
! d->connection->setHostName( host );
! if( !d->connection->open() )
return false;
return true;
}
***************
*** 110,115 ****
void PersistentBroker::disconnect()
{
! if( connection )
! connection->close();
}
--- 118,123 ----
void PersistentBroker::disconnect()
{
! if( d->connection )
! d->connection->close();
}
***************
*** 144,155 ****
bool PersistentBroker::executeQuery( const QString& query )
{
! if( !connection )
throw QString( "PersistentBroker not connected to database." );
//qWarning( query );
! bool result = connection->exec(query);
if( !result )
{
! Console::instance()->log( LOG_ERROR, connection->error() );
}
return result;
--- 152,163 ----
bool PersistentBroker::executeQuery( const QString& query )
{
! if( !d->connection )
throw QString( "PersistentBroker not connected to database." );
//qWarning( query );
! bool result = d->connection->exec(query);
if( !result )
{
! Console::instance()->log( LOG_ERROR, d->connection->error() );
}
return result;
***************
*** 158,189 ****
cDBDriver* PersistentBroker::driver() const
{
! return connection;
}
cDBResult PersistentBroker::query( const QString& query )
{
! if( !connection )
throw QString( "PersistentBroker not connected to database." );
! return connection->query( query );
}
void PersistentBroker::clearDeleteQueue()
{
! deleteQueue.clear();
}
void PersistentBroker::flushDeleteQueue()
{
! std::vector< stDeleteItem >::iterator iter;
! for( iter = deleteQueue.begin(); iter != deleteQueue.end(); ++iter )
{
! QString tables = (*iter).tables;
! QString conditions = (*iter).conditions;
! QString sql = QString( "DELETE FROM %1 WHERE %2" ).arg( tables ).arg( conditions );
! executeQuery( sql );
}
! deleteQueue.clear();
}
--- 166,194 ----
cDBDriver* PersistentBroker::driver() const
{
! return d->connection;
}
cDBResult PersistentBroker::query( const QString& query )
{
! if( !d->connection )
throw QString( "PersistentBroker not connected to database." );
! return d->connection->query( query );
}
void PersistentBroker::clearDeleteQueue()
{
! d->deleteQueue.clear();
}
void PersistentBroker::flushDeleteQueue()
{
! std::list< stDeleteItem >::iterator iter;
! for( iter = d->deleteQueue.begin(); iter != d->deleteQueue.end(); ++iter )
{
! executeQuery( "DELETE FROM " + (*iter).tables + " WHERE " + (*iter).conditions );
}
! d->deleteQueue.clear();
}
***************
*** 193,234 ****
dItem.tables = tables;
dItem.conditions = conditions;
! deleteQueue.push_back( dItem );
}
QString PersistentBroker::lastError() const
{
! return connection->error();
}
void PersistentBroker::lockTable( const QString& table ) const
{
! connection->lockTable( table );
}
void PersistentBroker::unlockTable( const QString& table ) const
{
! connection->unlockTable( table );
}
void PersistentBroker::startTransaction()
{
! if( sqlite )
! executeQuery( "BEGIN;" );
}
void PersistentBroker::commitTransaction()
{
! if( sqlite )
! executeQuery( "END;" );
}
void PersistentBroker::rollbackTransaction()
{
! if( sqlite )
! executeQuery( "ROLLBACK;" );
}
bool PersistentBroker::tableExists( const QString &table )
{
! return connection->tableExists( table );
}
--- 198,244 ----
dItem.tables = tables;
dItem.conditions = conditions;
! d->deleteQueue.push_back( dItem );
}
QString PersistentBroker::lastError() const
{
! return d->connection->error();
}
void PersistentBroker::lockTable( const QString& table ) const
{
! d->connection->lockTable( table );
}
void PersistentBroker::unlockTable( const QString& table ) const
{
! d->connection->unlockTable( table );
}
void PersistentBroker::startTransaction()
{
! executeQuery( "BEGIN;" );
}
void PersistentBroker::commitTransaction()
{
! executeQuery( "COMMIT;" );
}
void PersistentBroker::rollbackTransaction()
{
! executeQuery( "ROLLBACK;" );
}
bool PersistentBroker::tableExists( const QString &table )
{
! return d->connection->tableExists( table );
! }
!
! QString PersistentBroker::quoteString( QString s )
! {
! if( d->sqlite )
! return s.replace( QRegExp("'"), "''" );
! else
! return s.replace( QRegExp("'"), "\\'" );
}
Index: persistentbroker.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** persistentbroker.h 13 Sep 2003 13:27:26 -0000 1.25
--- persistentbroker.h 24 Sep 2003 21:19:48 -0000 1.26
***************
*** 33,40 ****
#define __PERSISTENTBROKER_H__
- #include <qsqldatabase.h>
- #include <typeinfo>
#include <qregexp.h>
- #include <vector>
class PersistentObject;
--- 33,37 ----
***************
*** 42,57 ****
class cDBResult;
! struct stDeleteItem
! {
! QString tables;
! QString conditions;
! };
class PersistentBroker
{
! cDBDriver* connection;
! bool sqlite;
! std::vector< stDeleteItem > deleteQueue;
!
public:
PersistentBroker();
--- 39,47 ----
class cDBResult;
! class PersistentBrokerPrivate;
class PersistentBroker
{
! PersistentBrokerPrivate* d;
public:
PersistentBroker();
***************
*** 68,78 ****
void addToDeleteQueue( const QString &tables, const QString &conditions );
! QString quoteString( QString d )
! {
! if( sqlite )
! return d.replace( QRegExp("'"), "''" );
! else
! return d.replace( QRegExp("'"), "\\'" );
! }
void lockTable( const QString& table ) const;
--- 58,62 ----
void addToDeleteQueue( const QString &tables, const QString &conditions );
! QString quoteString( QString d );
void lockTable( const QString& table ) const;
***************
*** 99,103 ****
#define addField( name, value ) \
if( isPersistent ) \
! fields.push_back( QString( "%1='%2'" ).arg( name ).arg( QString::number( value ) ) ); \
else \
{ \
--- 83,87 ----
#define addField( name, value ) \
if( isPersistent ) \
! fields.push_back( name "='" + QString::number(value) + "'" ); \
else \
{ \
***************
*** 108,112 ****
#define addStrField( name, value ) \
if( isPersistent ) \
! fields.push_back( QString( "%1='%2'" ).arg( name ).arg( persistentBroker->quoteString( value ) ) ); \
else \
{ \
--- 92,96 ----
#define addStrField( name, value ) \
if( isPersistent ) \
! fields.push_back( name "='" + persistentBroker->quoteString( value ) + "'" ); \
else \
{ \
***************
*** 120,128 ****
if( isPersistent ) \
{ \
! persistentBroker->executeQuery( QString( "UPDATE %1 SET %2 WHERE %3" ).arg( table ).arg( fields.join( "," ) ).arg( conditions.join( " AND " ) ) ); \
} \
else \
{ \
! persistentBroker->executeQuery( QString( "REPLACE INTO %1 VALUES(%3)" ).arg( table )/*.arg( fields.join( "," ) )*/.arg( values.join( "," ) ) ); \
}
--- 104,112 ----
if( isPersistent ) \
{ \
! persistentBroker->executeQuery( "UPDATE " + table + " SET " + fields.join( "," ) + " WHERE " + conditions.join( " AND " ) ); \
} \
else \
{ \
! persistentBroker->executeQuery( "REPLACE INTO " + table + " VALUES(" + values.join( "," ) + ")" ); \
}
|
|
From: <ri...@us...> - 2003-09-24 02:44:09
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry In directory sc8-pr-cvs1:/tmp/cvs-serv4513/definitions/items/weaponry Modified Files: axes.xml swords.xml Log Message: added some missing items Index: axes.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/axes.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** axes.xml 27 Aug 2003 20:57:52 -0000 1.10 --- axes.xml 24 Sep 2003 02:44:03 -0000 1.11 *************** *** 8,11 **** --- 8,29 ---- --> <definitions> + <!-- Two Handed Axe --> + <item id="1442"> + <id>0x1442</id> + <name>two handed axe</name> + <twohanded /> + <decay /> + <nodye /> + <sellprice>15</sellprice> + <buyprice>31</buyprice> + <attack min="16" max="17" /> + <durability><random min="30" max="62" /></durability> + <speed>31</speed> + <weight>8.0</weight> + <tag name="req_str" value="40" type="int" /> + <events>equipment</events> + <category>Weapons\Axes\Two Handed Axe</category> + <type>1002</type> + </item> <!-- Two Handed Axe --> *************** *** 27,30 **** --- 45,67 ---- <type>1002</type> </item> + + <!-- Large Battle Axe --> + <item id="13fa"> + <id>0x13fa</id> + <name>large battle axe</name> + <twohanded /> + <decay /> + <nodye /> + <sellprice>18</sellprice> + <buyprice>36</buyprice> + <attack min="16" max="17" /> + <durability><random min="30" max="64" /></durability> + <speed>29</speed> + <weight>6.0</weight> + <tag name="req_str" value="80" type="int" /> + <events>equipment</events> + <category>Weapons\Axes\Large Battle Axe</category> + <type>1002</type> + </item> <!-- Large Battle Axe --> *************** *** 141,148 **** --- 178,223 ---- <category>Weapons\Axes\Large Battle Axe</category> </item> + + <!-- Axe --> + <item id="f4a"> + <id>0x0f4a</id> + <name>axe</name> + <twohanded /> + <decay /> + <nodye /> + <sellprice>120</sellprice> + <buyprice>40</buyprice> + <attack min="14" max="16" /> + <durability><random min="30" max="60" /></durability> + <speed>37</speed> + <weight>4.0</weight> + <tag name="req_str" value="35" type="int" /> + <events>equipment</events> + <type>1002</type> + <category>Weapons\Axes\Large Battle Axe</category> + </item> <!-- Double Axe --> <item id="f4b"> <id>0x0f4b</id> + <name>double axe</name> + <twohanded /> + <decay /> + <nodye /> + <sellprice>28</sellprice> + <buyprice>57</buyprice> + <attack min="15" max="17" /> + <durability><random min="50" max="95" /></durability> + <speed>33</speed> + <weight>3.0</weight> + <tag name="req_str" value="45" type="int" /> + <events>equipment</events> + <type>1002</type> + <category>Weapons\Axes\Double Axe</category> + </item> + + <!-- Double Axe --> + <item id="f4c"> + <id>0x0f4c</id> <name>double axe</name> <twohanded /> Index: swords.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swords.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** swords.xml 27 Aug 2003 20:57:53 -0000 1.11 --- swords.xml 24 Sep 2003 02:44:03 -0000 1.12 *************** *** 49,52 **** --- 49,70 ---- <category>Weapons\Swords\Longsword 1</category> </item> + + <!-- Scomitar --> + <item id="13b5"> + <inherit id="swords_base" /> + <name>scimitar</name> + <id>0x13b5</id> + <onehanded /> + <decay /> + <nodye /> + <sellprice>18</sellprice> + <buyprice>36</buyprice> + <attack min="13" max="15" /> + <durability><random min="30" max="76" /></durability> + <speed>37</speed> + <weight>6.0</weight> + <tag name="req_str" value="25" type="int" /> + <category>Weapons\Swords\Scimitar</category> + </item> <!-- Scomitar --> *************** *** 102,105 **** --- 120,159 ---- <tag name="req_str" value="40" type="int" /> <category>Weapons\Swords\Viking Sword (N/S)</category> + </item> + + <!-- Viking Sword --> + <item id="13ba"> + <inherit id="swords_base" /> + <name>viking sword</name> + <id>0x13ba</id> + <onehanded /> + <decay /> + <nodye /> + <sellprice>25</sellprice> + <buyprice>51</buyprice> + <attack min="15" max="17" /> + <durability><random min="30" max="56" /></durability> + <speed>28</speed> + <weight>6.0</weight> + <tag name="req_str" value="40" type="int" /> + <category>Weapons\Swords\Viking Sword (N/S)</category> + </item> + + <!-- Katana --> + <item id="13fe"> + <inherit id="swords_base" /> + <name>katana</name> + <id>0x13fe</id> + <onehanded /> + <decay /> + <nodye /> + <sellprice>16</sellprice> + <buyprice>32</buyprice> + <attack min="11" max="13" /> + <durability><random min="30" max="55" /></durability> + <speed>46</speed> + <weight>6.0</weight> + <tag name="req_str" value="25" type="int" /> + <category>Weapons\Swords\Katana</category> </item> |
|
From: <ri...@us...> - 2003-09-24 02:44:06
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory In directory sc8-pr-cvs1:/tmp/cvs-serv4513/definitions/items/armory Modified Files: chainmail.xml plate.xml Log Message: added some missing items Index: chainmail.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/chainmail.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** chainmail.xml 27 Aug 2003 20:57:52 -0000 1.6 --- chainmail.xml 24 Sep 2003 02:44:03 -0000 1.7 *************** *** 24,27 **** --- 24,45 ---- <category>Armor\Chainmail\Coif</category> </item> + + <!-- Chainmail Coif --> + <item id="13c0"> + <name>chainmail coif</name> + <decay /> + <nodye /> + <tag name="req_str" value="60" type="int" /> + <events>equipment</events> + <defense>4</defense> + <durability><random min="45" max="60" /></durability> + <id>0x13c0</id> + <restock>10</restock> + <smelt>8</smelt> + <weight>7.0</weight> + <buyprice>130</buyprice> + <sellprice>65</sellprice> + <category>Armor\Chainmail\Coif</category> + </item> <!-- Chainmail Leggings --> *************** *** 42,45 **** --- 60,81 ---- <category>Armor\Chainmail\Leggings</category> </item> + + <!-- Chainmail Leggings --> + <item id="13c3"> + <name>chainmail leggings</name> + <decay /> + <nodye /> + <tag name="req_str" value="60" type="int" /> + <events>equipment</events> + <defense>4</defense> + <durability><random min="45" max="60" /></durability> + <id>0x13c3</id> + <restock>10</restock> + <smelt>14</smelt> + <weight>7.0</weight> + <buyprice>166</buyprice> + <sellprice>83</sellprice> + <category>Armor\Chainmail\Leggings</category> + </item> <!-- Chainmail Tunic --> *************** *** 53,56 **** --- 89,109 ---- <durability><random min="45" max="60" /></durability> <id>0x13bf</id> + <restock>10</restock> + <smelt>14</smelt> + <weight>7.0</weight> + <buyprice>103</buyprice> + <category>Armor\Chainmail\Tunic</category> + </item> + + <!-- Chainmail Tunic --> + <item id="13c4"> + <name>chainmail tunic</name> + <decay /> + <nodye /> + <tag name="req_str" value="60" type="int" /> + <events>equipment</events> + <defense>4</defense> + <durability><random min="45" max="60" /></durability> + <id>0x13c4</id> <restock>10</restock> <smelt>14</smelt> Index: plate.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/plate.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** plate.xml 23 Aug 2003 22:05:00 -0000 1.6 --- plate.xml 24 Sep 2003 02:44:03 -0000 1.7 *************** *** 25,28 **** --- 25,45 ---- <category>Armor\Platemail\Female Armor</category> </item> + + <!-- Female Plate Armor --> + <item id="1c05"> + <name>plate armor</name> + <decay /> + <nodye /> + <defense>5</defense> + <durability><random min="50" max="65" /></durability> + <id>0x1C05</id> + <requires type='str'>95</requires> + <restock>10</restock> + <smelt>16</smelt> + <weight>4.0</weight> + <buyprice>245</buyprice> + <sellprice>122</sellprice> + <category>Armor\Platemail\Female Armor</category> + </item> <!-- Male Plate Armor --> *************** *** 42,45 **** --- 59,79 ---- <category>Armor\Platemail\Male Armor</category> </item> + + <!-- Male Plate Armor --> + <item id="1416"> + <name>platemail</name> + <decay /> + <nodye /> + <defense>5</defense> + <durability><random min="50" max="65" /></durability> + <id>0x1416</id> + <requires type='str'>95</requires> + <restock>10</restock> + <smelt>20</smelt> + <weight>10.0</weight> + <buyprice>273</buyprice> + <sellprice>136</sellprice> + <category>Armor\Platemail\Male Armor</category> + </item> <!-- Plate Arms --> *************** *** 59,62 **** --- 93,113 ---- <category>Armor\Platemail\Arms</category> </item> + + <!-- Plate Arms --> + <item id="1417"> + <name>platemail arms</name> + <decay /> + <nodye /> + <defense>5</defense> + <durability><random min="50" max="65" /></durability> + <id>0x1417</id> + <requires type='str'>80</requires> + <restock>10</restock> + <smelt>14</smelt> + <weight>5.0</weight> + <buyprice>181</buyprice> + <sellprice>90</sellprice> + <category>Armor\Platemail\Arms</category> + </item> <!-- Plate Gloves --> *************** *** 76,79 **** --- 127,147 ---- <category>Armor\Platemail\gloves</category> </item> + + <!-- Plate Gloves --> + <item id="1418"> + <name>platemail gloves</name> + <decay /> + <nodye /> + <defense>5</defense> + <durability><random min="50" max="65" /></durability> + <id>0x1418</id> + <requires type='str'>70</requires> + <restock>10</restock> + <smelt>9</smelt> + <weight>2.0</weight> + <buyprice>145</buyprice> + <sellprice>72</sellprice> + <category>Armor\Platemail\gloves</category> + </item> <!-- Plate Gorget --> *************** *** 110,113 **** --- 178,198 ---- <category>Armor\Platemail\helmet</category> </item> + + <!-- Plate Helmet --> + <item id="1419"> + <name>plate helmet</name> + <decay /> + <nodye /> + <defense>5</defense> + <durability><random min="50" max="65" /></durability> + <id>0x1419</id> + <requires type='str'>80</requires> + <restock>10</restock> + <smelt>12</smelt> + <weight>7.0</weight> + <buyprice>170</buyprice> + <sellprice>85</sellprice> + <category>Armor\Platemail\helmet</category> + </item> <!-- Plate Leggings --> *************** *** 119,122 **** --- 204,224 ---- <durability><random min="50" max="65" /></durability> <id>0x1411</id> + <requires type='str'>90</requires> + <restock>10</restock> + <smelt>16</smelt> + <weight>7.0</weight> + <buyprice>218</buyprice> + <sellprice>109</sellprice> + <category>Armor\Platemail\leggings</category> + </item> + + <!-- Plate Leggings --> + <item id="141a"> + <name>platemail legs</name> + <decay /> + <nodye /> + <defense>5</defense> + <durability><random min="50" max="65" /></durability> + <id>0x141a</id> <requires type='str'>90</requires> <restock>10</restock> |
|
From: <dar...@us...> - 2003-09-24 00:13:26
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1:/tmp/cvs-serv13738 Modified Files: wolf.dsp Log Message: Fixed error reporting for python target requests. Added wolfpack.console.log() Gump Error Reporting to go and line breaks for the windows console. Index: wolf.dsp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v retrieving revision 1.238 retrieving revision 1.239 diff -C2 -d -r1.238 -r1.239 *** wolf.dsp 23 Sep 2003 12:40:19 -0000 1.238 --- wolf.dsp 24 Sep 2003 00:13:21 -0000 1.239 *************** *** 64,68 **** # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "C:\Software Engineering\wolfpack\" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 --- 64,68 ---- # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 *************** *** 77,81 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /pdb:"..\wolfpack.pdb" /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none --- 77,81 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none |
|
From: <dar...@us...> - 2003-09-24 00:13:26
|
Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv13738/python
Modified Files:
global.cpp target.h
Log Message:
Fixed error reporting for python target requests.
Added wolfpack.console.log()
Gump Error Reporting to go and line breaks for the windows console.
Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** global.cpp 23 Sep 2003 12:40:19 -0000 1.94
--- global.cpp 24 Sep 2003 00:13:21 -0000 1.95
***************
*** 132,135 ****
--- 132,153 ----
/*!
+ Log a string
+ */
+ static PyObject* wpConsole_log( PyObject* self, PyObject* args )
+ {
+ Q_UNUSED(self);
+
+ char loglevel;
+ char *text;
+
+ if( !PyArg_ParseTuple( args, "bs:wolfpack.console.log( loglevel, text )", &loglevel, &text ) )
+ return 0;
+
+ Console::instance()->log( (eLogLevel)loglevel, text );
+
+ return PyTrue;
+ }
+
+ /*!
Sends a string to the wolfpack console.
*/
***************
*** 244,247 ****
--- 262,266 ----
{ "getbuffer", wpConsole_getbuffer, METH_NOARGS, "Gets the linebuffer of the console" },
{ "reloadScripts", wpConsole_reloadScripts, METH_NOARGS, "Reloads Scripts and Definitions" },
+ { "log", wpConsole_log, METH_VARARGS, NULL },
{ NULL, NULL, 0, NULL } // Terminator
};
Index: target.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** target.h 4 Aug 2003 07:28:18 -0000 1.8
--- target.h 24 Sep 2003 00:13:21 -0000 1.9
***************
*** 128,131 ****
--- 128,132 ----
{
PyObject *pFunc = PyObject_GetAttrString( pModule, const_cast< char* >( sFunction.latin1() ) );
+
if( pFunc && PyCallable_Check( pFunc ) )
{
***************
*** 136,145 ****
PyTuple_SetItem( p_args, 2, PyGetTarget( target, socket->player()->pos().map ) );
! PyEval_CallObject( pFunc, p_args );
!
! if( PyErr_Occurred() )
! PyErr_Print();
}
}
}
--- 137,149 ----
PyTuple_SetItem( p_args, 2, PyGetTarget( target, socket->player()->pos().map ) );
! PyObject *result = PyEval_CallObject( pFunc, p_args );
! Py_XDECREF( result );
! reportPythonError( sModule );
}
+
+ Py_XDECREF( pFunc );
}
+
+ Py_XDECREF( pModule );
}
***************
*** 162,165 ****
--- 166,170 ----
{
PyObject *pFunc = PyObject_GetAttrString( pModule, const_cast< char* >( sFunction.latin1() ) );
+
if( pFunc && PyCallable_Check( pFunc ) )
{
***************
*** 168,177 ****
PyTuple_SetItem( args, 0, PyGetCharObject( socket->player() ) );
! PyEval_CallObject( pFunc, args );
!
! if( PyErr_Occurred() )
! PyErr_Print();
}
}
}
--- 173,185 ----
PyTuple_SetItem( args, 0, PyGetCharObject( socket->player() ) );
! PyObject *result = PyEval_CallObject( pFunc, args );
! Py_XDECREF( result );
! reportPythonError( sModule );
}
+
+ Py_XDECREF( pFunc );
}
+
+ Py_XDECREF( pModule );
}
***************
*** 193,196 ****
--- 201,205 ----
{
PyObject *pFunc = PyObject_GetAttrString( pModule, const_cast< char* >( sFunction.latin1() ) );
+
if( pFunc && PyCallable_Check( pFunc ) )
{
***************
*** 199,208 ****
PyTuple_SetItem( args, 0, PyGetCharObject( socket->player() ) );
! PyEval_CallObject( pFunc, args );
! if( PyErr_Occurred() )
! PyErr_Print();
}
}
}
--- 208,221 ----
PyTuple_SetItem( args, 0, PyGetCharObject( socket->player() ) );
! PyObject *result = PyEval_CallObject( pFunc, args );
! Py_XDECREF( result );
! reportPythonError( sModule );
}
+
+ Py_XDECREF( pFunc );
}
+
+ Py_XDECREF( pModule );
}
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv10621
Modified Files:
Timing.cpp ai_humans.cpp boats.cpp customtags.cpp customtags.h
dbl_single_click.cpp dragdrop.cpp gumps.cpp items.cpp
multis.cpp npc.cpp player.cpp resources.cpp speech.cpp
targetrequests.h uobject.cpp uobject.h
Log Message:
Fixed a saving issue of uobject tags.
Index: Timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Timing.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** Timing.cpp 11 Sep 2003 15:33:58 -0000 1.181
--- Timing.cpp 23 Sep 2003 23:55:19 -0000 1.182
***************
*** 620,631 ****
{
bool ok = false;
! if( pItem->tags().get( "tiller" ).isValid() &&
! pItem->tags().get("gatetime").toInt(&ok) <= currenttime && ok )
{
! cBoat* pBoat = dynamic_cast< cBoat* >( FindItemBySerial( pItem->tags().get( "boatserial" ).toInt() ) );
if( pBoat )
{
pBoat->move();
! pItem->tags().set("gatetime", (int)( currenttime + (double)( SrvParams->boatSpeed() * MY_CLOCKS_PER_SEC ) ) );
}
}
--- 620,631 ----
{
bool ok = false;
! if( pItem->getTag( "tiller" ).isValid() &&
! pItem->getTag("gatetime").toInt(&ok) <= currenttime && ok )
{
! cBoat* pBoat = dynamic_cast< cBoat* >( FindItemBySerial( pItem->getTag( "boatserial" ).toInt() ) );
if( pBoat )
{
pBoat->move();
! pItem->setTag("gatetime", (int)( currenttime + (double)( SrvParams->boatSpeed() * MY_CLOCKS_PER_SEC ) ) );
}
}
Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai_humans.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ai_humans.cpp 23 Sep 2003 15:36:30 -0000 1.3
--- ai_humans.cpp 23 Sep 2003 23:55:19 -0000 1.4
***************
*** 141,148 ****
while( it != content.end() )
{
! if( !(*it)->tags().has( "player" ) || !(*it)->tags().has( "pet" ) )
continue;
! if( (*it) && (*it)->id() == 0x1ea7 && (*it)->tags().get( "player" ).asInt() == pTalker->serial() )
stableitems.push_back( (*it) );
++it;
--- 141,148 ----
while( it != content.end() )
{
! if( !(*it)->hasTag( "player" ) || !(*it)->hasTag( "pet" ) )
continue;
! if( (*it) && (*it)->id() == 0x1ea7 && (*it)->getTag( "player" ).toInt() == pTalker->serial() )
stableitems.push_back( (*it) );
++it;
***************
*** 157,161 ****
if( (*it) )
{
! P_NPC pPet = dynamic_cast<P_NPC>(World::instance()->findChar( (*it)->tags().get( "pet" ).asInt() ));
if( pPet )
{
--- 157,161 ----
if( (*it) )
{
! P_NPC pPet = dynamic_cast<P_NPC>(World::instance()->findChar( (*it)->getTag( "pet" ).toInt() ));
if( pPet )
{
***************
*** 209,214 ****
P_ITEM pGem = new cItem();
pGem->Init( false );
! pGem->tags().set( "player", cVariant( player->serial() ) );
! pGem->tags().set( "pet", cVariant( pPet->serial() ) );
pGem->setId( 0x1ea7 );
pGem->setName( tr("petitem: %1").arg(pPet->name()) );
--- 209,214 ----
P_ITEM pGem = new cItem();
pGem->Init( false );
! pGem->setTag( "player", cVariant( player->serial() ) );
! pGem->setTag( "pet", cVariant( pPet->serial() ) );
pGem->setId( 0x1ea7 );
pGem->setName( tr("petitem: %1").arg(pPet->name()) );
Index: boats.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/boats.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -d -r1.114 -r1.115
*** boats.cpp 8 Sep 2003 10:58:47 -0000 1.114
--- boats.cpp 23 Sep 2003 23:55:19 -0000 1.115
***************
*** 157,164 ****
pTiller->setPriv( 0 );
pTiller->setType( 117 );
! pTiller->tags().set( "tiller", 1 );
! pTiller->tags().set( "boatserial", this->serial() );
this->itemserials[ TILLER ] = pTiller->serial();
! pTiller->tags().set("gatetime", (int)(uiCurrentTime + (double)(SrvParams->boatSpeed()*MY_CLOCKS_PER_SEC)));
}
--- 157,164 ----
pTiller->setPriv( 0 );
pTiller->setType( 117 );
! pTiller->setTag( "tiller", 1 );
! pTiller->setTag( "boatserial", this->serial() );
this->itemserials[ TILLER ] = pTiller->serial();
! pTiller->setTag("gatetime", (int)(uiCurrentTime + (double)(SrvParams->boatSpeed()*MY_CLOCKS_PER_SEC)));
}
***************
*** 172,176 ****
pPlankR->MoveTo( this->pos().x + itemoffsets[0][ PORT_PLANK ][X], this->pos().y + itemoffsets[0][ PORT_PLANK ][Y], this->pos().z );
pPlankR->setPriv( 0 );
! pPlankR->tags().set( "boatserial", this->serial() );
this->itemserials[ PORT_PLANK ] = pPlankR->serial();
}
--- 172,176 ----
pPlankR->MoveTo( this->pos().x + itemoffsets[0][ PORT_PLANK ][X], this->pos().y + itemoffsets[0][ PORT_PLANK ][Y], this->pos().z );
pPlankR->setPriv( 0 );
! pPlankR->setTag( "boatserial", this->serial() );
this->itemserials[ PORT_PLANK ] = pPlankR->serial();
}
***************
*** 185,189 ****
pPlankL->MoveTo( this->pos().x + itemoffsets[0][ STARB_PLANK ][X], this->pos().y + itemoffsets[0][ STARB_PLANK ][Y], this->pos().z );
pPlankL->setPriv( 0 );
! pPlankL->tags().set( "boatserial", this->serial() );
this->itemserials[ STARB_PLANK ] = pPlankL->serial();
}
--- 185,189 ----
pPlankL->MoveTo( this->pos().x + itemoffsets[0][ STARB_PLANK ][X], this->pos().y + itemoffsets[0][ STARB_PLANK ][Y], this->pos().z );
pPlankL->setPriv( 0 );
! pPlankL->setTag( "boatserial", this->serial() );
this->itemserials[ STARB_PLANK ] = pPlankL->serial();
}
***************
*** 197,201 ****
pHold->MoveTo( this->pos().x + itemoffsets[0][ HOLD ][X], this->pos().y + itemoffsets[0][ HOLD ][Y], this->pos().z );
pHold->setPriv( 0 );
! pHold->tags().set( "boatserial", this->serial() );
this->itemserials[ HOLD ] = pHold->serial();
}
--- 197,201 ----
pHold->MoveTo( this->pos().x + itemoffsets[0][ HOLD ][X], this->pos().y + itemoffsets[0][ HOLD ][Y], this->pos().z );
pHold->setPriv( 0 );
! pHold->setTag( "boatserial", this->serial() );
this->itemserials[ HOLD ] = pHold->serial();
}
Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** customtags.cpp 23 Sep 2003 12:40:18 -0000 1.32
--- customtags.cpp 23 Sep 2003 23:55:19 -0000 1.33
***************
*** 744,748 ****
}
! bool cCustomTags::has( const QString &key )
{
if( tags_ )
--- 744,748 ----
}
! bool cCustomTags::has( const QString &key ) const
{
if( tags_ )
***************
*** 755,759 ****
}
! cVariant cCustomTags::get( const QString& key )
{
if( tags_ )
--- 755,759 ----
}
! const cVariant &cCustomTags::get( const QString& key ) const
{
if( tags_ )
***************
*** 764,771 ****
}
! return cVariant();
}
! void cCustomTags::set( const QString& key, const cVariant& value )
{
if( !tags_ )
--- 764,771 ----
}
! return cVariant::null;
}
! void cCustomTags::set( const QString& key, const cVariant& value )
{
if( !tags_ )
***************
*** 814,818 ****
}
! QStringList cCustomTags::getKeys( void )
{
if( tags_ )
--- 814,818 ----
}
! QStringList cCustomTags::getKeys( void ) const
{
if( tags_ )
***************
*** 839,840 ****
--- 839,842 ----
delete tags_;
}
+
+ cVariant cVariant::null;
Index: customtags.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** customtags.h 27 Aug 2003 20:35:10 -0000 1.20
--- customtags.h 23 Sep 2003 23:55:20 -0000 1.21
***************
*** 53,56 ****
--- 53,58 ----
{
public:
+ static cVariant null;
+
enum Type
{
***************
*** 152,157 ****
void load( SERIAL key );
! cVariant get( const QString& key );
! bool has( const QString& key );
void set( const QString& key, const cVariant& value );
void remove( const QString& key );
--- 154,159 ----
void load( SERIAL key );
! const cVariant &get( const QString& key ) const;
! bool has( const QString& key ) const;
void set( const QString& key, const cVariant& value );
void remove( const QString& key );
***************
*** 159,167 ****
UI32 size( void ) { return tags_ ? this->tags_->size() : 0; }
! QStringList getKeys( void );
QValueList< cVariant > getValues( void );
! bool getChanged( void )
{
return changed;
--- 161,169 ----
UI32 size( void ) { return tags_ ? this->tags_->size() : 0; }
! QStringList getKeys( void ) const;
QValueList< cVariant > getValues( void );
! bool getChanged( void ) const
{
return changed;
Index: dbl_single_click.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbl_single_click.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -C2 -d -r1.225 -r1.226
*** dbl_single_click.cpp 15 Sep 2003 12:49:05 -0000 1.225
--- dbl_single_click.cpp 23 Sep 2003 23:55:20 -0000 1.226
***************
*** 121,125 ****
{
// Innocent Corpse?
! if( pi->tags().has( "notority" ) && pi->tags().get( "notority" ).asInt() == 1 )
{
pc_currchar->makeCriminal();
--- 121,125 ----
{
// Innocent Corpse?
! if( pi->hasTag( "notority" ) && pi->getTag( "notority" ).toInt() == 1 )
{
pc_currchar->makeCriminal();
***************
*** 208,212 ****
pc_currchar->action( 0x20 );
! pc_currchar->emote( tr( "*%1 loots the body of %2*" ).arg( pc_currchar->name() ).arg( pi->tags().get( "name" ).toString() ), 0x26 );
}
--- 208,212 ----
pc_currchar->action( 0x20 );
! pc_currchar->emote( tr( "*%1 loots the body of %2*" ).arg( pc_currchar->name() ).arg( pi->getTag( "name" ).toString() ), 0x26 );
}
***************
*** 288,294 ****
if( pc_currchar->inRange( pi, 3 ) )
{
! if (pi->tags().get("boatserial").isValid())
{
! cBoat* pBoat = dynamic_cast< cBoat* >(FindItemBySerial( pi->tags().get("boatserial").toInt() ) );
pBoat->handlePlankClick( socket, pi );
}
--- 288,294 ----
if( pc_currchar->inRange( pi, 3 ) )
{
! if (pi->getTag("boatserial").isValid())
{
! cBoat* pBoat = dynamic_cast< cBoat* >(FindItemBySerial( pi->getTag("boatserial").toInt() ) );
pBoat->handlePlankClick( socket, pi );
}
***************
*** 507,511 ****
if ((pi->type() != 103) &&(pi->type() != 202))
{
! const cElement *section = DefManager->getDefinition( WPDT_MULTI, pi->tags().get( "multisection" ).toString() );
if( section )
--- 507,511 ----
if ((pi->type() != 103) &&(pi->type() != 202))
{
! const cElement *section = DefManager->getDefinition( WPDT_MULTI, pi->getTag( "multisection" ).toString() );
if( section )
***************
*** 525,529 ****
if( houseid != 0 )
! socket->attachTarget( new cBuildMultiTarget( pi->tags().get( "multisection" ).toString() , pc_currchar->serial(), pi->serial() ), houseid );
}
}
--- 525,529 ----
if( houseid != 0 )
! socket->attachTarget( new cBuildMultiTarget( pi->getTag( "multisection" ).toString() , pc_currchar->serial(), pi->serial() ), houseid );
}
}
Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** dragdrop.cpp 23 Sep 2003 11:53:31 -0000 1.204
--- dragdrop.cpp 23 Sep 2003 23:55:20 -0000 1.205
***************
*** 130,134 ****
bool sameGuild = true;//( GuildCompare( pChar, outmostCont->owner() ) != 0 );
! if( outmostCont->tags().has( "notority" ) && outmostCont->tags().get( "notority" ).asInt() == 1 &&
!pChar->Owns( outmostCont ) && !sameGuild )
{
--- 130,134 ----
bool sameGuild = true;//( GuildCompare( pChar, outmostCont->owner() ) != 0 );
! if( outmostCont->hasTag( "notority" ) && outmostCont->getTag( "notority" ).toInt() == 1 &&
!pChar->Owns( outmostCont ) && !sameGuild )
{
Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** gumps.cpp 11 Sep 2003 16:19:50 -0000 1.144
--- gumps.cpp 23 Sep 2003 23:55:21 -0000 1.145
***************
*** 205,209 ****
if( object )
{
! QStringList allkeys = object->tags().getKeys();
UINT32 page_ = 0;
--- 205,209 ----
if( object )
{
! QStringList allkeys = object->getTags();
UINT32 page_ = 0;
***************
*** 245,249 ****
for( i = 0; i < thiskeys; i++ )
{
! addText( 50, 120 + i * 20, tr( "Tag \"%1\": %2" ).arg( keys[i] ).arg( object->tags().get( keys[i] ).asString() ), 0x834 );
}
--- 245,249 ----
for( i = 0; i < thiskeys; i++ )
{
! addText( 50, 120 + i * 20, tr( "Tag \"%1\": %2" ).arg( keys[i] ).arg( object->getTag( keys[i] ).toString() ), 0x834 );
}
Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.355
retrieving revision 1.356
diff -C2 -d -r1.355 -r1.356
*** items.cpp 23 Sep 2003 12:40:18 -0000 1.355
--- items.cpp 23 Sep 2003 23:55:23 -0000 1.356
***************
*** 117,123 ****
this->time_unused=src.time_unused;
this->timeused_last=getNormalizedTime();
- // We're *NOT* copying the contents over
-
- this->setTags( src.tags() );
this->container_ = src.container_;
this->totalweight_ = src.totalweight_;
--- 117,120 ----
***************
*** 407,421 ****
void cItem::save()
{
- /* if( decaytime_ > 0 && !changed_ )
- {
- initSave;
- setTable( "items" );
-
- addField("decaytime", (decaytime_ > uiCurrentTime) ? decaytime_ - uiCurrentTime : 0 );
-
- addCondition( "serial", serial() );
- saveFields;
- }
- */
if ( changed_ )
{
--- 404,407 ----
***************
*** 1419,1425 ****
// Show RepSys Settings of Victim when killed
! if( corpse() && tags_.has( "notority" ) )
{
! int notority = tags_.get( "notority" ).asInt();
if( notority == 1 )
--- 1405,1411 ----
// Show RepSys Settings of Victim when killed
! if( corpse() && hasTag( "notority" ) )
{
! int notority = getTag( "notority" ).toInt();
if( notority == 1 )
Index: multis.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/multis.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** multis.cpp 13 Sep 2003 13:27:26 -0000 1.34
--- multis.cpp 23 Sep 2003 23:55:23 -0000 1.35
***************
*** 353,357 ****
if( pKey )
{
! pKey->tags().set( "linkserial", this->serial() );
pKey->setType( 7 );
pKey->setNewbie( true );
--- 353,357 ----
if( pKey )
{
! pKey->setTag( "linkserial", this->serial() );
pKey->setType( 7 );
pKey->setNewbie( true );
***************
*** 369,373 ****
if( pKey )
{
! pKey->tags().set( "linkserial", this->serial() );
pKey->setType( 7 );
// pKey->priv = 2; dont newbie these 3 bank box keys
--- 369,373 ----
if( pKey )
{
! pKey->setTag( "linkserial", this->serial() );
pKey->setType( 7 );
// pKey->priv = 2; dont newbie these 3 bank box keys
***************
*** 388,392 ****
for( pi = iter_items.first(); pi; pi = iter_items.next() )
{
! if( pi && pi->type() == 7 && pi->tags().get( "linkserial" ).isValid() && pi->tags().get( "linkserial" ).toInt() == this->serial() )
todelete.append( pi );
}
--- 388,392 ----
for( pi = iter_items.first(); pi; pi = iter_items.next() )
{
! if( pi && pi->type() == 7 && pi->getTag( "linkserial" ).isValid() && pi->getTag( "linkserial" ).toInt() == this->serial() )
todelete.append( pi );
}
***************
*** 417,423 ****
if( pi->type() == 7 )
{
! if( pi->tags().get( "linkserial" ).isValid() )
{
! SERIAL si = pi->tags().get( "linkserial" ).toInt();
if( si == this->serial() )
{
--- 417,423 ----
if( pi->type() == 7 )
{
! if( pi->getTag( "linkserial" ).isValid() )
{
! SERIAL si = pi->getTag( "linkserial" ).toInt();
if( si == this->serial() )
{
Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** npc.cpp 23 Sep 2003 15:36:30 -0000 1.48
--- npc.cpp 23 Sep 2003 23:55:23 -0000 1.49
***************
*** 549,554 ****
corpse->setBodyId( orgBodyID_ );
corpse->setCarve( carve() ); //store carve section
! corpse->tags().set( "human", cVariant( isHuman() ? 1 : 0 ) );
! corpse->tags().set( "name", cVariant( name() ) );
corpse->moveTo( pos() );
--- 549,554 ----
corpse->setBodyId( orgBodyID_ );
corpse->setCarve( carve() ); //store carve section
! corpse->setTag( "human", cVariant( isHuman() ? 1 : 0 ) );
! corpse->setTag( "name", cVariant( name() ) );
corpse->moveTo( pos() );
Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** player.cpp 23 Sep 2003 12:40:18 -0000 1.43
--- player.cpp 23 Sep 2003 23:55:24 -0000 1.44
***************
*** 546,560 ****
// Will display the right color
if( isInnocent() )
! corpse->tags().set( "notority", cVariant( 1 ) );
else if( isCriminal() )
! corpse->tags().set( "notority", cVariant( 2 ) );
else if( isMurderer() )
! corpse->tags().set( "notority", cVariant( 3 ) );
corpse->setOwner( this );
corpse->setBodyId( orgBodyID_ );
! corpse->tags().set( "human", cVariant( isHuman() ? 1 : 0 ) );
! corpse->tags().set( "name", cVariant( name() ) );
corpse->moveTo( pos() );
--- 546,560 ----
// Will display the right color
if( isInnocent() )
! corpse->setTag( "notority", cVariant( 1 ) );
else if( isCriminal() )
! corpse->setTag( "notority", cVariant( 2 ) );
else if( isMurderer() )
! corpse->setTag( "notority", cVariant( 3 ) );
corpse->setOwner( this );
corpse->setBodyId( orgBodyID_ );
! corpse->setTag( "human", cVariant( isHuman() ? 1 : 0 ) );
! corpse->setTag( "name", cVariant( name() ) );
corpse->moveTo( pos() );
***************
*** 687,691 ****
if( pi && !pi->free )
{
! P_NPC pMount = dynamic_cast<P_NPC>( FindCharBySerial( pi->tags().get( "pet" ).asInt() ) );
if( pMount )
{
--- 687,691 ----
if( pi && !pi->free )
{
! P_NPC pMount = dynamic_cast<P_NPC>( FindCharBySerial( pi->getTag( "pet" ).toInt() ) );
if( pMount )
{
***************
*** 694,702 ****
pMount->setWanderY1( pi->pos().y );
pMount->setWanderRadius( pi->pos().z );
! pMount->setBodyID( pi->tags().get( "body" ).asInt() );
pMount->setDirection( direction() );
! pMount->setStrength( pi->tags().get( "strength" ).toInt() );
! pMount->setDexterity( pi->tags().get( "dexterity" ).toInt() );
! pMount->setIntelligence( pi->tags().get( "intelligence" ).toInt() );
pMount->setHitpoints( pi->hp() );
pMount->setFame( pi->lodamage() );
--- 694,702 ----
pMount->setWanderY1( pi->pos().y );
pMount->setWanderRadius( pi->pos().z );
! pMount->setBodyID( pi->getTag( "body" ).toInt() );
pMount->setDirection( direction() );
! pMount->setStrength( pi->getTag( "strength" ).toInt() );
! pMount->setDexterity( pi->getTag( "dexterity" ).toInt() );
! pMount->setIntelligence( pi->getTag( "intelligence" ).toInt() );
pMount->setHitpoints( pi->hp() );
pMount->setFame( pi->lodamage() );
***************
*** 785,795 ****
pMountItem->setPos( position );
! pMountItem->tags().set( "pet", cVariant( pMount->serial() ) );
! pMountItem->tags().set( "body", cVariant( pMount->bodyID() ) );
! pMountItem->tags().set( "wanderType", (int)pMount->wanderType() );
! pMountItem->tags().set( "strength", pMount->strength() );
! pMountItem->tags().set( "dexterity", pMount->dexterity() );
! pMountItem->tags().set( "intelligence", pMount->intelligence() );
pMountItem->setHp( pMount->hitpoints() );
--- 785,795 ----
pMountItem->setPos( position );
! pMountItem->setTag( "pet", cVariant( pMount->serial() ) );
! pMountItem->setTag( "body", cVariant( pMount->bodyID() ) );
! pMountItem->setTag( "wanderType", (int)pMount->wanderType() );
! pMountItem->setTag( "strength", pMount->strength() );
! pMountItem->setTag( "dexterity", pMount->dexterity() );
! pMountItem->setTag( "intelligence", pMount->intelligence() );
pMountItem->setHp( pMount->hitpoints() );
Index: resources.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/resources.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** resources.cpp 11 Sep 2003 16:19:50 -0000 1.47
--- resources.cpp 23 Sep 2003 23:55:24 -0000 1.48
***************
*** 658,662 ****
}
! if( pResItem && !( pResItem->tags().has( "vein" ) || pResItem->tags().has( "amount" ) ) )
pResItem = 0;
--- 658,662 ----
}
! if( pResItem && !( pResItem->hasTag( "vein" ) || pResItem->hasTag( "amount" ) ) )
pResItem = 0;
***************
*** 781,785 ****
}
! amount = pResItem->tags().get( "amount" ).asInt();
if( amount == 0 )
{
--- 781,785 ----
}
! amount = pResItem->getTag( "amount" ).toInt();
if( amount == 0 )
{
***************
*** 795,799 ****
return;
}
! vein = pResItem->tags().get( "vein" ).asInt();
--- 795,799 ----
return;
}
! vein = pResItem->getTag( "vein" ).toInt();
***************
*** 880,884 ****
amount -= spawnamount;
! pResItem->tags().set( "amount", cVariant( (int)amount ) );
if( amount == 0 )
{
--- 880,884 ----
amount -= spawnamount;
! pResItem->setTag( "amount", cVariant( (int)amount ) );
if( amount == 0 )
{
***************
*** 1188,1193 ****
}
! tags().set( "amount", cVariant( (int)amount ) );
! tags().set( "vein", cVariant( (int)vein ) );
this->setId( 0x1ea7 );
--- 1188,1193 ----
}
! setTag( "amount", cVariant( (int)amount ) );
! setTag( "vein", cVariant( (int)vein ) );
this->setId( 0x1ea7 );
Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** speech.cpp 23 Sep 2003 12:40:18 -0000 1.159
--- speech.cpp 23 Sep 2003 23:55:24 -0000 1.160
***************
*** 781,787 ****
continue;
! if( pi->type() == 117 && pi->tags().get( "tiller" ).toInt() == 1 )
{
! cBoat* pBoat = dynamic_cast< cBoat* >(FindItemBySerial( pi->tags().get("boatserial").toInt() ));
if( pBoat )
pboats.append( pBoat );
--- 781,787 ----
continue;
! if( pi->type() == 117 && pi->getTag( "tiller" ).toInt() == 1 )
{
! cBoat* pBoat = dynamic_cast< cBoat* >(FindItemBySerial( pi->getTag("boatserial").toInt() ));
if( pBoat )
pboats.append( pBoat );
Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** targetrequests.h 7 Sep 2003 19:07:47 -0000 1.46
--- targetrequests.h 23 Sep 2003 23:55:24 -0000 1.47
***************
*** 329,335 ****
{
if( type_ )
! pChar->tags().set( key_, cVariant( value_.toInt() ) );
else
! pChar->tags().set( key_, cVariant( value_ ) );
}
return true;
--- 329,335 ----
{
if( type_ )
! pChar->setTag( key_, cVariant( value_.toInt() ) );
else
! pChar->setTag( key_, cVariant( value_ ) );
}
return true;
***************
*** 341,347 ****
{
if( type_ )
! pItem->tags().set( key_, cVariant( value_.toInt() ) );
else
! pItem->tags().set( key_, cVariant( value_ ) );
}
return true;
--- 341,347 ----
{
if( type_ )
! pItem->setTag( key_, cVariant( value_.toInt() ) );
else
! pItem->setTag( key_, cVariant( value_ ) );
}
return true;
***************
*** 369,373 ****
if( pChar )
{
! socket->sysMessage( tr("Tag \"%1\" has value \"%2\".").arg( key_ ).arg( pChar->tags().get( key_ ).asString() ) );
}
return true;
--- 369,373 ----
if( pChar )
{
! socket->sysMessage( tr("Tag \"%1\" has value \"%2\".").arg( key_ ).arg( pChar->getTag( key_ ).toString() ) );
}
return true;
***************
*** 378,382 ****
if( pItem )
{
! socket->sysMessage( tr("Tag \"%1\" has value \"%2\".").arg( key_ ).arg( pItem->tags().get( key_ ).asString() ) );
}
return true;
--- 378,382 ----
if( pItem )
{
! socket->sysMessage( tr("Tag \"%1\" has value \"%2\".").arg( key_ ).arg( pItem->getTag( key_ ).toString() ) );
}
return true;
***************
*** 406,414 ****
if( key_.lower() == "all" )
{
! QStringList keys = pChar->tags().getKeys();
QStringList::const_iterator it = keys.begin();
while( it != keys.end() )
{
! pChar->tags().remove( (*it) );
it++;
}
--- 406,414 ----
if( key_.lower() == "all" )
{
! QStringList keys = pChar->getTags();
QStringList::const_iterator it = keys.begin();
while( it != keys.end() )
{
! pChar->removeTag( (*it) );
it++;
}
***************
*** 417,421 ****
else
{
! pChar->tags().remove( key_ );
socket->sysMessage( tr("Tag \"%1\" removed.").arg( key_ ) );
}
--- 417,421 ----
else
{
! pChar->removeTag( key_ );
socket->sysMessage( tr("Tag \"%1\" removed.").arg( key_ ) );
}
***************
*** 430,438 ****
if( key_.lower() == "all" )
{
! QStringList keys = pItem->tags().getKeys();
QStringList::const_iterator it = keys.begin();
while( it != keys.end() )
{
! pItem->tags().remove( (*it) );
it++;
}
--- 430,438 ----
if( key_.lower() == "all" )
{
! QStringList keys = pItem->getTags();
QStringList::const_iterator it = keys.begin();
while( it != keys.end() )
{
! pItem->removeTag( (*it) );
it++;
}
***************
*** 441,445 ****
else
{
! pItem->tags().remove( key_ );
socket->sysMessage( tr("Tag \"%1\" removed.").arg( key_ ) );
}
--- 441,445 ----
else
{
! pItem->removeTag( key_ );
socket->sysMessage( tr("Tag \"%1\" removed.").arg( key_ ) );
}
Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** uobject.cpp 23 Sep 2003 12:40:19 -0000 1.116
--- uobject.cpp 23 Sep 2003 23:55:24 -0000 1.117
***************
*** 686,687 ****
--- 686,715 ----
return dir;
}
+
+ const cVariant &cUObject::getTag( const QString& key ) const
+ {
+ return tags_.get( key );
+ }
+
+ bool cUObject::hasTag( const QString& key )
+ {
+ changed_ = true;
+ return tags_.has( key );
+ }
+
+ void cUObject::setTag( const QString& key, const cVariant& value )
+ {
+ tags_.set( key, value );
+ changed_ = true;
+ }
+
+ void cUObject::removeTag( const QString& key )
+ {
+ changed_ = true;
+ tags_.remove( key );
+ }
+
+ QStringList cUObject::getTags() const
+ {
+ return tags_.getKeys();
+ }
Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** uobject.h 13 Sep 2003 13:37:15 -0000 1.75
--- uobject.h 23 Sep 2003 23:55:24 -0000 1.76
***************
*** 64,67 ****
--- 64,68 ----
private:
uchar changed_:1;
+ cCustomTags tags_;
protected:
***************
*** 71,76 ****
Coord_cl pos_;
SERIAL serial_;
! SERIAL multis_;
! cCustomTags tags_;
uchar dir_:3;
--- 72,76 ----
Coord_cl pos_;
SERIAL serial_;
! SERIAL multis_;
uchar dir_:3;
***************
*** 99,102 ****
--- 99,110 ----
}
+ // Forwarder for the tags
+ const cVariant &getTag( const QString& key ) const;
+ bool hasTag( const QString& key );
+ void setTag( const QString& key, const cVariant& value );
+ void removeTag( const QString& key );
+ void clearTags();
+ QStringList getTags() const;
+
void clearEvents();
void addEvent( cPythonScript *Event );
***************
*** 142,147 ****
SERIAL serial() const { return serial_; }
SERIAL multis() const { return multis_; }
- cCustomTags tags() const { return tags_; }
- cCustomTags& tags() { return tags_; }
UINT32 getTooltip() const { return tooltip_; }
uchar direction() const { return dir_; }
--- 150,153 ----
***************
*** 151,155 ****
void setPos( const Coord_cl& d ) { pos_ = d; changed_ = true; }
void setMultis( const SERIAL d ) { multis_ = d; changed_ = true; }
- void setTags( const cCustomTags& d ) { tags_ = d; changed_ = true; changed( TOOLTIP ); }
virtual void setSerial( SERIAL d ) { serial_ = d; changed_ = true; }
void setTooltip( const UINT32 d ) { tooltip_ = d; }
--- 157,160 ----
|
|
From: <dar...@us...> - 2003-09-23 23:55:31
|
Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv10621/python
Modified Files:
char.cpp item.cpp multi.cpp socket.cpp
Log Message:
Fixed a saving issue of uobject tags.
Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** char.cpp 23 Sep 2003 12:40:19 -0000 1.106
--- char.cpp 23 Sep 2003 23:55:25 -0000 1.107
***************
*** 643,647 ****
QString key = getArgStr( 0 );
! cVariant value = self->pChar->tags().get( key );
if( value.type() == cVariant::String )
--- 643,647 ----
QString key = getArgStr( 0 );
! cVariant value = self->pChar->getTag( key );
if( value.type() == cVariant::String )
***************
*** 672,687 ****
if( PyString_Check( object ) )
{
! self->pChar->tags().remove( key );
! self->pChar->tags().set( key, cVariant( PyString_AsString( object ) ) );
}
else if( PyInt_Check( object ) )
{
! self->pChar->tags().remove( key );
! self->pChar->tags().set( key, cVariant( (int)PyInt_AsLong( object ) ) );
}
else if( PyFloat_Check( object ) )
{
! self->pChar->tags().remove( key );
! self->pChar->tags().set( key, cVariant( (double)PyFloat_AsDouble( object ) ) );
}
--- 672,687 ----
if( PyString_Check( object ) )
{
! self->pChar->removeTag( key );
! self->pChar->setTag( key, cVariant( PyString_AsString( object ) ) );
}
else if( PyInt_Check( object ) )
{
! self->pChar->removeTag( key );
! self->pChar->setTag( key, cVariant( (int)PyInt_AsLong( object ) ) );
}
else if( PyFloat_Check( object ) )
{
! self->pChar->removeTag( key );
! self->pChar->setTag( key, cVariant( (double)PyFloat_AsDouble( object ) ) );
}
***************
*** 705,709 ****
QString key = getArgStr( 0 );
! return self->pChar->tags().get( key ).isValid() ? PyTrue : PyFalse;
}
--- 705,709 ----
QString key = getArgStr( 0 );
! return self->pChar->getTag( key ).isValid() ? PyTrue : PyFalse;
}
***************
*** 723,727 ****
QString key = getArgStr( 0 );
! self->pChar->tags().remove( key );
return PyTrue;
--- 723,727 ----
QString key = getArgStr( 0 );
! self->pChar->removeTag( key );
return PyTrue;
Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** item.cpp 23 Sep 2003 12:40:19 -0000 1.75
--- item.cpp 23 Sep 2003 23:55:25 -0000 1.76
***************
*** 343,347 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! cVariant value = self->pItem->tags().get( key );
if( value.type() == cVariant::String )
--- 343,347 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! cVariant value = self->pItem->getTag( key );
if( value.type() == cVariant::String )
***************
*** 377,386 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pItem->tags().remove( key );
if( checkArgStr( 1 ) )
! self->pItem->tags().set( key, cVariant( QString( getArgStr( 1 ) ) ) );
else if( checkArgInt( 1 ) )
! self->pItem->tags().set( key, cVariant( (int)getArgInt( 1 ) ) );
return PyTrue;
--- 377,386 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pItem->removeTag( key );
if( checkArgStr( 1 ) )
! self->pItem->setTag( key, cVariant( QString( getArgStr( 1 ) ) ) );
else if( checkArgInt( 1 ) )
! self->pItem->setTag( key, cVariant( (int)getArgInt( 1 ) ) );
return PyTrue;
***************
*** 403,407 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! return self->pItem->tags().get( key ).isValid() ? PyTrue : PyFalse;
}
--- 403,407 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! return self->pItem->getTag( key ).isValid() ? PyTrue : PyFalse;
}
***************
*** 421,425 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pItem->tags().remove( key );
return PyTrue;
--- 421,425 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pItem->removeTag( key );
return PyTrue;
Index: multi.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/multi.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** multi.cpp 23 Sep 2003 12:40:20 -0000 1.19
--- multi.cpp 23 Sep 2003 23:55:25 -0000 1.20
***************
*** 299,303 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! cVariant value = self->pMulti->tags().get( key );
if( value.type() == cVariant::String )
--- 299,303 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! cVariant value = self->pMulti->getTag( key );
if( value.type() == cVariant::String )
***************
*** 333,342 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pMulti->tags().remove( key );
if( checkArgStr( 1 ) )
! self->pMulti->tags().set( key, cVariant( QString( getArgStr( 1 ) ) ) );
else if( checkArgInt( 1 ) )
! self->pMulti->tags().set( key, cVariant( (int)getArgInt( 1 ) ) );
return PyTrue;
--- 333,342 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pMulti->removeTag( key );
if( checkArgStr( 1 ) )
! self->pMulti->setTag( key, cVariant( QString( getArgStr( 1 ) ) ) );
else if( checkArgInt( 1 ) )
! self->pMulti->setTag( key, cVariant( (int)getArgInt( 1 ) ) );
return PyTrue;
***************
*** 359,363 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! return self->pMulti->tags().get( key ).isValid() ? PyTrue : PyFalse;
}
--- 359,363 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! return self->pMulti->getTag( key ).isValid() ? PyTrue : PyFalse;
}
***************
*** 377,381 ****
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pMulti->tags().remove( key );
return PyTrue;
--- 377,381 ----
QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! self->pMulti->removeTag( key );
return PyTrue;
Index: socket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** socket.cpp 15 Sep 2003 12:49:05 -0000 1.43
--- socket.cpp 23 Sep 2003 23:55:25 -0000 1.44
***************
*** 344,348 ****
cUOTxStartCustomHouse custom;
! custom.setSerial( signpost->tags().get( "house" ).asInt() ); // Morex of signpost contain serial of house
self->pSock->send( &custom );
return PyTrue;
--- 344,348 ----
cUOTxStartCustomHouse custom;
! custom.setSerial( signpost->getTag( "house" ).toInt() ); // Morex of signpost contain serial of house
self->pSock->send( &custom );
return PyTrue;
***************
*** 588,592 ****
QString key = getArgStr( 0 );
! return self->pSock->tags().get( key ).isValid() ? PyTrue : PyFalse;
}
--- 588,592 ----
QString key = getArgStr( 0 );
! return self->pSock->tags().has( key ) ? PyTrue : PyFalse;
}
|
|
From: <xs...@us...> - 2003-09-23 15:37:18
|
Update of /cvsroot/wpdev/xmlscripts
In directory sc8-pr-cvs1:/tmp/cvs-serv5641
Modified Files:
wolfpack.sql
Log Message:
guard fixes
Index: wolfpack.sql
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/wolfpack.sql,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wolfpack.sql 12 Sep 2003 22:12:41 -0000 1.26
--- wolfpack.sql 23 Sep 2003 15:37:13 -0000 1.27
***************
*** 140,144 ****
owner int(11) NOT NULL default '-1',
visible tinyint(3) NOT NULL default '0',
! spawn int(11) NOT NULL default '-1',
priv tinyint(3) NOT NULL default '0',
sellprice int(11) NOT NULL default '0',
--- 140,144 ----
owner int(11) NOT NULL default '-1',
visible tinyint(3) NOT NULL default '0',
! spawnregion varchar(255) default NULL,
priv tinyint(3) NOT NULL default '0',
sellprice int(11) NOT NULL default '0',
***************
*** 240,259 ****
);
! CREATE TABLE `effects` (
! `id` int(11) NOT NULL default '0',
! `objectid` varchar(64) NOT NULL default '',
! `expiretime` int(11) NOT NULL default '0',
! `dispellable` tinyint(4) NOT NULL default '0',
! `source` int(11) NOT NULL default '-1',
! `destination` int(11) NOT NULL default '-1',
! PRIMARY KEY (`id`)
);
! CREATE TABLE `effects_properties` (
! `id` int(11) NOT NULL default '0',
! `key` varchar(64) NOT NULL default '',
! `type` varchar(64) NOT NULL default '',
! `value` text NOT NULL,
! PRIMARY KEY (`id`,`key`)
);
--- 240,259 ----
);
! CREATE TABLE effects (
! id int(11) NOT NULL default '0',
! objectid varchar(64) NOT NULL default '',
! expiretime int(11) NOT NULL default '0',
! dispellable tinyint(4) NOT NULL default '0',
! source int(11) NOT NULL default '-1',
! destination int(11) NOT NULL default '-1',
! PRIMARY KEY (id)
);
! CREATE TABLE effects_properties (
! id int(11) NOT NULL default '0',
! key varchar(64) NOT NULL default '',
! type varchar(64) NOT NULL default '',
! value text NOT NULL,
! PRIMARY KEY (id,key)
);
|
