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

More svn:eol-style-ing and typo fixes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10256 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-04-14 11:06:13 +00:00
parent c16fda4dab
commit aa262362e1
6 changed files with 7344 additions and 7357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
npc/mobs/fields/veins.txt
View File

@ -1,62 +1,62 @@
//===== eAthena Script =========================================== //===== eAthena Script ===========================================
//= Beins Field Monster Spawn Script. //= Veins Field Monster Spawn Script.
//===== By: ====================================================== //===== By: ======================================================
//= $ephiroth //= $ephiroth
//===== Current Version: ========================================= //===== Current Version: =========================================
//= 1.3 //= 1.3
//===== Compatible With: ========================================= //===== Compatible With: =========================================
//= Any Athena Version //= Any Athena Version
//===== Additional Comments: ===================================== //===== Additional Comments: =====================================
//= 1.0 Temp. monster spawn in Beins Field. [$ephiroth] //= 1.0 Temp. monster spawn in Veins Field. [$ephiroth]
//= 1.1 Updated monster spawn based on kRO website. [$ephiroth] //= 1.1 Updated monster spawn based on kRO website. [$ephiroth]
//= 1.2 Updated mobs based on info jAthena. [$ephiroth] //= 1.2 Updated mobs based on info jAthena. [$ephiroth]
//= 1.3 Fixed some typos and Atros spawn [Playtester] //= 1.3 Fixed some typos and Atros spawn [Playtester]
//================================================================ //================================================================
//======== [Beins Field-01] ====================================== //======== [Veins Field-01] ======================================
ve_fild01.gat,0,0,0 monster Side Winder 1037,1,0,0,0 ve_fild01.gat,0,0,0 monster Side Winder 1037,1,0,0,0
ve_fild01.gat,0,0,0 monster Muka 1055,40,0,0,0 ve_fild01.gat,0,0,0 monster Muka 1055,40,0,0,0
ve_fild01.gat,0,0,0 monster Red Plant 1078,10,180000,90000,1 ve_fild01.gat,0,0,0 monster Red Plant 1078,10,180000,90000,1
ve_fild01.gat,0,0,0 monster Blue Plant 1079,3,1800000,900000,1 ve_fild01.gat,0,0,0 monster Blue Plant 1079,3,1800000,900000,1
ve_fild01.gat,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 ve_fild01.gat,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
ve_fild01.gat,0,0,0 monster Shining Plant 1083,1,1800000,900000,1 ve_fild01.gat,0,0,0 monster Shining Plant 1083,1,1800000,900000,1
ve_fild01.gat,0,0,0 monster Drops 1113,20,0,0,0 ve_fild01.gat,0,0,0 monster Drops 1113,20,0,0,0
ve_fild01.gat,0,0,0 monster Stapo 1784,20,0,0,0 ve_fild01.gat,0,0,0 monster Stapo 1784,20,0,0,0
//======== [Beins Field-02] ======================================= //======== [Veins Field-02] =======================================
ve_fild02.gat,0,0,0 monster Side Winder 1037,10,0,0,0 ve_fild02.gat,0,0,0 monster Side Winder 1037,10,0,0,0
ve_fild02.gat,0,0,0 monster Savage 1166,60,0,0,0 ve_fild02.gat,0,0,0 monster Savage 1166,60,0,0,0
ve_fild02.gat,0,0,0 monster Roween 1782,30,0,0,0 ve_fild02.gat,0,0,0 monster Roween 1782,30,0,0,0
ve_fild02.gat,0,0,0 monster Atros 1785,1,86400000,86000000,1 ve_fild02.gat,0,0,0 monster Atros 1785,1,86400000,86000000,1
//======== [Beins Field-03] ======================================= //======== [Veins Field-03] =======================================
ve_fild03.gat,0,0,0 monster Sleeper 1386,40,0,0,0 ve_fild03.gat,0,0,0 monster Sleeper 1386,40,0,0,0
ve_fild03.gat,0,0,0 monster Magmaring 1836,30,0,0,0 ve_fild03.gat,0,0,0 monster Magmaring 1836,30,0,0,0
//======== [Beins Field-04] ======================================= //======== [Veins Field-04] =======================================
ve_fild04.gat,0,0,0 monster Desert Wolf 1106,30,0,0,0 ve_fild04.gat,0,0,0 monster Desert Wolf 1106,30,0,0,0
ve_fild04.gat,0,0,0 monster Muscipular 1780,10,0,0,0 ve_fild04.gat,0,0,0 monster Muscipular 1780,10,0,0,0
ve_fild04.gat,0,0,0 monster Roween 1782,15,0,0,0 ve_fild04.gat,0,0,0 monster Roween 1782,15,0,0,0
ve_fild04.gat,0,0,0 monster Stapo 1784,30,0,0,0 ve_fild04.gat,0,0,0 monster Stapo 1784,30,0,0,0
//======== [Beins Field-05] ======================================= //======== [Veins Field-05] =======================================
ve_fild05.gat,0,0,0 monster Red Plant 1078,10,180000,90000,1 ve_fild05.gat,0,0,0 monster Red Plant 1078,10,180000,90000,1
ve_fild05.gat,0,0,0 monster Desert Wolf 1106,10,0,0,0 ve_fild05.gat,0,0,0 monster Desert Wolf 1106,10,0,0,0
ve_fild05.gat,0,0,0 monster Sleeper 1386,10,0,0,0 ve_fild05.gat,0,0,0 monster Sleeper 1386,10,0,0,0
ve_fild05.gat,0,0,0 monster Muscipular 1780,10,0,0,0 ve_fild05.gat,0,0,0 monster Muscipular 1780,10,0,0,0
ve_fild05.gat,0,0,0 monster Drosera 1781,10,0,0,0 ve_fild05.gat,0,0,0 monster Drosera 1781,10,0,0,0
ve_fild05.gat,0,0,0 monster Roween 1782,20,0,0,0 ve_fild05.gat,0,0,0 monster Roween 1782,20,0,0,0
ve_fild05.gat,0,0,0 monster Galion 1783,5,0,0,0 ve_fild05.gat,0,0,0 monster Galion 1783,5,0,0,0
//======== [Beins Field-06] ======================================= //======== [Veins Field-06] =======================================
ve_fild06.gat,0,0,0 monster Red Plant 1078,3,180000,90000,1 ve_fild06.gat,0,0,0 monster Red Plant 1078,3,180000,90000,1
ve_fild06.gat,0,0,0 monster Shining Plant 1083,1,1800000,900000,1 ve_fild06.gat,0,0,0 monster Shining Plant 1083,1,1800000,900000,1
ve_fild06.gat,0,0,0 monster Stapo 1784,5,120000,60000,1 ve_fild06.gat,0,0,0 monster Stapo 1784,5,120000,60000,1
//======== [Beins Field-07] ======================================= //======== [Veins Field-07] =======================================
ve_fild07.gat,0,0,0 monster Side Winder 1037,1,0,0,0 ve_fild07.gat,0,0,0 monster Side Winder 1037,1,0,0,0
ve_fild07.gat,0,0,0 monster Shellfish 1074,40,0,0,0 ve_fild07.gat,0,0,0 monster Shellfish 1074,40,0,0,0
ve_fild07.gat,0,0,0 monster White Plant 1082,5,180000,90000,1 ve_fild07.gat,0,0,0 monster White Plant 1082,5,180000,90000,1
ve_fild07.gat,0,0,0 monster Raggler 1254,20,0,0,0 ve_fild07.gat,0,0,0 monster Raggler 1254,20,0,0,0
ve_fild07.gat,0,0,0 monster Aster 1266,30,0,0,0 ve_fild07.gat,0,0,0 monster Aster 1266,30,0,0,0
ve_fild07.gat,0,0,0 monster Stapo 1784,20,0,0,0 ve_fild07.gat,0,0,0 monster Stapo 1784,20,0,0,0

