From 6403fda71f2788b0cd18405503e718ace09f034f Mon Sep 17 00:00:00 2001 From: mekolat Date: Wed, 22 Oct 2014 15:41:11 -0400 Subject: remove basic skills --- world/map/conf/battle_athena.conf | 4 +-- world/map/npc/001-1/entertainer.txt | 8 ----- world/map/npc/001-1/trader.txt | 7 ++-- world/map/npc/021-2/government_building.txt | 56 ++++------------------------- world/map/npc/functions/clear_vars.txt | 15 ++++++-- 5 files changed, 23 insertions(+), 67 deletions(-) (limited to 'world') diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf index 0f30a4c6..cc10f40c 100644 --- a/world/map/conf/battle_athena.conf +++ b/world/map/conf/battle_athena.conf @@ -115,11 +115,11 @@ mob_skill_use: yes mob_count_rate: 100 // You must have basic skills to be able to sit, trade, form a party or create a chatroom? (Note 1) -basic_skill_check: yes +basic_skill_check: no // When teleporting, or spawning to a map, how long before a monster sees you if you don't move? (time is in milliseconds) // That is, when you go to a map and don't move, how long before the monsters will notice you. -// If you attack a monster, it will attack you back regaurdless of this setting. (I think) +// If you attack a monster, it will attack you back regardless of this setting. (I think) player_invincible_time: 5000 // Will there be a minimum skill dmg even if there is a miss? 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."; diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt index 89abee80..9aea5916 100644 --- a/world/map/npc/021-2/government_building.txt +++ b/world/map/npc/021-2/government_building.txt @@ -144,71 +144,27 @@ S_give_rings: set @halloween_npc_id, $@halloween_npc_tathin; callfunc "TrickOrTreat"; - if (getskilllv(SKILL_PARTY) == 2 ) - goto L_Base_Menu; - if (BaseLevel >= 15 - && getskilllv(SKILL_PARTY) == 1) - goto L_Can_Make_Party; - if (getskilllv(SKILL_PARTY) == 1) - goto L_Base_Menu; - if (BaseLevel >= 10) - goto L_Can_Party; goto L_Base_Menu; L_Base_Menu: menu + "I'd like to join a party.", L_Give_Party, + "I'd like to create my own party.", L_Give_Make_Party, "Nothing, I guess.", L_Close; -L_Can_Party: - menu - "I'd like to get a party permit.", L_Get_Party, - "Nothing, I guess.", L_Close; - -L_Can_Make_Party: - menu - "I'd like to get a party creator permit.", L_Get_Make_Party, - "Nothing, I guess.", L_Close; - -L_Get_Party: - mes "[Tathin]"; - mes "\"A permit to join parties costs 10 GP.\""; - next; - menu - "OK", L_Give_Party, - "No thank you", L_Close; - L_Give_Party: - if (Zeny < 10) - goto L_NotEnoughMoney; - set Zeny, Zeny - 10; - setskill SKILL_PARTY, 1; mes "[Tathin]"; - mes "\"Here's your permit. You'll need to be invited by an existing member of a party to join it.\""; + mes "\"You'll need to be invited by an existing member of a party to join it. You may also create your own party.\""; next; mes "[Tathin]"; mes "\"Remember, parties cannot share experience if any members are more than 10 levels apart.\""; - close; - -L_Get_Make_Party: - mes "[Tathin]"; - mes "\"A permit to create parties costs 50 GP.\""; - next; menu - "OK", L_Give_Make_Party, - "No thank you", L_Close; + "I'd like to create my own party.", L_Give_Make_Party, + "Goodbye.", L_Close; L_Give_Make_Party: - if (Zeny < 50) - goto L_NotEnoughMoney; - set Zeny, Zeny - 50; - setskill SKILL_PARTY, 2; - mes "[Tathin]"; - mes "\"Here's your permit. You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\""; - close; - -L_NotEnoughMoney: mes "[Tathin]"; - mes "\"You don't have enough GP\""; + mes "\"You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\""; close; L_Close: diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt index 289b7a75..0a0247b7 100644 --- a/world/map/npc/functions/clear_vars.txt +++ b/world/map/npc/functions/clear_vars.txt @@ -2,7 +2,7 @@ function|script|ClearVariables|, { - // Tutorial + // Tutorial if ((TUTORIAL) || (sorfina)) goto L_ResetTut; goto L_Heathin; @@ -231,7 +231,7 @@ L_Easter: if (#BankAccount < 0) goto L_FixBank; - return; + goto L_Fix_Skills; L_FixBank: if (Zeny >= -#BankAccount) @@ -240,11 +240,20 @@ L_FixBank: // Partial fix set #BankAccount, #BankAccount + Zeny; set Zeny, 0; - return; + goto L_Fix_Skills; L_Fix_Full: set Zeny, Zeny + #BankAccount; set #BankAccount, 0; + goto L_Fix_Skills; + +L_Fix_Skills: + if(getskilllv(SKILL_TRADE) > 0) setskill SKILL_TRADE, 0; + if(getskilllv(SKILL_PARTY) > 0) setskill SKILL_PARTY, 0; + if(getskilllv(SKILL_EMOTE) > 0) setskill SKILL_EMOTE, 0; + goto L_Return; + +L_Return: return; } -- cgit v1.2.3-60-g2f50