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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@820 54d463be-8e91-2dee-dedb-b68131a5f0ec

Browse Source
This commit is contained in:
mc_cameri 2004-12-27 14:35:37 +00:00
parent db26596032
commit 1d7fbf3c64
9 changed files with 46 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -1,5 +1,8 @@
Date Added
12/27
* Removed some printf's from map-sql [MC Cameri]
* Uncommented MSG_SQL, for _ShowMessage(), usage: ShowSQL() [MC Cameri]
* Removed fixed bugs in dev/bugs.txt [MC Cameri]
* Now I remember what I was smoking.. (SVN 819) [MouseJstr]
* Fixed a bug in the guild_castle persistance code
in char_sql. What was I smoking? (SVN: 816) [MouseJstr]

6
Dev/TODO.txt
View File

@ -766,3 +766,9 @@ Description add MvM map flag
Status: Pending
Assignee None
Notes for allowing a monster on monster arena
***
70.
Description Redo the gm help files
Status Pending
Assignee MC_Cameri
Notes Do this after all @char commands are converted to # to avoid any problems.

52
Dev/bugs.txt
View File

@ -46,23 +46,10 @@ Problem: Wierd login-server bug on sql, it displays that the server is full when
Assigned: N/A
Progress: 0%
Problem: Login-Txt is now crashing when you close it using ^C, Ctrl+C(on windows), it only does that if login was connected with char-server.
Assigned: MC Cameri
Progress: 100%
Problem: MVP cast spells w/o showing "prepare cast line"
Assigned: N/A
Progress: 0%
Problem: Item duping bug in storage...
Assigned: MouseJstr
Progress: 100%
Let's say you have 200 arrows and 100 Rosiotti arrow, you'll put 100 and 50 in storage
And you should end when you log back in with 100 of each on you and 100 and 50 in storage
Gain 50
Repeat
Problem: ~40+ players connected.. and soon can't re-connect, they can enter password, but never see "select character" screen.
Assigned: N/A
Progress: 0%
@ -73,27 +60,6 @@ Progress: 0%
DB server Error - You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'n' Sniff')' at line 1 Scratch 'n' Sniff
Problem: Spiral Pierce can cause loss of Skill Points
Assigned: MouseJstr
Progress: 100%
If you have a skill but due to a job change (or admin update), the
skill tree changes and you no longer can get to that skill, you
will loose the skill points if you log out/i
The easiest way to reproduce this problem is become a Peco Lord
Knight, get spiral pierce, get off the peco, log off, log in, and
get back on the peco. You will not have Spiral Pierce anymore and
you will have lost the skill points
Problem: blacksmith hammerfall on the new_1-1.gat's bridge crashes server
Assigned: N/A
Progress: 100% (fixed)
Problem: hunter spamming traps crashes server
Assigned: N/A
Progress: 100% (fixed)
Problem: PETS can attack Guardians, so players go to enemy castles before WOE and KILL all their Guards with PETS... LoL!
Assigned: N/A
Progress: 0%
@ -131,25 +97,10 @@ Progress: -
Notes: It works differently now, you have to use it once to *allow* it to
activate, and once again to stop it from activating. ^^; [Celest]
Problem: When you change JOB, you don't lose skills in DB. It
means if you were Merchant once
you can buy/sell with discount being Mage, etc.
Those skills aren't being shown in the skilltree, but
they do work.
(fixed)
Assigned: MouseJstr
Progress: 100%
Problem: Due to the Guilds CACHE we see some went-offline members as online ones. It is very confusing. You don't know who's really on.
Assigned: N/A
Progress: 0%
Problem: When you have UNNAMED Arrows and Named Arrows in the storage and take some arrows then it change amount of other items.
It happens because server doesn't recognize Named and Unnamed Stockable items (Elemental Gems, Iron, Steel, Holy Water, Arrows)
Assigned: MouseJstr
Progress: 100%
Problem: Guilds BUG (it isn't related to the scripts, because noone change them recently)
When some guild SEIZE any castle, then Castle N 1 becomes their own, too (not M 0, but M 1)
Assigned: N/A
@ -181,5 +132,4 @@ Progress: 0%
battle.c:3078: Element size: 4 bytes
battle.c:3078: Number of elements: 16
battle.c:3078: Created at: malloc.c, line 23
battle.c:3078: Storage class: heap
battle.c:3078: Storage class: heap

4
db/mob_avail.txt
View File

@ -9,8 +9,12 @@
//1002,1039 //Poring,Baphomet (Make Porings look like Baphomet)
// eAthena Dev Team
// Valaris
1900,12,1,1,1,16,0,67,12,54,16,1
// Valaris Worshiping
1901,6,1,1,1,1,2,67,12,54,0,1
// MC Cameri
1902,14,1,6,6,16,14,0,0,0,32,3
1920,1047,0
1921,1093,0

1
db/mob_db.txt
View File

@ -522,6 +522,7 @@
1587,KRABEN,Kraben,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,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,4001,20,0,0,0,0,0,0,0,0,,
1900,VALARIS,Valaris,99,668000,0,107250,37895,1,440,510,35,45,1,152,96,85,120,95,10,10,0,7,67,181,100,676,1152,768,1466,200,2256,200,2607,800,714,500,617,3000,984,4300,985,5600,4147,1,13000,0,608,1000,750,400,923,3800,,
1901,VALARIS_WORSHIPPER,Valaris's Worshipper,50,8578,0,2706,1480,1,260,310,15,25,1,75,55,1,93,45,10,12,0,7,27,149,100,868,480,120,923,500,984,63,1464,2,607,50,610,100,503,300,2405,50,4129,1,0,0,0,0,0,0,0,0,,
1902,MC_CAMERI,MC Cameri,99,668000,0,107250,37895,1,440,510,35,45,1,152,96,85,120,95,10,10,0,7,67,181,100,676,1152,768,1466,200,2256,200,2607,800,714,500,617,3000,984,4300,985,5600,4147,1,13000,0,608,1000,750,400,923,3800,,
1920,EASTER_EGG,Easter Egg,3,300,0,4,4,0,1,2,20,20,1,1,1,1,1,20,10,12,0,0,60,128,1000,1001,1,1,1010,250,935,500,558,300,501,200,501,200,713,800,558,300,558,300,0,0,0,0,0,0,0,0,,
1921,EASTER_BUNNY,Easter Bunny,6,1800,0,60,55,1,20,26,0,40,1,36,6,1,11,80,10,10,0,2,60,181,200,1456,456,336,2250,200,515,8000,727,1200,746,1500,706,30,622,50,534,5000,4006,70,0,0,0,0,0,0,0,0,,
1970,PORING_,Poring,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,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,4001,20,0,0,0,0,0,0,0,0,,

2
db/mob_skill_db.txt
View File

@ -1996,6 +1996,8 @@ Only place specification skill is good for a round system. friend is good only o
1900,Grimtooth,chase,137,5,2500,0,0,no,target,always,0,,,,,,
// Valaris's Worshipper
1901,Envenom,attack,52,10,500,0,10000,no,target,always,0,,,,,,
// MC Cameri
// Easter Bunny
1921,Summon Minions,attack,196,5,1000,3000,10000,no,self,slavele,2,1063,,,,,

26
src/common/showmsg.c
View File

@ -21,11 +21,9 @@ int _ShowMessage(const char *string, enum msg_type flag){ // by MC Cameri
case MSG_STATUS: //Bright Green (To inform about good things)
strcpy(prefix,CL_GREEN"[Status]"CL_RESET":");
break;
/* //Do we really need this now? [MC Cameri]
case MSG_SQL: //Bright Violet (For dumping out anything related with SQL)
strcpy(prefix,CL_MAGENTA"[SQL]"CL_RESET":");
break;
*/
case MSG_INFORMATION: //Bright White (Variable information)
strcpy(prefix,CL_WHITE"[Info]"CL_RESET":");
break;
@ -49,18 +47,18 @@ int _ShowMessage(const char *string, enum msg_type flag){ // by MC Cameri
return 1;
}
if (!(flag == MSG_DEBUG && !SHOW_DEBUG_MSG)) {
output = (char*)malloc(sizeof(char)*(strlen(prefix)+strlen(string)+2)); // +2: space and a \0
if (output == NULL) {
return 1;
// exit(1); // Kill server? Deadly
}
strcpy(output,prefix);
strcat(output," ");
strcat(output,string);
printf(output);
fflush(stdout);
free(output);
output = (char*)malloc(sizeof(char)*(strlen(prefix)+strlen(string)+2)); // prefix+string+two chars(space and \0)
if (output == NULL) {
return 1;
// exit(1); // Kill server? Deadly
}
strcpy(output,prefix);
strcat(output," ");
strcat(output,string);
printf(output);
fflush(stdout);
free(output);
}
/*
if ((core_config.debug_output_level > -1) && (flag >= core_config.debug_output_level)) {

4
src/common/showmsg.h
View File

@ -18,7 +18,7 @@
extern char tmp_output[1024];
enum msg_type {MSG_STATUS,/* MSG_SQL, */MSG_INFORMATION,MSG_NOTICE,MSG_WARNING,MSG_DEBUG,MSG_ERROR,MSG_FATALERROR};
enum msg_type {MSG_STATUS, MSG_SQL, MSG_INFORMATION,MSG_NOTICE,MSG_WARNING,MSG_DEBUG,MSG_ERROR,MSG_FATALERROR};
extern int _ShowMessage(const char *string, enum msg_type flag);
@ -32,7 +32,7 @@ extern int _ShowMessage(const char *string, enum msg_type flag);
// #define DisplayStatus(string) _ShowMessage(string,MSG_STATUS)
/* MSG_SQL*/
// #define ShowSQL(string) _ShowMessage(string,MSG_SQL)
#define ShowSQL(string) _ShowMessage(string,MSG_SQL)
// #define DisplaySQL(string) _ShowMessage(string,MSG_SQL)
/* MSG_INFORMATION */

29
src/map/map.c
View File

@ -2325,7 +2325,8 @@ int sql_config_read(char *cfgName)
fp=fopen(cfgName,"r");
if(fp==NULL){
printf("file not found: %s\n",cfgName);
snprintf(tmp_output,sizeof(tmp_output),"File not found: '%s'.\n",cfgName);
ShowError(tmp_output);
return 1;
}
while(fgets(line,1020,fp)){
@ -2355,19 +2356,19 @@ int sql_config_read(char *cfgName)
//Map Server SQL DB
} else if(strcmpi(w1,"map_server_ip")==0){
strcpy(map_server_ip, w2);
printf ("set map_server_ip : %s\n",w2);
// printf ("set map_server_ip : %s\n",w2);
} else if(strcmpi(w1,"map_server_port")==0){
map_server_port=atoi(w2);
printf ("set map_server_port : %s\n",w2);
// printf ("set map_server_port : %s\n",w2);
} else if(strcmpi(w1,"map_server_id")==0){
strcpy(map_server_id, w2);
printf ("set map_server_id : %s\n",w2);
// printf ("set map_server_id : %s\n",w2);
} else if(strcmpi(w1,"map_server_pw")==0){
strcpy(map_server_pw, w2);
printf ("set map_server_pw : %s\n",w2);
// printf ("set map_server_pw : %s\n",w2);
} else if(strcmpi(w1,"map_server_db")==0){
strcpy(map_server_db, w2);
printf ("set map_server_db : %s\n",w2);
// printf ("set map_server_db : %s\n",w2);
//Map server option to use SQL db or not
} else if(strcmpi(w1,"use_sql_db")==0){
if (strcmpi(w2,"yes")){db_use_sqldbs=0;} else if (strcmpi(w2,"no")){db_use_sqldbs=1;}
@ -2375,25 +2376,25 @@ int sql_config_read(char *cfgName)
//Login Server SQL DB
} else if(strcmpi(w1,"login_server_ip")==0){
strcpy(login_server_ip, w2);
printf ("set login_server_ip : %s\n",w2);
// printf ("set login_server_ip : %s\n",w2);
} else if(strcmpi(w1,"login_server_port")==0){
login_server_port = atoi(w2);
printf ("set login_server_port : %s\n",w2);
// printf ("set login_server_port : %s\n",w2);
} else if(strcmpi(w1,"login_server_id")==0){
strcpy(login_server_id, w2);
printf ("set login_server_id : %s\n",w2);
// printf ("set login_server_id : %s\n",w2);
} else if(strcmpi(w1,"login_server_pw")==0){
strcpy(login_server_pw, w2);
printf ("set login_server_pw : %s\n",w2);
// printf ("set login_server_pw : %s\n",w2);
} else if(strcmpi(w1,"login_server_db")==0){
strcpy(login_server_db, w2);
printf ("set login_server_db : %s\n",w2);
// printf ("set login_server_db : %s\n",w2);
} else if(strcmpi(w1,"lowest_gm_level")==0){
lowest_gm_level = atoi(w2);
printf ("set lowest_gm_level : %s\n",w2);
// printf ("set lowest_gm_level : %s\n",w2);
} else if(strcmpi(w1,"read_gm_interval")==0){
read_gm_interval = ( atoi(w2) * 60 * 1000 ); // Minutes multiplied by 60 secs per min by 1000 milliseconds per second
printf ("set read_gm_interval : %s\n",w2);
// printf ("set read_gm_interval : %s\n",w2);
} else if(strcmpi(w1,"log_db")==0) {
strcpy(log_db, w2);
} else if(strcmpi(w1,"log_db_ip")==0) {
@ -2567,7 +2568,7 @@ void map_helpscreen(int flag) {
puts("Usage: map-server [options]");
puts("Options:");
puts(CL_WHITE" Commands\t\t\tDescription"CL_RESET);
puts("---------------------------------------------");
puts("-----------------------------------------------------------------------------");
puts(" --help, --h, --?, /? Displays this help screen");
puts(" --map-config <file> Load map-server configuration from <file>");
puts(" --battle-config <file> Load battle configuration from <file>");