diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-01-10 21:57:31 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-01-10 21:57:31 +0100 |
| commit | b2f5e74386a853a4aede5e56f7daa6707cd316c7 (patch) | |
| tree | 5722beb09b224f2f0bb0afd665601f27b533119e /npc | |
| parent | cc9da83fbc6709eedf6a041bb2e2ad1df1acbdbf (diff) | |
| parent | fb0efd722c823fa40e574e0a6f1e6ba60a595acd (diff) | |
| download | serverdata-b2f5e74386a853a4aede5e56f7daa6707cd316c7.tar.gz serverdata-b2f5e74386a853a4aede5e56f7daa6707cd316c7.tar.bz2 serverdata-b2f5e74386a853a4aede5e56f7daa6707cd316c7.tar.xz serverdata-b2f5e74386a853a4aede5e56f7daa6707cd316c7.zip | |
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/001-1_Tulimshar/bleacher.txt | 6 | ||||
| -rw-r--r-- | npc/009-2_Hurnscald/selim.txt | 8 | ||||
| -rw-r--r-- | npc/018-2_Woodland_mining_camp/caul.txt | 4 |
3 files changed, 14 insertions, 4 deletions
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: 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: |