From 260776b9001af6f8ebab74da2d47ec2fcc655e1e Mon Sep 17 00:00:00 2001 From: Kess Vargavind Date: Mon, 1 Jun 2009 12:20:22 +0200 Subject: More fixes for item labels I am sorry about forgetting to check the scripts, I learnt that mistake too late. This is the situation a few grep's later. (I also updated the ignore list.) --- .gitignore | 25 +++++++++++++++++++++++++ conf/magic.conf.template | 8 ++++---- npc/001-1_Tulimshar/elanore.txt | 8 ++++---- npc/006-1_Desert_mountains/mika.txt | 2 +- npc/006-1_Desert_mountains/pachua.txt | 2 +- npc/010-2_Dimonds_Cove/loratay.txt | 4 ++-- npc/012-1_Woodland_Hills/injured-mouboo.txt | 2 +- npc/020-2_Nivalis/furquest.txt | 2 +- 8 files changed, 39 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 6b468b62..443b910d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,26 @@ *.class + +# Local configuration files +conf/*_local.conf +conf/eathena-monitor.conf +conf/gm_account.txt +conf/help.txt +conf/magic.conf +conf/motd.txt +conf/spells-build.sh + +# Build files +eathena-monitor + +# Copied/linked server executables +char-server +login-server +map-server + +# Server files +log/ +gm.log.* +online.* +save/*.tmp +save/*.txt + diff --git a/conf/magic.conf.template b/conf/magic.conf.template index c55012d6..17d4b627 100644 --- a/conf/magic.conf.template +++ b/conf/magic.conf.template @@ -294,7 +294,7 @@ SPELL lesser-heal (target : STRING) : "#L00" = REQUIRE skill(caster, MAGIC) > level, REQUIRE if_then_else(failed(pc(target)), 1, rdistance(location(caster), location(pc(target))) < 2 + (spellpower / 100)), - (COMPONENTS ["LifeStone"])) + (COMPONENTS ["Lifestone"])) => EFFECT CALL adjust_spellpower(school); CALL default_effect(); IF failed(pc(target)) @@ -470,7 +470,7 @@ SPELL make-tanktop : "#T12" = COMPONENTS [4 * "CottonCloth"]) => EFFECT CALL adjust_spellpower(school); CALL default_effect(); - CALL create_item("WhiteTankTop", 1, "CottonCloth", 350); + CALL create_item("TankTop", 1, "CottonCloth", 350); CALL gain_xp(2); SPELL make-short-tanktop : "#T13" = @@ -482,7 +482,7 @@ SPELL make-short-tanktop : "#T13" = COMPONENTS [3 * "CottonCloth"]) => EFFECT CALL adjust_spellpower(school); CALL default_effect(); - CALL create_item("WhiteShortTankTop", 1, "CottonCloth", 250); + CALL create_item("ShortTankTop", 1, "CottonCloth", 250); CALL gain_xp(2); SPELL make-iron-powder : "#T14" = @@ -887,7 +887,7 @@ SPELL enchant-lifestone : "#G12" = OR COMPONENTS ["MauveHerb", "AlizarinHerb", "CobaltHerb", "GambogeHerb"])) => EFFECT CALL adjust_spellpower(school); CALL default_effect(); - create_item(caster, "LifeStone", 1); + create_item(caster, "Lifestone", 1); CALL gain_xp(1); SPELL sense-spouse : "#G13" = diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt index a2afb2d3..a1075fbc 100644 --- a/npc/001-1_Tulimshar/elanore.txt +++ b/npc/001-1_Tulimshar/elanore.txt @@ -176,7 +176,7 @@ L_Lifestones_Trade: delitem "GambogeHerb", 10; delitem "AlizarinHerb", 10; delitem "CobaltHerb", 10; - getitem "LifeStone", 5; + getitem "Lifestone", 5; getexp 200, 1; mes "[Elanore the Healer]"; mes "Elanore carefully goes over your leaves, then smiles."; @@ -263,10 +263,10 @@ L_Teach_Initial: next; getinventorylist; - if ((@inventorylist_count == 100) && (countitem("LifeStone") == 0)) + if ((@inventorylist_count == 100) && (countitem("Lifestone") == 0)) goto L_Teach_Initial_Noroom; - getitem "LifeStone", 1; + getitem "Lifestone", 1; set @Q_status, @STATUS_LEARNED_LIGHT_HEAL; callsub S_update_var; @@ -499,7 +499,7 @@ L_Teach_AdvanceTo3Ready: mes "\"Please come back soon; there is more that I would like to teach you.\""; next; set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_ELANORE_OMAR; - getitem "LifeStone", 20; + getitem "Lifestone", 20; goto L_Main; diff --git a/npc/006-1_Desert_mountains/mika.txt b/npc/006-1_Desert_mountains/mika.txt index a572b911..fc2e6f44 100644 --- a/npc/006-1_Desert_mountains/mika.txt +++ b/npc/006-1_Desert_mountains/mika.txt @@ -1,4 +1,4 @@ -006-1.gat,39,27,0 script Mika 114,{ +006-1.gat,39,27,0 script Mika 114,{ mes "[Mika]"; mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\""; next; diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt index 9acfad54..f4d2a653 100644 --- a/npc/006-1_Desert_mountains/pachua.txt +++ b/npc/006-1_Desert_mountains/pachua.txt @@ -1,4 +1,4 @@ -006-1.gat,23,100,0 script Pachua 143,{ +006-1.gat,23,100,0 script Pachua 143,{ set @LEATHER_PATCH_PRICE, 300; diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt index f2350a4c..ebe9a0c5 100644 --- a/npc/010-2_Dimonds_Cove/loratay.txt +++ b/npc/010-2_Dimonds_Cove/loratay.txt @@ -429,7 +429,7 @@ L_tanktop_short: if (@inventorylist_count == 100 && countitem("CottonCloth") > 5) goto L_TooMany; set zeny, zeny - 1000; delitem "CottonCloth", 5; - getitem "WhiteShortTankTop", 1; + getitem "ShortTankTop", 1; mes "[Lora Tay the Seamstress]"; mes "You watch as Lora sews the pieces of cloth together, then flattens the seams and ends with some odd liquid."; mes "Amazingly, the result looks like a single piece of cloth."; @@ -445,7 +445,7 @@ L_tanktop_long: if (@inventorylist_count == 100 && countitem("CottonCloth") > 6) goto L_TooMany; set zeny, zeny - 1000; delitem "CottonCloth", 6; - getitem "WhiteTankTop", 1; + getitem "TankTop", 1; mes "[Lora Tay the Seamstress]"; mes "After combining your pieces of cloth into one-- miraculously making the seams and stitches vanish-- the seamstress cuts out all that doesn't belong into a tank top, then folds and stabilises the edges with additional seam lines."; mes "\"There you are. Don't worry, I have trimmed it to match your size perfectly.\""; diff --git a/npc/012-1_Woodland_Hills/injured-mouboo.txt b/npc/012-1_Woodland_Hills/injured-mouboo.txt index efa68ad5..ae203a9a 100644 --- a/npc/012-1_Woodland_Hills/injured-mouboo.txt +++ b/npc/012-1_Woodland_Hills/injured-mouboo.txt @@ -196,7 +196,7 @@ L_dead: if (@inventorylist_count == 100) goto L_nopickup; - getitem "BlackTNeckSweater", 1; + getitem "BlackTurtleneckSweater", 1; mes "You pull out the sweater and stuff it into your backpack."; set @Q_status, @STATE_TOOK_KILL_REWARD; diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/020-2_Nivalis/furquest.txt index 2d988f75..debce274 100644 --- a/npc/020-2_Nivalis/furquest.txt +++ b/npc/020-2_Nivalis/furquest.txt @@ -3,7 +3,7 @@ //################################################################################# // Santa's Inn - Agostine, The Legendary Tailor -020-2.gat,102,28,0 script Agostine 137, { +020-2.gat,102,28,0 script Agostine 137,{ if (QUEST_WG_state == 1) goto L_State_0_3; if (QUEST_WG_state == 2) goto L_State_1; if (QUEST_WG_state == 3) goto L_State_2; -- cgit v1.2.3-70-g09d2