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

- Corrected Aliza card's item_db line.

Browse Source 
- Capped clif_heal's heal field (the argument received is int, but the packet field is short, meaning that if the heal is high enough, the client would receive a negative heal amount).
- Some indentation fixes.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10165 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-04-06 15:34:18 +00:00
parent 515d98c194
commit 79cb6af0cb
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -3,6 +3,11 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/04/07
* Capped clif_heal's heal field (the argument received is int, but the
packet field is short, meaning that if the heal is high enough, the client
would receive a negative heal amount). [Skotlex]
2007/04/06 2007/04/06
* Made a crazy attempt to at least partially synchronize login&char code * Made a crazy attempt to at least partially synchronize login&char code
* Major edit to the way the servers handle ip addresses, making them obey * Major edit to the way the servers handle ip addresses, making them obey

3
db/Changelog.txt
View File

@ -19,6 +19,9 @@
----- -----
======================== ========================
04/07
* Corrected Aliza card's item_db line. [Skotlex]
04/05 04/05
* Fixed some items that should heal percentual hp/sp [Playtester] * Fixed some items that should heal percentual hp/sp [Playtester]
04/04 04/04

2
db/item_db.txt
View File

@ -1577,7 +1577,7 @@
4397,Tha_Despero_Card,Thanatos Despero Card,6,,10,10,,,,,,,,32,,,,,{ bonus bInt,getrefine()-6; },{},{} 4397,Tha_Despero_Card,Thanatos Despero Card,6,,10,10,,,,,,,,32,,,,,{ bonus bInt,getrefine()-6; },{},{}
4398,Tha_Dolor_Card,Thanatos Dolor Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Angel,10; },{},{} 4398,Tha_Dolor_Card,Thanatos Dolor Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Angel,10; },{},{}
4399,Thanatos_Card,Thanatos Card,6,,10,10,,,,,,,,2,,,,,{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; bonus bSPDrainValue,-1; bonus bDef,-30; bonus bFlee,-30; },{},{} 4399,Thanatos_Card,Thanatos Card,6,,10,10,,,,,,,,2,,,,,{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; bonus bSPDrainValue,-1; bonus bDef,-30; bonus bFlee,-30; },{},{}
4400,Aliza_Card,Aliza Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,1011,1,50+50*(BaseJob == Job_Dancer),1; } },{},{} 4400,Aliza_Card,Aliza Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,1011,1,50+50*(BaseJob == Job_Dancer),1; },{},{}
4401,Alicel_Card,Alicel Card,6,,10,10,,,,,,,,16,,,,,{ bonus bFlee,10; bonus bDef,-5; },{},{} 4401,Alicel_Card,Alicel Card,6,,10,10,,,,,,,,16,,,,,{ bonus bFlee,10; bonus bDef,-5; },{},{}
4402,Aliot_Card,Aliot Card,6,,10,10,,,,,,,,4,,,,,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) { bonus bStr, 2; bonus bMaxHPrate, 5; } if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) { bonus bInt, 2; bonus bMaxSPrate, 5; } },{},{} 4402,Aliot_Card,Aliot Card,6,,10,10,,,,,,,,4,,,,,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) { bonus bStr, 2; bonus bMaxHPrate, 5; } if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) { bonus bInt, 2; bonus bMaxSPrate, 5; } },{},{}
4403,Kiel_Card,Kiel Card,6,,10,10,,,,,,,,769,,,,,{ bonus bDelayRate,-30; },{},{} 4403,Kiel_Card,Kiel Card,6,,10,10,,,,,,,,769,,,,,{ bonus bDelayRate,-30; },{},{}

2
src/login/login.c
View File

@ -1176,7 +1176,7 @@ int mmo_auth(struct mmo_account* account, int fd)
if (new_account_flag) if (new_account_flag)
{ {
if (account->passwdenc == 0 && account->userid[len] == '_' && if (account->passwdenc == 0 && account->userid[len] == '_' &&
(account->userid[len+1] == 'F' || account->userid[len+1] == 'M' || (account->userid[len+1] == 'F' || account->userid[len+1] == 'M' ||
account->userid[len+1] == 'f' || account->userid[len+1] == 'm') && account->userid[len+1] == 'f' || account->userid[len+1] == 'm') &&
account_id_count <= END_ACCOUNT_NUM && len >= 4 && strlen(account->passwd) >= 4) account_id_count <= END_ACCOUNT_NUM && len >= 4 && strlen(account->passwd) >= 4)
{ {

12
src/login_sql/login.c
View File

@ -833,12 +833,12 @@ int parse_fromchar(int fd)
WFIFOHEAD(fd,51); WFIFOHEAD(fd,51);
account_id = RFIFOL(fd,2); // speed up account_id = RFIFOL(fd,2); // speed up
for(i = 0; i < AUTH_FIFO_SIZE; i++) { for(i = 0; i < AUTH_FIFO_SIZE; i++) {
if (auth_fifo[i].account_id == account_id && if(auth_fifo[i].account_id == account_id &&
auth_fifo[i].login_id1 == RFIFOL(fd,6) && auth_fifo[i].login_id1 == RFIFOL(fd,6) &&
auth_fifo[i].login_id2 == RFIFOL(fd,10) && // relate to the versions higher than 18 auth_fifo[i].login_id2 == RFIFOL(fd,10) && // relate to the versions higher than 18
auth_fifo[i].sex == RFIFOB(fd,14) && auth_fifo[i].sex == RFIFOB(fd,14) &&
auth_fifo[i].ip == ntohl(RFIFOL(fd,15)) && auth_fifo[i].ip == ntohl(RFIFOL(fd,15)) &&
!auth_fifo[i].delflag) !auth_fifo[i].delflag)
{ {
auth_fifo[i].delflag = 1; auth_fifo[i].delflag = 1;
break; break;

2
src/map/clif.c
View File

@ -4962,7 +4962,7 @@ int clif_heal(int fd,int type,int val)
WFIFOHEAD(fd,packet_len(0x13d)); WFIFOHEAD(fd,packet_len(0x13d));
WFIFOW(fd,0)=0x13d; WFIFOW(fd,0)=0x13d;
WFIFOW(fd,2)=type; WFIFOW(fd,2)=type;
WFIFOW(fd,4)=val; WFIFOW(fd,4)=cap_value(val,0,SHRT_MAX);
WFIFOSET(fd,packet_len(0x13d)); WFIFOSET(fd,packet_len(0x13d));
return 0; return 0;