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

- Removed 'skill_steal_type' from skill.conf as said config no longer exists.

Browse Source 
- Corrected @slaveclone/@clone behaving as @evilclone when you change the @ symbol.
- Modified SC_ARMOR_ELEMENT so it grants elemental resist as if it they were card granted bonuses.
- fixed a SA_DISPELL crash when casted on an object with no status changes.
- Adjusted the autospell code so that it does not relies on card_id == 0 for subtracting rates.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12041 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2008-01-10 13:10:13 +00:00
parent 5c4212300a
commit 614c28dbf9
8 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog-Trunk.txt
View File

@ -3,6 +3,12 @@ Date Added
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.
2008/01/10
* Corrected @slaveclone/@clone behaving as @evilclone when you change the @
symbol.
* Modified SC_ARMOR_ELEMENT so it grants elemental resist as if it they
were card granted bonuses.
* fixed a SA_DISPELL crash when casted on an object with no status changes.
2008/01/09
* Script command warpportal now places a warp in its initial state (as if a
real warp portal was casted).

4
conf/Changelog.txt
View File

@ -1,4 +1,8 @@
Date Added
2008/01/10
* Removed 'skill_steal_type' from skill.conf as said config no longer
exists. [Skotlex]
2008/01/06
* Added job_knt to nomemo, no return & noteleport mapflags. [Samuray22]
2007/11/27

3
conf/battle/skill.conf
View File

@ -193,9 +193,6 @@ skill_removetrap_type: 0
// Does using bow to do a backstab give a 50% damage penalty? (Note 1)
backstab_bow_penalty: yes
// Use kRO new steal formula? (favors skillv more than dex difference) (Note 1)
skill_steal_type: yes
// How many times you could try to steal from a mob.
// Note: It helps to avoid stealing exploit on monsters with few rare items
// Use 0 to disable (max allowed value is 255)

4
src/map/atcommand.c
View File