14460
npc/quests/Kiel_Hyre_Quest.txt
View File

File diff suppressed because it is too large Load Diff

100
npc/sample/npc_live_dialogues.txt
View File

@ -1,51 +1,51 @@
//by Lupus. //by Lupus.
// *** Usage of Global_Functions.txt (you can translate Global_Functions.txt function messages) // *** Usage of Global_Functions.txt (you can translate Global_Functions.txt function messages)
// Here's a polite wolf NPC ^_- Luppy // Here's a polite wolf NPC ^_- Luppy
// learn how to make your NPC more alive. // learn how to make your NPC more alive.
// PS don't use it as a normal NPC in your server. It's exploitable 8) // PS don't use it as a normal NPC in your server. It's exploitable 8)
prontera,167,177,5 script Luppy 1107,{ prontera,167,177,5 script Luppy 1107,{
mes "[Luppy]"; mes "[Luppy]";
//say random greeting from Global_Functions.txt //say random greeting from Global_Functions.txt
mes callfunc("F_Hi"); mes callfunc("F_Hi");
//say a compliment according to player's gender //say a compliment according to player's gender
//1st string is for FEMALE, 2nd for MALE //1st string is for FEMALE, 2nd for MALE
mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!"); mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!");
//add some random greeting and goodbye into the menu //add some random greeting and goodbye into the menu
menu callfunc("F_Hi"),-, callfunc("F_Bye"),M_BYE; menu callfunc("F_Hi"),-, callfunc("F_Bye"),M_BYE;
mes "[Luppy]"; mes "[Luppy]";
//give a random prize from set list of items //give a random prize from set list of items
if(@gotstuff){ if(@gotstuff){
//again, say stuff according to player's gender //again, say stuff according to player's gender
mes "I like "+callfunc("F_Sex","smiling ladies!","bloody pirates!"); mes "I like "+callfunc("F_Sex","smiling ladies!","bloody pirates!");
//show one of 3 emotion from the list (we added ,1 to show emotion over PLAYER's head) //show one of 3 emotion from the list (we added ,1 to show emotion over PLAYER's head)
emotion callfunc("F_RandMes",3,e_scissors,e_kis,e_pat),1; emotion callfunc("F_RandMes",3,e_scissors,e_kis,e_pat),1;
close; close;
} }
//we set a temp var to give present just once. Player can get more by RE-entering the server //we set a temp var to give present just once. Player can get more by RE-entering the server
set @gotstuff,1; set @gotstuff,1;
//get item Id from the list of presents: Apple, Mastela Fruit, Yggdrasil Seed or Orange Juice //get item Id from the list of presents: Apple, Mastela Fruit, Yggdrasil Seed or Orange Juice
set @itemIDfromList, callfunc("F_RandMes",4,512,522,608,620); set @itemIDfromList, callfunc("F_RandMes",4,512,522,608,620);
//again, say stuff according to player's gender //again, say stuff according to player's gender
mes "Hey, "+callfunc("F_Sex","sister!","brother!")+" I have "+getitemname(@itemIDfromList)+" for you!"; mes "Hey, "+callfunc("F_Sex","sister!","brother!")+" I have "+getitemname(@itemIDfromList)+" for you!";
//get the item from the list //get the item from the list
getitem @itemIDfromList,1; getitem @itemIDfromList,1;
close; close;
M_BYE: M_BYE:
mes "[Luppy]"; mes "[Luppy]";
//add some random goodbye from Global_Functions.txt //add some random goodbye from Global_Functions.txt
mes callfunc("F_Bye"); mes callfunc("F_Bye");
close; close;
} }
//Please, be more creative. Or else this li'l wolfy would eat you up! //Please, be more creative. Or else this li'l wolfy would eat you up!

