From 9e85fde9b0f5991c59991305166e2324ef68ce1b Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Sun, 9 Jan 2011 22:22:14 +0100 Subject: removing debug messages in caul --- npc/018-2_Woodland_mining_camp/caul.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/npc/018-2_Woodland_mining_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt index c0b84544..2949c0e9 100644 --- a/npc/018-2_Woodland_mining_camp/caul.txt +++ b/npc/018-2_Woodland_mining_camp/caul.txt @@ -942,10 +942,6 @@ L_check_explosion: // and multiply with 3 so there is definitly no chance to get it directly after starting set @prob, (@prob * @prob) * 2; L_check_exp_nof: - - //TODO remove next message: - mes "check explosion: + " +@prob +" / 1000"; - // in about 95% of the cases anything is fine, so return. if (rand(1000) > @prob) return; // in some cases it is not: -- cgit v1.2.3-70-g09d2 From 2b2685503367928bd1fb0aece83bdd554a2cce0b Mon Sep 17 00:00:00 2001 From: Wombat Date: Sat, 8 Jan 2011 07:00:13 -0500 Subject: January 2011 news.txt and dialog fix on frozenbeard. News update and frozenbeard makes a more specific reference about his ship. --- news.txt | 35 +++++++++++++++++++++++++++++++++++ npc/031-1_NivalisPort/frozenbeard.txt | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/news.txt b/news.txt index 2de7715b..05719fbd 100644 --- a/news.txt +++ b/news.txt @@ -1,4 +1,39 @@ ##2 ~ The Hurnscald Herald ~ + +##3 January 2011 + +##0 Reports of bandit raids to the west of Hurnscald +##0 has mobilized the town. Those injured by these +##0 bandits may have a long stay ahead of them in +##0 Hurnscald's hospital. + +##0 In other news, Taro is still missing, but Diryn, +##0 an agent of Tulimshar, has establish a connection +##0 with the Kaizei area, making travel to Nivalis +##0 possible again. He still assists the battle +##0 hardened travel distant locations just outside of +##0 Hurnscald. Getting back can be done by finding +##0 Frozenbeard, a Tulimshar pioneer who is mapping +##0 a trade route to get to Nivalis by ship. + +##0 Diryn's re-connection with Nivalis came none too +##0 soon. Golbenez, who demanded a half million gold +##0 pieces for building some sort of leisure place, +##0 scrapped the idea and went for good old fashioned +##0 kidnapping to get whatever he wanted from the world +##0 of Mana. He kidnapped Santa Claus. Fearful Santa +##0 may not gift the children of the world, wizards, +##0 warriors and archers rallied to pay the demi-god +##0 his demands. + +##0 Shortly after Santa was freed, something more +##0 sinister has come to Kaizei. The yeti. Sightings +##0 of this beast returns with stories of them. Though +##0 aggressive, their behavior seems out of place. +##0 They've never been known as cave dwellers nor to +##0 kidnap people. + +##2 ~ The Hurnscald Herald ~ ##3 Countless candy-concerning complaints: council ##3 consequently considers citizen-composed cleanup crew diff --git a/npc/031-1_NivalisPort/frozenbeard.txt b/npc/031-1_NivalisPort/frozenbeard.txt index 9be863b0..4f871554 100644 --- a/npc/031-1_NivalisPort/frozenbeard.txt +++ b/npc/031-1_NivalisPort/frozenbeard.txt @@ -3,7 +3,7 @@ 031-1.gat,97,115,0 script Frozenbeard 138,{ mes "[Frozenbeard]"; - mes "\"Arrr mate! There is no dock here, so I had to use my row boat! I am pioneering and mapping the trade route between here and Argaes, around the Hurnscald area. I'll hail my shipmates to send a boat and we'll ship out to Argaes, be there in no time, but it will cost you a fee. 500 gold pieces. What do you say?"; + mes "\"Arrr mate! There is no dock here, so I had to row boat from my ship! I am pioneering and mapping the trade route between here and Argaes, around the Hurnscald area. I'll hail my shipmates to send a boat and we'll sail out to Argaes, be there in no time, but it will cost you a fee. 500 gold pieces. What do you say?"; menu "Sure. (500 GP)", L_Frozenbeard_Argaes, "Not right now.", L_Frozenbeard_Stay; -- cgit v1.2.3-70-g09d2 From 309190f4d1f5f65f7a1679d13bab17f50e71f87a Mon Sep 17 00:00:00 2001 From: Wombat Date: Mon, 10 Jan 2011 05:31:12 -0500 Subject: news re-aligned for easier reading, bowler hat added news re-aligned and small fix, bowler hat added to item_db.txt --- db/item_db.txt | 1 + news.txt | 54 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/db/item_db.txt b/db/item_db.txt index a5516604..1d8de26f 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -605,4 +605,5 @@ 4028, WizardHat, Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 4029, DementiaPotion, Dementia Potion, 3, 20, 10, 10, , , , , , 2, , , 0, , {}, {} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} +4030, BowlerHat, Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} diff --git a/news.txt b/news.txt index 05719fbd..f4855e87 100644 --- a/news.txt +++ b/news.txt @@ -2,36 +2,38 @@ ##3 January 2011 -##0 Reports of bandit raids to the west of Hurnscald -##0 has mobilized the town. Those injured by these -##0 bandits may have a long stay ahead of them in -##0 Hurnscald's hospital. +##0 Reports of bandit raids to the west of +##0 Hurnscald has mobilized the town. Those +##0 injured by these bandits may have a long stay +##0 ahead of them in Hurnscald's hospital. -##0 In other news, Taro is still missing, but Diryn, -##0 an agent of Tulimshar, has establish a connection -##0 with the Kaizei area, making travel to Nivalis -##0 possible again. He still assists the battle -##0 hardened travel distant locations just outside of -##0 Hurnscald. Getting back can be done by finding -##0 Frozenbeard, a Tulimshar pioneer who is mapping -##0 a trade route to get to Nivalis by ship. +##0 In other news, Taro is still missing, but +##0 Diryn, an agent of Tulimshar, has established +##0 a connection with the Kaizei area, making +##0 travel to Nivalis possible again. He still +##0 assists the battle hardened travel distant +##0 locations just outside of Hurnscald. Getting +##0 back can be done by finding Frozenbeard, a +##0 pioneer who is mapping a trade route to get +##0 to Nivalis by ship. -##0 Diryn's re-connection with Nivalis came none too -##0 soon. Golbenez, who demanded a half million gold -##0 pieces for building some sort of leisure place, -##0 scrapped the idea and went for good old fashioned -##0 kidnapping to get whatever he wanted from the world -##0 of Mana. He kidnapped Santa Claus. Fearful Santa -##0 may not gift the children of the world, wizards, -##0 warriors and archers rallied to pay the demi-god -##0 his demands. +##0 Diryn's re-connection with Nivalis came none +##0 too soon. Golbenez, a demi-god who demanded +##0 a half billion gold pieces for building some +##0 sort of leisure place, scrapped the idea and +##0 went for good old fashioned kidnapping to get +##0 whatever he wanted from the world of Mana. +##0 He kidnapped Santa Claus. Fearful Santa may +##0 not gift the children of the world, wizards, +##0 warriors and archers rallied to pay the +##0 demi-god his demands. ##0 Shortly after Santa was freed, something more -##0 sinister has come to Kaizei. The yeti. Sightings -##0 of this beast returns with stories of them. Though -##0 aggressive, their behavior seems out of place. -##0 They've never been known as cave dwellers nor to -##0 kidnap people. +##0 sinister has come to Kaizei. The yeti. +##0 Sightings of this beast returns with stories +##0 of them. Though aggressive, their behavior +##0 seems out of place. They've never been known +##0 as cave dwellers nor to kidnap people. ##2 ~ The Hurnscald Herald ~ -- cgit v1.2.3-70-g09d2 From cc3596810e02b7baeb69688c500fd549f98f9523 Mon Sep 17 00:00:00 2001 From: Jessica Tölke Date: Sun, 9 Jan 2011 21:47:56 +0100 Subject: cindy quest: setting correct images and coordinates for npc's --- npc/031-1_NivalisPort/angelaOutside.txt | 3 +-- npc/031-2_Angelas_House/angelaHouse.txt | 3 +-- npc/031-2_Angelas_House/cindyHouse.txt | 3 +-- npc/031-3_Cave/cindyCave.txt | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1_NivalisPort/angelaOutside.txt index ae5b6bfa..1fbb90e2 100644 --- a/npc/031-1_NivalisPort/angelaOutside.txt +++ b/npc/031-1_NivalisPort/angelaOutside.txt @@ -5,8 +5,7 @@ // state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward // state greater than 3: Angela invites and asks you to bring present boxes -//TODO: picture -031-1.gat,79,24,0 script Angela 154, { +031-1.gat,79,24,0 script Angela 195, { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/npc/031-2_Angelas_House/angelaHouse.txt b/npc/031-2_Angelas_House/angelaHouse.txt index 5ec66a83..6cd70f34 100644 --- a/npc/031-2_Angelas_House/angelaHouse.txt +++ b/npc/031-2_Angelas_House/angelaHouse.txt @@ -5,8 +5,7 @@ // state4: you can do daily quests with white and yellow presents boxes // -//TODO: coordinates and picture -031-2.gat,24,26,0 script Angela 154, { +031-2.gat,29,28,0 script Angela 196, { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/npc/031-2_Angelas_House/cindyHouse.txt b/npc/031-2_Angelas_House/cindyHouse.txt index eb2906f4..f18da414 100644 --- a/npc/031-2_Angelas_House/cindyHouse.txt +++ b/npc/031-2_Angelas_House/cindyHouse.txt @@ -4,8 +4,7 @@ // state3 and greater: Cindy is saved, she says one of some random phrases // -//TODO: picture -031-2.gat,22,25,0 script Cindy 114, { +031-2.gat,27,26,0 script Cindy 197, { set @Q_Nivalis_state_MASK, NIBBLE_5_MASK; set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT; diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt index cff40267..3b106c3f 100644 --- a/npc/031-3_Cave/cindyCave.txt +++ b/npc/031-3_Cave/cindyCave.txt @@ -5,8 +5,7 @@ // state2 and greater: Cindy is saved, she asks you to visit them // -//TODO: picture -031-3.gat,122,51,0 script Cindy 114, { +031-3.gat,122,52,0 script Cindy 198, { if ($@FIGHT_YETI_STATUS != 0) goto L_Yeti; set @KEYS_AMOUNT, 10; -- cgit v1.2.3-70-g09d2 From 374359ed51f7dfc1887cee0270193ca320c899bd Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 10 Jan 2011 14:12:21 +0100 Subject: adding the TMW_BESERK skill --- db/const.txt | 1 + db/skill_db.txt | 77 +++++++++++++++++++++++++++------------------------------ 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/db/const.txt b/db/const.txt index 981031ed..bfa1436d 100644 --- a/db/const.txt +++ b/db/const.txt @@ -217,6 +217,7 @@ SKILL_LUCKY_COUNTER 351 SKILL_SPEED 352 SKILL_RESIST_POISON 353 SKILL_ASTRAL_SOUL 354 +SKILL_WARRIOR_BERSERK 355 // Magic skills SKILL_MAGIC 340 diff --git a/db/skill_db.txt b/db/skill_db.txt index 93a6e567..91bf1405 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -1,43 +1,40 @@ -//# This file can be imported to OpenOffice or similar as a "comma separated list (.csv)" -//# So please use only(!) commas to separate different fields. -//# and DO NOT use any kind of whitespace to make it miss-formated. -//# Just use a serious csv editor! -//id,range,hit,inf,pl,nk,maxrse,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,pool,stat,name -1,0,0,0,0,0,0,1,0,no,0,0,0,none,0,no,none,Emote//NV_EMOTE -2,0,0,0,0,0,0,1,0,no,0,0,0,none,0,no,none,Trade//NV_TRADE -3,0,0,0,0,0,0,2,0,no,0,0,0,none,0,no,none,Party//NV_PARTY -4,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,no,none,X0//SM_SWORD -6,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X1//SM_RECOVERY -11,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X2//MG_SRECOVERY -38,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X3//MC_INCCARRY -39,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X4//MC_DISCOUNT -40,0,0,0,0,0,0,10,0,no,0,0,0,none,0,no,none,X5//MC_OVERCHARGE -50,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,no,none,X6//TF_DOUBLE -51,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,no,none,X7//TF_MISS -54,1,6,4,0,0,0,100,1,no,0,1,0,none,0,no,none,X8//TF_POISON -144,0,6,4,0,1,0,1,1,no,0,1,0,none,0,no,none,X9//NV_FIRSTAID -146,0,0,0,0,0,0,1,0,no,0,1,0,none,0,no,none,X10//SM_MOVINGRECOVERY -148,0,0,0,0,0,0,1,0,no,0,1,0,weapon,0,no,none,X11//SM_AUTOBERSERK -152,0,6,4,0,1,0,1,1,no,0,1,0,weapon,5,no,none,X12//TF_BACKSLIDING -178,1,6,4,0,0,0,100,1,no,0,1,0,none,0,no,none,X13//NPC_POISON -190,1,6,4,0,0,0,100,1,no,0,1,0,none,0,no,none,X14//NPC_POISONATTACK -198,0,0,4,0,1,0,10,1,no,0,2,0,magic,0,no,none,X15//NPC_SUMMONSLAVE -199,0,0,4,0,1,0,10,1,no,0,2,0,none,0,no,none,X16//NPC_EMOTION -3390,0,0,0,0,0,3,0,no,0,0,0,none,0,no,none,Skill_Pool//SKILL_POOL -340,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Magic//TMW_MAGIC -341,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Life_Magic//TMW_MAGIC_LIFE -342,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,War_Magic//TMW_MAGIC_WAR -343,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Transmutation_Magic//TMW_MAGIC_TRANSMUTE -344,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Nature_Magic//TMW_MAGIC_NATURE -345,0,0,0,0,0,0,5,0,no,0,0,0,magic,0,no,none,Astral_Magic//TMW_MAGIC_ASTRAL -350,0,0,0,0,0,9,10,0,no,0,0,0,weapon,0,passive,agi,Brawling//TMW_BRAWLING -351,0,0,0,0,0,9,10,0,no,0,0,0,weapon,0,passive,luk,Lucky_Counter//TMW_LUCKY_COUNTER -352,0,0,0,0,0,9,10,0,no,0,0,0,none,0,passive,agi,Speed//TMW_SPEED -353,0,0,0,0,0,9,10,0,no,0,0,0,none,0,passive,vit,Poison_Resistance//TMW_POISON_RESISTANCE -354,0,0,0,0,0,9,10,0,no,0,0,0,magic,0,passive,int,Astral_Soul//TMW_ASTRAL_SOUL -45,0,0,0,0,0,9,10,0,no,0,0,0,weapon,0,passive,dex,Mallard's_Eye//AC_OWL -28,0,6,4,0,1,0,2,1,yes,0,0,0,magic,0,no,none,Teleport //AL_TELEPORT -30,9,6,16,0,1,0,10,1,yes,0,0,0,magic,0,no,none,Heal //AL_HEAL +//id, range, hit, inf, pl, nk, maxrse, max, list_num, castcancel, cast_defence_rate, inf2, maxcount, skill_type, blow_count, pool, stat, name +1, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 0, 0, none, 0, no, none, Emote//NV_EMOTE +2, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 0, 0, none, 0, no, none, Trade//NV_TRADE +3, 0, 0, 0, 0, 0, 0, 2, 0, no, 0, 0, 0, none, 0, no, none, Party//NV_PARTY +4, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0, no, none, X0//SM_SWORD +6, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X1//SM_RECOVERY +11, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X2//MG_SRECOVERY +38, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X3//MC_INCCARRY +39, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X4//MC_DISCOUNT +40, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, none, 0, no, none, X5//MC_OVERCHARGE +50, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0, no, none, X6//TF_DOUBLE +51, 0, 0, 0, 0, 0, 0, 10, 0, no, 0, 0, 0, weapon, 0, no, none, X7//TF_MISS +54, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X8//TF_POISON +144, 0, 6, 4, 0, 1, 0, 1, 1, no, 0, 1, 0, none, 0, no, none, X9//NV_FIRSTAID +146, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 1, 0, none, 0, no, none, X10//SM_MOVINGRECOVERY +148, 0, 0, 0, 0, 0, 0, 1, 0, no, 0, 1, 0, weapon, 0, no, none, X11//SM_AUTOBERSERK +152, 0, 6, 4, 0, 1, 0, 1, 1, no, 0, 1, 0, weapon, 5, no, none, X12//TF_BACKSLIDING +178, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X13//NPC_POISON +190, 1, 6, 4, 0, 0, 0, 100, 1, no, 0, 1, 0, none, 0, no, none, X14//NPC_POISONATTACK +198, 0, 0, 4, 0, 1, 0, 10, 1, no, 0, 2, 0, magic, 0, no, none, X15//NPC_SUMMONSLAVE +199, 0, 0, 4, 0, 1, 0, 10, 1, no, 0, 2, 0, none, 0, no, none, X16//NPC_EMOTION +339, 0, 0, 0, 0, 0, 0, 3, 0, no, 0, 0, 0, none, 0, no, none, Skill_Pool//SKILL_POOL +340, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Magic//TMW_MAGIC +341, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Life_Magic//TMW_MAGIC_LIFE +342, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, War_Magic//TMW_MAGIC_WAR +343, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Transmutation_Magic//TMW_MAGIC_TRANSMUTE +344, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Nature_Magic//TMW_MAGIC_NATURE +345, 0, 0, 0, 0, 0, 0, 5, 0, no, 0, 0, 0, magic, 0, no, none, Astral_Magic//TMW_MAGIC_ASTRAL +350, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,agi, Brawling //TMW_BRAWLING +351, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,luk, Lucky_Counter //TMW_LUCKY_COUNTER +352, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, none, 0, passive,agi, Speed //TMW_SPEED +353, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, none, 0, passive,vit, Poison_Resistance //TMW_POISON_RESISTANCE +354, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, magic, 0, passive,int, Astral_Soul //TMW_ASTRAL_SOUL +45, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,dex, Mallard's_Eye //AC_OWL +355, 0, 0, 0, 0, 0, 9, 10, 0, no, 0, 0, 0, weapon, 0, passive,str, Beserking //SKILL_WARRIOR_BERSERK implemented +28, 0, 6, 4, 0, 1, 0, 2, 1, yes, 0, 0, 0, magic, 0, no, none, Teleport //AL_TELEPORT +30, 9, 6, 16, 0, 1, 0, 10, 1, yes, 0, 0, 0, magic, 0, no, none, Heal //AL_HEAL // maxrse describes the max. level that the skill can be raised to through the `raise skill' option. Further raising has to happen via quests. // maxrse < max. // `pool' can be `no', `active', or `passive'. -- cgit v1.2.3-70-g09d2 From bc23ed45d729ebb053c9d23e136933e42ba75045 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 10 Jan 2011 14:12:33 +0100 Subject: improving the aligncsv.py script --- tools/aligncsv.py | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/tools/aligncsv.py b/tools/aligncsv.py index ce63a988..54bcd9d4 100755 --- a/tools/aligncsv.py +++ b/tools/aligncsv.py @@ -33,10 +33,11 @@ for x in range(length): #find the longest entry in each line in each position for lineno in range(len(lines)): - sp=lines[lineno].split(",") - for pieceno in range(len(sp)): - sp[pieceno] = sp[pieceno].strip() + "," #for the comma add a char - textarray[-1][pieceno] = max(len(sp[pieceno]),textarray[-1][pieceno]) + if not lines[lineno].strip().startswith("//") or lines[lineno].strip().startswith("//id"): + sp=lines[lineno].split(",") + for pieceno in range(len(sp)): + sp[pieceno] = sp[pieceno].strip() + "," #for the comma add a char + textarray[-1][pieceno] = max(len(sp[pieceno]),textarray[-1][pieceno]) if tabs: #make it divisable by 8 (tabs work then) @@ -45,24 +46,29 @@ if tabs: textarray[-1][pieceno] = (((textarray[-1][pieceno])/8)*8)+8 for lineno in range(len(lines)): - sp=lines[lineno].split(",") - for pieceno in range(length): - textarray[lineno][pieceno] = "" - if pieceno Date: Mon, 10 Jan 2011 14:40:14 -0500 Subject: Made bowler hat dyeable Made bowler hat dyeable by altering bleacher, selim and the item_db --- db/item_db.txt | 12 +++++++++++- npc/001-1_Tulimshar/bleacher.txt | 6 ++++++ npc/009-2_Hurnscald/selim.txt | 8 ++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/db/item_db.txt b/db/item_db.txt index 1d8de26f..ad98428f 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -269,7 +269,7 @@ 755, AssassinShirt, Assassin Shirt, 5, 10000, 3000, 15, , 10, , -5, 0, 2, 512, , 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 10;} 756, AssassinGloves, Assassin Gloves, 5, 7000, 2000, 9, , 5, , -3, 0, 2, 4, , 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 5;} 757, AssassinBoots, Assassin Boots, 5, 7000, 2000, 10, , 5, , -3, 0, 2, 64, , 0, 0, {}, {callfunc "UnreleasedItem";bonus bAgi, 5;} -758, WoodenStaff, Wooden Staff, 4, 4000, 2000, 1000, 50, , 1, 5, 0, 2, 2, 1, 1, 3, {}, {} +758, WoodenStaff, Wooden Staff, 4, 4000, 2000, 1000, 50, , 1, 5, 0, 2, 2, 1, 1, 10, {}, {} //759, PaladinsHelmet, Paladin's Helmet, , , , , , , , , , , , , , , {}, {} //760, OverlordsHelmet, Overlord's Helmet, , , , , , , , , , , , , , , {}, {} //761, DesertHelmet, Desert Helmet, , , , , , , , , , , , , , , {}, {} @@ -560,6 +560,16 @@ 2207, OrangeWizardHat, Orange Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2208, PurpleWizardHat, Purple Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} 2209, DarkGreenWizardHat, Dark Green Wizard Hat, 5, 5000, 2500, 20, , 5, , 5, 0, 2, 256, , 1, 0, {}, {bonus bInt, 3;} +2210, RedBowlerHat, Red Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2211, GreenBowlerHat, Green Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2212, DarkBlueBowlerHat, Dark Blue Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2213, YellowBowlerHat, Yellow Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2214, LightBlueBowlerHat, Light Blue Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2215, PinkBowlerHat, Pink Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2216, BlackBowlerHat, Black Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2217, OrangeBowlerHat, Orange Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2218, PurpleBowlerHat, Purple Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +2219, DarkGreenBowlerHat, Dark Green Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} 3000, JackOLantern, Jack-o-Lantern, 3, 200, 100, 1000, , , , , , , , , , , {}, {} 3001, RubberBat, Rubber Bat, 3, 200, 100, 30, , , , , , , , , , , {}, {} 3002, RealisticBrain, Realistic Brain, 3, 200, 100, 50, , , , , , , , , , , {}, {} diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt index b877642d..68707f65 100644 --- a/npc/001-1_Tulimshar/bleacher.txt +++ b/npc/001-1_Tulimshar/bleacher.txt @@ -34,6 +34,7 @@ L_bleach_menu: "Cotton gloves", L_cotton_gloves, "Rabbit ears", L_rabbit_ears, "Wizard Hat", L_wizard_hat, + "Bowler Hat", L_bowler_hat, "Nevermind", -; goto L_close; @@ -112,6 +113,11 @@ L_wizard_hat: set @dyeBase, 2200; goto L_choose_color; +L_bowler_hat: + set @normal, 4030; + set @dyeBase, 2210; + goto L_choose_color; + L_choose_color: mes "[Candide]"; mes "\"And the color?\""; diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt index 7c39a2ab..de02de0d 100644 --- a/npc/009-2_Hurnscald/selim.txt +++ b/npc/009-2_Hurnscald/selim.txt @@ -32,6 +32,8 @@ L_clothes_choice: "Cotton boots", L_cottonboots, "Cotton gloves", L_cottongloves, "Rabbit ears", L_rabbitears, + "Wizard hat", L_wizardhat, + "Bowler hat", L_bowlerhat, "I'm fine for now, thanks.", -; close; @@ -129,6 +131,12 @@ L_wizardhat: set @name$, "wizard hat"; goto L_picked_item; +L_bowlerhat: + set @del, 4030; + set @new, 2210; + set @name$, "bowler hat"; + goto L_picked_item; + L_picked_item: if (countitem(@del) == 0) goto L_havenone; L_colour: -- cgit v1.2.3-70-g09d2 From fb0efd722c823fa40e574e0a6f1e6ba60a595acd Mon Sep 17 00:00:00 2001 From: Wombat Date: Mon, 10 Jan 2011 15:47:29 -0500 Subject: added monocle to db added monocle to item_db.txt --- db/item_db.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/db/item_db.txt b/db/item_db.txt index ad98428f..eb5abe24 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -616,4 +616,5 @@ 4029, DementiaPotion, Dementia Potion, 3, 20, 10, 10, , , , , , 2, , , 0, , {}, {} #ID, Name, Label, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} 4030, BowlerHat, Bowler Hat, 5, 2500, 1250, 30, , 10, , 2, 0, 2, 256, , 0, 0, {}, {} +4031, Monocle, Monocle, 5, 5000, 2500, 20, , 2, , 0, 0, 2, 256, , 0, 0, {}, {bonus bDex, 1;bonus bAtkRange, 1;} -- cgit v1.2.3-70-g09d2