@ -7971,9 +7971,9 @@ int atcommand_clone(const int fd, struct map_session_data* sd, const char* comma
return 0;
}
if (strcmpi(command, "@clone") == 0)
if (strcmpi(command+1, "clone") == 0)
flag = 1;
else if (strcmpi(command, "@slaveclone") == 0) {
else if (strcmpi(command+1, "slaveclone") == 0) {
flag = 2;
master = sd->bl.id;
if (battle_config.atc_slave_clone_limit

8
src/map/battle.c
View File

@ -236,14 +236,6 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag
}
if (tsc && tsc->count)
{
if(tsc->data[SC_ARMOR_ELEMENT])
{
if (tsc->data[SC_ARMOR_ELEMENT]->val1 == atk_elem)
ratio -= tsc->data[SC_ARMOR_ELEMENT]->val2;
else
if (tsc->data[SC_ARMOR_ELEMENT]->val3 == atk_elem)
ratio -= tsc->data[SC_ARMOR_ELEMENT]->val4;
}
if(tsc->data[SC_SPIDERWEB] && atk_elem == ELE_FIRE)
{ // [Celest]
damage <<= 1;

5
src/map/pc.c
View File

@ -1279,7 +1279,7 @@ static int pc_bonus_autospell_del(struct s_autospell *spell, int max, short id,
spell[j].id = id;
spell[j].lv = lv;
spell[j].rate = -rate;
spell[j].card_id = 0;
spell[j].card_id = card_id;
}
return rate;
}
@ -1291,13 +1291,12 @@ static int pc_bonus_autospell(struct s_autospell *spell, int max, short id, shor
pc_bonus_autospell_del(spell, max, id, lv, -rate, card_id);
for (i = 0; i < max && spell[i].id; i++) {
if ((spell[i].card_id == card_id || !spell[i].card_id) &&
if ((spell[i].card_id == card_id || spell[i].rate < 0) &&
spell[i].id == id && spell[i].lv == lv)
{
if (!battle_config.autospell_stacking && spell[i].rate > 0)
return 0;
rate += spell[i].rate;
if (rate < 0) card_id = 0; //Reduced from debted autospell.
break;
}
}

2
src/map/skill.c
View File

@ -4169,7 +4169,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
clif_skill_fail(sd,skillid,0,0);
break;
}
if(status_isimmune(bl) || !tsc->count)
if(status_isimmune(bl) || !tsc || !tsc->count)
break;
for(i=0;i<SC_MAX;i++){
if (!tsc->data[i])

48
src/map/status.c
View File

@ -504,6 +504,7 @@ void initChangeTables(void)
StatusChangeFlagTable[SC_BATKFOOD] |= SCB_BATK;
StatusChangeFlagTable[SC_WATKFOOD] |= SCB_WATK;
StatusChangeFlagTable[SC_MATKFOOD] |= SCB_MATK;
StatusChangeFlagTable[SC_ARMOR_ELEMENT] |= SCB_PC;
if (!battle_config.display_hallucination) //Disable Hallucination.
StatusIconChangeTable[SC_HALLUCINATION] = SI_BLANK;
@ -1599,6 +1600,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
{
static int calculating = 0; //Check for recursive call preemption. [Skotlex]
struct status_data b_status, *status;
const struct status_change *sc = &sd->sc;
struct skill b_skill[MAX_SKILL];
int b_weight,b_max_weight;
@ -2251,8 +2253,8 @@ int status_calc_pc(struct map_session_data* sd,int first)
sd->max_weight += 2000*skill;
if(pc_isriding(sd) && pc_checkskill(sd,KN_RIDING)>0)
sd->max_weight += 10000;
if(sd->sc.data[SC_KNOWLEDGE])
sd->max_weight += sd->max_weight*sd->sc.data[SC_KNOWLEDGE]->val1/10;
if(sc->data[SC_KNOWLEDGE])
sd->max_weight += sd->max_weight*sc->data[SC_KNOWLEDGE]->val1/10;
if((skill=pc_checkskill(sd,ALL_INCCARRY))>0)
sd->max_weight += 2000*skill;
@ -2265,10 +2267,8 @@ int status_calc_pc(struct map_session_data* sd,int first)
if((skill=pc_checkskill(sd,HP_MANARECHARGE))>0 )
sd->dsprate -= 4*skill;
if(sd->sc.count){
if(sd->sc.data[SC_SERVICE4U])
sd->dsprate -= sd->sc.data[SC_SERVICE4U]->val3;
}
if(sc->data[SC_SERVICE4U])
sd->dsprate -= sc->data[SC_SERVICE4U]->val3;
//Underflow protections.
if(sd->dsprate < 0)
@ -2284,10 +2284,10 @@ int status_calc_pc(struct map_session_data* sd,int first)
// Anti-element and anti-race
if((skill=pc_checkskill(sd,CR_TRUST))>0)
sd->subele[6] += skill*5;
sd->subele[ELE_HOLY] += skill*5;
if((skill=pc_checkskill(sd,BS_SKINTEMPER))>0) {
sd->subele[0] += skill;
sd->subele[3] += skill*4;
sd->subele[ELE_NEUTRAL] += skill;
sd->subele[ELE_FIRE] += skill*4;
}
if((skill=pc_checkskill(sd,SA_DRAGONOLOGY))>0 ){
skill = skill*4;
@ -2297,14 +2297,14 @@ int status_calc_pc(struct map_session_data* sd,int first)
sd->subrace[RC_DRAGON]+=skill;
}
if(sd->sc.count){
if(sd->sc.data[SC_CONCENTRATE])
if(sc->count){
if(sc->data[SC_CONCENTRATE])
{ //Update the card-bonus data
sd->sc.data[SC_CONCENTRATE]->val3 = sd->param_bonus[1]; //Agi
sd->sc.data[SC_CONCENTRATE]->val4 = sd->param_bonus[4]; //Dex
sc->data[SC_CONCENTRATE]->val3 = sd->param_bonus[1]; //Agi
sc->data[SC_CONCENTRATE]->val4 = sd->param_bonus[4]; //Dex
}
if(sd->sc.data[SC_SIEGFRIED]){
i = sd->sc.data[SC_SIEGFRIED]->val2;
if(sc->data[SC_SIEGFRIED]){
i = sc->data[SC_SIEGFRIED]->val2;
sd->subele[ELE_WATER] += i;
sd->subele[ELE_EARTH] += i;
sd->subele[ELE_FIRE] += i;
@ -2315,9 +2315,14 @@ int status_calc_pc(struct map_session_data* sd,int first)
sd->subele[ELE_GHOST] += i;
sd->subele[ELE_UNDEAD] += i;
}
if(sd->sc.data[SC_PROVIDENCE]){
sd->subele[ELE_HOLY] += sd->sc.data[SC_PROVIDENCE]->val2;
sd->subrace[RC_DEMON] += sd->sc.data[SC_PROVIDENCE]->val2;
if(sc->data[SC_PROVIDENCE]){
sd->subele[ELE_HOLY] += sc->data[SC_PROVIDENCE]->val2;
sd->subrace[RC_DEMON] += sc->data[SC_PROVIDENCE]->val2;
}
if(sc->data[SC_ARMOR_ELEMENT])
{ //This status change should grant card-type elemental resist.
sd->subele[sc->data[SC_ARMOR_ELEMENT]->val1] += sc->data[SC_ARMOR_ELEMENT]->val2;
sd->subele[sc->data[SC_ARMOR_ELEMENT]->val3] += sc->data[SC_ARMOR_ELEMENT]->val4;
}
}
@ -5874,7 +5879,12 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_KAIZEL:
val2 = 10*val1; //% of life to be revived with
break;
case SC_ARMOR_ELEMENT:
case SC_ARMOR_ELEMENT: //Script generated elemental resist, verify bounds.
if (val1 < ELE_NEUTRAL || val1 >= ELE_MAX)
val1 = val2 = 0; //First Elemental resist
if (val3 < ELE_NEUTRAL || val3 >= ELE_MAX)
val3 = val4 = 0; //Second element resist
break;
case SC_FASTCAST:
//Place here SCs that have no SCB_* data, no skill associated, no ICON
//associated, and yet are not wrong/unknown. [Skotlex]