13
sql-files/update_logs.sql
View File

@ -1,13 +0,0 @@
#ZenyLog types (M)onsters,(T)rade,(V)ending Sell/Buy,(S)hop Sell/Buy,(N)PC Change amount,(A)dministrators
#Database: log
#Table: zenylog
CREATE TABLE `zenylog` (
`id` int(11) NOT NULL auto_increment,
`time` datetime NOT NULL default '0000-00-00 00:00:00',
`char_id` int(11) NOT NULL default '0',
`src_id` int(11) NOT NULL default '0',
`type` set('M','T','V','S','N','A') NOT NULL default 'S',
`amount` int(11) NOT NULL default '0',
`map` varchar(20) NOT NULL default 'prontera.gat',
PRIMARY KEY (`id`)
) TYPE=MyISAM AUTO_INCREMENT=1 ;

2
src/map/atcommand.c
View File

@ -7219,7 +7219,7 @@ int atcommand_useskill(const int fd, struct map_session_data* sd, const char* co
} }
/*========================================== /*==========================================
* @showskill by [Skotlex] * @displayskill by [Skotlex]
* Debug command to locate new skill IDs. It sends the * Debug command to locate new skill IDs. It sends the
* three possible skill-effect packets to the area. * three possible skill-effect packets to the area.
*------------------------------------------ *------------------------------------------

2
src/map/status.h
View File

@ -383,7 +383,7 @@ enum {
SI_STAR_COMFORT = 171, SI_STAR_COMFORT = 171,
SI_PRESERVE = 181, SI_PRESERVE = 181,
SI_INCSTR = 182, SI_INCSTR = 182,
SI_INTRAVISION = 184, //WTF?? creates the black shape of 4_m_02 NPC, with NPC talk cursor. Supposedly intravision shows this. SI_INTRAVISION = 184,
SI_DOUBLECAST = 186, SI_DOUBLECAST = 186,
SI_MAXOVERTHRUST = 188, SI_MAXOVERTHRUST = 188,
SI_TAROT = 191, // the icon allows no doubt... but what is it really used for ?? [DracoRPG] SI_TAROT = 191, // the icon allows no doubt... but what is it really used for ?? [DracoRPG]