From 6403fda71f2788b0cd18405503e718ace09f034f Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Wed, 22 Oct 2014 15:41:11 -0400
Subject: remove basic skills

---
 world/map/npc/001-1/entertainer.txt | 8 --------
 world/map/npc/001-1/trader.txt      | 7 +++----
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'world/map/npc/001-1')

diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index fea4f532..2cb68e35 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -2,8 +2,6 @@
 
 001-1.gat,30,43,0|script|Entertainer|165,
 {
-    if (getskilllv(SKILL_EMOTE) > 0) goto L_Has;
-
     mes "[Entertainer]";
     mes "\"Yes how can I help you?\"";
     menu
@@ -19,18 +17,12 @@ L_Learn:
         "I don't see the point right now.", L_Close;
 
 L_Learn2:
-    setskill SKILL_EMOTE, 1;
     mes "[Entertainer]";
     mes "\"All you have to do is press alt and a number.";
     mes "The number determines what emotion will be shown.";
     mes "Some clients will also show an emote shortcut-bar with the F12 button\"";
     goto L_Close;
 
-L_Has:
-    mes "[Entertainer]";
-    mes "\"The entertainment life is a hard life...\" *sigh*";
-    goto L_Close;
-
 L_Close:
     close;
 
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index 33c73de8..bef2e337 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -8,7 +8,7 @@
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
     set @Potionprice, 500;
-    if ((getskilllv(SKILL_TRADE) > 0) && BaseLevel >= 25) goto L_Trade;
+    if (BaseLevel >= 25) goto L_Trade;
     if (getskilllv(SKILL_TRADE) > 0) goto L_Later;
 
     mes "[Trader]";
@@ -28,7 +28,7 @@ L_More:
 
 L_Except:
     mes "[Trader]";
-    mes "\"I could teach you how to trade. It'll cost you 5GP.\"";
+    mes "\"I could teach you how to trade. It'll cost you 2GP.\"";
     next;
     menu
         "Sure.", L_Teach,
@@ -36,8 +36,7 @@ L_Except:
 
 L_Teach:
     if (Zeny < 5) goto L_NotEnoughMoney;
-    set Zeny, Zeny - 5;
-    setskill SKILL_TRADE, 1;
+    set Zeny, Zeny - 2;
     mes "[Trader]";
     mes "\"You can initiate trade with someone by right-clicking on them and choosing trade.";
     mes "You'll both add the items and set the GP you're putting up then press propose trade.";
-- 
cgit v1.2.3-60-g2f50