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(-) (limited to 'npc') 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(-) (limited to 'npc') 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 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(-) (limited to 'npc') 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 cfce4f99b879e522cb1c3fe9174515a585d5d193 Mon Sep 17 00:00:00 2001 From: Wombat 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(-) (limited to 'npc') 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