Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronization of the trunk&stable npc directories

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9683 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-01-21 11:40:27 +00:00
parent f13bf6e679
commit af4ac5e72c
8 changed files with 13 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
npc/Changelog.txt
View File

@ -4,13 +4,6 @@ Lupus
* Looking for exploits, optimization, bugs hunt
* Adding new cards, checking/adding mobs/items
* EXP quests for Blacksmith, Merchant, Alchemist
Mass Zero
* Fixing grammatical errors.
* Fixing small bugs.
* Adding small stuff.
* Redoing lots of the custom scripts.
Massdriller
* Correcting & Bugfixing scripts
erKURITA
* Warps maintainment
Evera
@ -33,6 +26,11 @@ KarLaeda
Date Added
======
2007/01/21
* Synchronization of the trunk&stable npc directories [ultramage]
- fixed one sign quest OnMonsterDead bug (copy from stable)
- removed the temp sign quest script
- some minor typo hunting
2007/01/12
* Fixed exploits in Valentine Event Scripts [KarLaeda]
2007/01/11

2
npc/cities/aldebaran.txt
View File

@ -1148,7 +1148,7 @@ sF_Spin:
// Kafra Pavianne -----------------------------
aldeba_in.gat,81,166,4 script Kafra Pavianee 117,{
aldeba_in.gat,81,166,4 script Kafra Pavianne 117,{
cutin "kafra_01",2;
mes "[Kafra Pavianne]";
mes "Welcome! I'm Pavianne,";

5
npc/custom/eAAC_Scripts/DonationGirl/donate.txt
View File

@ -24,10 +24,11 @@
//= 3.2 - Fixed a problem where eAthena would crash if a
//= query returned NULL.
//= 3.3 - Optimized query speeds by combining a few select
//= queries into one. Requires Trunk 7975.
//= queries into one. Requires Trunk 7975 OR
//= Stable 8637.
//===== Compatible With =====================================
//= eAthena - any version that contains the new query_sql
//= command (Trunk 7975).
//= command (Stable 8637 OR Trunk 7975).
//===== Description =========================================
//= A script that lets a player claim an item for donating.
//= Allows a GM to input each donation.

2
npc/custom/quests/kiel_quest.txt
View File

@ -45,7 +45,7 @@ kh_school.gat,119,146,3 script Kiel Carlo 748,{
M_GO:
mes "[Kiel Carlo]";
mes "I refuse let you enter if you don't meet these conditions:";
mes "I refuse to let you enter if you don't meet these conditions:";
mes "1. You have to be 70 Base Level or higher.";
mes "2. You have to donate 10.000 zeny.";
next;

68
npc/events/custom/npc_event_thesign.txt
View File

@ -1,68 +0,0 @@
//==============================================================================
// Temporary The Sign Script [Playtester]
//==============================================================================
// Version 1.0
//==============================================================================
// How it works:
// - to activate the fountain you need to have at least 1000000 Zeny
// - if you throw 250000 Zeny into the fountain the path to Geffenia
// will open for 30 seconds
// - the requirements will later be replaced by "Finishing The Sign Quest"
//==============================================================================
// Special thanks to Dr.Evil, Tharis, Blaze
//==============================================================================
geffen.gat,119,56,0 script #gefeniagate 139,{
OnInit:
disablenpc "gefeniawarp";
end;
On_Start:
misceffect 247;
initnpctimer;
end;
OnTimer10000:
misceffect 247;
donpcevent "Fountain::On_Effect";
end;
OnTimer20000:
misceffect 247;
donpcevent "Fountain::On_Effect";
end;
OnTimer30000:
disablenpc "gefeniawarp";
mapannounce "geffen.gat","The gate to Geffenia has closed.",0;
stopnpctimer;
end;
}
geffen.gat,119,56,0 script gefeniawarp 45,1,1{
set @warp,rand(4);
if (@warp==0) warp "gefenia01.gat",58,169;
if (@warp==1) warp "gefenia02.gat",116,115;
if (@warp==2) warp "gefenia03.gat",130,206;
if (@warp==3) warp "gefenia04.gat",133,88;
end;
}
geffen.gat,119,48,0 script Fountain 111,{
mes "This is the";
mes "Geffen Fountain.";
if (Zeny >= 1000000) goto L_1;
close;
L_1:
mes "The Zeny in your pocket begins to glow.";
mes "Do you want to throw ^FF0000250000 Zeny^000000 into the fountain?";
next;
menu "Yes",L_2,"No",-;
close;
L_2:
mes "When you threw the money into the fountain a bright light appears.";
set Zeny, Zeny-250000;
enablenpc "gefeniawarp";
donpcevent "#gefeniagate::On_Start";
misceffect 247;
mapannounce "geffen.gat","With light, the gate to Geffenia opens.",0;
close;
On_Effect:
misceffect 247;
end;
}

2
npc/guides/guides_nif.txt
View File

@ -70,7 +70,7 @@ niflheim.gat,186,190,5 script Wandering Man 798,{
viewpoint 2,219,198,2,0xCC6600;
viewpoint 2,219,170,3,0x66FF33;
viewpoint 2,189,210,4,0x3366FF;
mes "[Wandering Man]";
mes "[Wandering Man]";
mes "I removed all the indications,";
mes "If you still need any directions, come back and talk to me again.";
close;

2
npc/jobs/2-2/sage.txt
View File

@ -22,7 +22,7 @@
//= 1.7 Fixed tuition fee. Fixed some answers, names & typos, added missing labels [Lupus]
//= 1.7a Moved JFunc back in the main file, fixed typos [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.0a Fixed double warp [KarLaeda]
//= 2.0a Fixed double warp [KarLaeda]
//============================================================

2
npc/quests/The_Sign_Quest.txt
View File

@ -2450,7 +2450,7 @@ if($signmazemonster == 0)
}
else
{
killmonster "prt_maze02.gat","OnMonsterDead";
killmonster "prt_maze02.gat","Sign_Alch_Summon::OnMonsterDead";
set $signmazemonster,0;
goto Loopback;
}