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

random fixing

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10808 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-06-23 12:15:58 +00:00
parent 338c473b7d
commit fdb0636dc3
10 changed files with 992 additions and 992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
db/skill_nocast_db.txt
View File

@ -37,22 +37,22 @@
//Clone Forbidden/pointless skills //Clone Forbidden/pointless skills
77,16 //PR_TURNUNDEAD 77,16 //PR_TURNUNDEAD
79,16 //PR_MAGNUS 79,16 //PR_MAGNUS
//Zone 1 - Aldebaran Turbo Track //Zone 1 - Aldebaran Turbo Track
219,32 //Snatch 219,32 //Snatch
26,32 //Teleport 26,32 //Teleport
27,32 //Warp portal 27,32 //Warp portal
51,32 //Hiding 51,32 //Hiding
135,32 //Cloaking 135,32 //Cloaking
389,32 //Stealth 389,32 //Stealth
35,32 //Cure 35,32 //Cure
87,32 //Ice Wall 87,32 //Ice Wall
359,32 //Berserk (Frenzy) 359,32 //Berserk (Frenzy)
362,32 //Basilica 362,32 //Basilica
395,32 //Sheltering Bliss 395,32 //Sheltering Bliss
357,32 //Spear Dynamo (Concentration) 357,32 //Spear Dynamo (Concentration)
//Zone 2 - Jail //Zone 2 - Jail
421,64 //TK_JUMPKICK#Flying Side Kick# 421,64 //TK_JUMPKICK#Flying Side Kick#
426,64 //TK_HIGHJUMP#Taekwon Jump# 426,64 //TK_HIGHJUMP#Taekwon Jump#

2
npc/cities/rachel.txt
View File

@ -378,7 +378,7 @@ ra_temin,228,303,5 script Freya's Follower#in1 927,{
mes "praying so hard for Freya's"; mes "praying so hard for Freya's";
mes "second coming. I'm exhausted,"; mes "second coming. I'm exhausted,";
mes "but I feel pretty good about"; mes "but I feel pretty good about";
mes "making that small sacrafice."; mes "making that small sacrifice.";
close; close;
} }

2
npc/jobs/2-1/priest.txt
View File

@ -1278,7 +1278,7 @@ L_Test3:
M_2c: M_2c:
mes "[Sister Cecile]"; mes "[Sister Cecile]";
mes "Will you sacrafice yourself for others?"; mes "Will you sacrifice yourself for others?";
next; next;
menu "Yes.",M_2d, "No.",-; menu "Yes.",M_2d, "No.",-;

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

@ -1,4 +1,4 @@
////===== eAthena Script ======================================= //===== eAthena Script =======================================
//= Crusader Quest //= Crusader Quest
//===== By: ================================================== //===== By: ==================================================
//= Made by: Black Dragon //= Made by: Black Dragon

258
npc/other/mail.txt
View File

@ -1,129 +1,129 @@
//===== eAthena Script ======================================= //===== eAthena Script =======================================
//= Mail Boxes //= Mail Boxes
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf //= L0ne_W0lf
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.0 //= 1.0
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= eAthena SVN //= eAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= [Aegis Conversion] //= [Aegis Conversion]
//= Pickup and write mail from/to players in game. //= Pickup and write mail from/to players in game.
//= Note: Mail System is NOT implemented. These NPCs are only //= Note: Mail System is NOT implemented. These NPCs are only
//= place-holders. //= place-holders.
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 First version, place holders only. [L0ne_W0lf] //= 1.0 First version, place holders only. [L0ne_W0lf]
//============================================================ //============================================================
// Prontera // Prontera
//============================================================ //============================================================
prontera,146,86,0 script Mailbox#prt::MailBox 888,{ prontera,146,86,0 script Mailbox#prt::MailBox 888,{
mes "[Mailbox]"; mes "[Mailbox]";
mes "To use the mailbox service, you are required"; mes "To use the mailbox service, you are required";
mes "to pay 130 zeny."; mes "to pay 130 zeny.";
mes "Would you like to use the service?"; mes "Would you like to use the service?";
next; next;
if (select("Yes.:No.") == 1) { if (select("Yes.:No.") == 1) {
if (Zeny < 130) { if (Zeny < 130) {
mes "[Mailbox]"; mes "[Mailbox]";
mes "I am sorry, but you do not have enough money."; mes "I am sorry, but you do not have enough money.";
mes "To use the mailbox service, you are required"; mes "To use the mailbox service, you are required";
mes "to pay 130 zeny."; mes "to pay 130 zeny.";
close; close;
} }
mes "[Mailbox]"; mes "[Mailbox]";
//Custom messages. //Custom messages.
mes "Oh, I'm sorry but the"; mes "Oh, I'm sorry but the";
mes "^FF0000Mail System^000000 is still under"; mes "^FF0000Mail System^000000 is still under";
mes "construction."; mes "construction.";
mes " "; mes " ";
mes "No charges have been applied."; mes "No charges have been applied.";
//mes "Thank you, please come again." //mes "Thank you, please come again."
//set Zeny,Zeny-130; //set Zeny,Zeny-130;
//OpenMail //OpenMail
close; close;
} }
mes "[Mailbox]"; mes "[Mailbox]";
mes "Thank you, please come again."; mes "Thank you, please come again.";
close; close;
} }
prontera,275,213,0 duplicate(MailBox) Mailbox#2prt 888 prontera,275,213,0 duplicate(MailBox) Mailbox#2prt 888
prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 888 prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 888
// Izlude // Izlude
//============================================================ //============================================================
izlude,136,94,0 duplicate(MailBox) Mailbox#iz 888 izlude,136,94,0 duplicate(MailBox) Mailbox#iz 888
// Morroc // Morroc
//============================================================ //============================================================
morocc,166,110,0 duplicate(MailBox) Mailbox#moc 888 morocc,166,110,0 duplicate(MailBox) Mailbox#moc 888
morocc,168,262,0 duplicate(MailBox) Mailbox#2moc 888 morocc,168,262,0 duplicate(MailBox) Mailbox#2moc 888
// Geffen // Geffen
//============================================================ //============================================================
geffen,115,67,0 duplicate(MailBox) Mailbox#gef 888 geffen,115,67,0 duplicate(MailBox) Mailbox#gef 888
geffen,199,125,0 duplicate(MailBox) Mailbox#2gef 888 geffen,199,125,0 duplicate(MailBox) Mailbox#2gef 888
// Payon // Payon
//============================================================ //============================================================
payon,191,104,0 duplicate(MailBox) Mailbox#pay 888 payon,191,104,0 duplicate(MailBox) Mailbox#pay 888
payon,171,226,0 duplicate(MailBox) Mailbox#2pay 888 payon,171,226,0 duplicate(MailBox) Mailbox#2pay 888
pay_arche,55,127,0 duplicate(MailBox) Mailbox#3pay 888 pay_arche,55,127,0 duplicate(MailBox) Mailbox#3pay 888
// Alberta // Alberta
//============================================================ //============================================================
alberta,90,60,0 duplicate(MailBox) Mailbox#alb 888 alberta,90,60,0 duplicate(MailBox) Mailbox#alb 888
alberta,30,240,0 duplicate(MailBox) Mailbox#2alb 888 alberta,30,240,0 duplicate(MailBox) Mailbox#2alb 888
// Al De Baran // Al De Baran
//============================================================ //============================================================
aldebaran,135,122,0 duplicate(MailBox) Mailbox#alde 888 aldebaran,135,122,0 duplicate(MailBox) Mailbox#alde 888
// Juno // Juno
//============================================================ //============================================================
yuno,148,187,0 duplicate(MailBox) Mailbox#yuno 888 yuno,148,187,0 duplicate(MailBox) Mailbox#yuno 888
yuno,332,108,0 duplicate(MailBox) Mailbox#2yuno 888 yuno,332,108,0 duplicate(MailBox) Mailbox#2yuno 888
// Lightalzen // Lightalzen
//============================================================ //============================================================
lighthalzen,164,85,0 duplicate(MailBox) Mailbox#lht 888 lighthalzen,164,85,0 duplicate(MailBox) Mailbox#lht 888
lighthalzen,196,320,0 duplicate(MailBox) Mailbox#2lht 888 lighthalzen,196,320,0 duplicate(MailBox) Mailbox#2lht 888
// Einbroch and Einbech // Einbroch and Einbech
//============================================================ //============================================================
einbroch,231,215,0 duplicate(MailBox) Mailbox#ein 888 einbroch,231,215,0 duplicate(MailBox) Mailbox#ein 888
einbroch,77,202,0 duplicate(MailBox) Mailbox#2ein 888 einbroch,77,202,0 duplicate(MailBox) Mailbox#2ein 888
einbech,182,124,0 duplicate(MailBox) Mailbox#3ein 888 einbech,182,124,0 duplicate(MailBox) Mailbox#3ein 888
// Comodo // Comodo
//============================================================ //============================================================
comodo,200,150,0 duplicate(MailBox) Mailbox#cmd 888 comodo,200,150,0 duplicate(MailBox) Mailbox#cmd 888
// Umbala // Umbala
//============================================================ //============================================================
umbala,104,155,0 duplicate(MailBox) Mailbox#um 888 umbala,104,155,0 duplicate(MailBox) Mailbox#um 888
// Amatsu // Amatsu
//============================================================ //============================================================
amatsu,102,146,0 duplicate(MailBox) Mailbox#ama 888 amatsu,102,146,0 duplicate(MailBox) Mailbox#ama 888
// Gonryun // Gonryun
//============================================================ //============================================================
gonryun,152,117,0 duplicate(MailBox) Mailbox#gon 888 gonryun,152,117,0 duplicate(MailBox) Mailbox#gon 888
// Ayothaya // Ayothaya
//============================================================ //============================================================
ayothaya,205,169,0 duplicate(MailBox) Mailbox#ayo 888 ayothaya,205,169,0 duplicate(MailBox) Mailbox#ayo 888
// Louyang // Louyang
//============================================================ //============================================================
louyang,204,100,0 duplicate(MailBox) Mailbox#lou 888 louyang,204,100,0 duplicate(MailBox) Mailbox#lou 888
// Hugel // Hugel
//============================================================ //============================================================
hugel,86,168,0 duplicate(MailBox) Mailbox#hu 111 hugel,86,168,0 duplicate(MailBox) Mailbox#hu 111
// Rachel // Rachel
//============================================================ //============================================================
rachel,122,146,0 duplicate(MailBox) Post Box#ra 888 rachel,122,146,0 duplicate(MailBox) Post Box#ra 888

1676
npc/other/marriage.txt
View File

File diff suppressed because it is too large Load Diff

8
npc/warps/dungeons/louyang_dun.txt
View File

@ -1,5 +1,5 @@
//===== Athena Script ======================================== //===== eAthena Script =======================================
//= Lou Yang Dungeon Warp Script //= Louyang Dungeon Warp Script
//===== By: ================================================== //===== By: ==================================================
//= Nana (1.0) //= Nana (1.0)
//===== Current Version: ===================================== //===== Current Version: =====================================
@ -7,12 +7,12 @@
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= Any Athena Version 6.0+ //= Any Athena Version 6.0+
//===== Description: ========================================= //===== Description: =========================================
//= Warp Points for Lou Yang //= Warp Points for Louyang
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= No comment! //= No comment!
//============================================================ //============================================================
//= Loy Yang Dungeon ========================================= //= Louyang Dungeon ==========================================
lou_dun01,222,196,0 warp louwarp002a 3,3,louyang,41,270 lou_dun01,222,196,0 warp louwarp002a 3,3,louyang,41,270
lou_dun01,38,205,0 warp louwarp003 3,3,lou_dun02,282,20 lou_dun01,38,205,0 warp louwarp003 3,3,lou_dun02,282,20
lou_dun02,286,20,0 warp louwarp003a 3,3,lou_dun01,38,209 lou_dun02,286,20,0 warp louwarp003a 3,3,lou_dun01,38,209

2
sql-files/mob_db2.sql
View File

@ -68,7 +68,7 @@ CREATE TABLE `mob_db2` (
# // Monsters Additional Database # // Monsters Additional Database
# // # //
# // Structure of Database : # // Structure of Database :
# // ID,Sprite_Name,kROName,iROName,LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,ThinkTime,aMotion,dMotion,MEXP,ExpPer,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper # // ID,Sprite_Name,kROName,iROName,LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,aDelay,aMotion,dMotion,MEXP,ExpPer,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper
# // Crusader quest monsters with poring stats (No drops) # // Crusader quest monsters with poring stats (No drops)
REPLACE INTO `mob_db2` VALUES (1910,'C_GHOUL','Ghoul','Ghoul',1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); REPLACE INTO `mob_db2` VALUES (1910,'C_GHOUL','Ghoul','Ghoul',1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
REPLACE INTO `mob_db2` VALUES (1911,'C_KHALITZBURG','Khalitzburg','Khalitzburg',1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); REPLACE INTO `mob_db2` VALUES (1911,'C_KHALITZBURG','Khalitzburg','Khalitzburg',1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);

2
src/login_sql/login.c
View File

@ -2,13 +2,13 @@
// For more information, see LICENCE in the main folder // For more information, see LICENCE in the main folder
#include "../common/cbasetypes.h" #include "../common/cbasetypes.h"
#include "../common/mmo.h"
#include "../common/core.h" #include "../common/core.h"
#include "../common/socket.h" #include "../common/socket.h"
#include "../common/db.h" #include "../common/db.h"
#include "../common/timer.h" #include "../common/timer.h"
#include "../common/malloc.h" #include "../common/malloc.h"
#include "../common/strlib.h" #include "../common/strlib.h"
#include "../common/mmo.h"
#include "../common/showmsg.h" #include "../common/showmsg.h"
#include "../common/version.h" #include "../common/version.h"
#include "../common/md5calc.h" #include "../common/md5calc.h"

2
src/map/clif.c
View File

@ -1,5 +1,5 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LI3CENCE in the main folder // For more information, see LICENCE in the main folder
#define DUMP_UNKNOWN_PACKET 0 #define DUMP_UNKNOWN_PACKET 0
#define DUMP_ALL_PACKETS 0 #define DUMP_ALL_PACKETS 0