diff options
| author | shennetsind <ind@henn.et> | 2013-05-31 01:37:00 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-05-31 01:37:00 -0300 |
| commit | 68ff83df2e3a161ebf67f9e8b1c64a0eab767f8b (patch) | |
| tree | 656014626455455b8b287701e5d6301fa333ca8e /src | |
| parent | e99a6a0eca78fa7c950aaa6d672e4e4c578a63d2 (diff) | |
| parent | 271ab61a287c2708e050d350bb84054c9fb88e47 (diff) | |
| download | hercules-68ff83df2e3a161ebf67f9e8b1c64a0eab767f8b.tar.gz hercules-68ff83df2e3a161ebf67f9e8b1c64a0eab767f8b.tar.bz2 hercules-68ff83df2e3a161ebf67f9e8b1c64a0eab767f8b.tar.xz hercules-68ff83df2e3a161ebf67f9e8b1c64a0eab767f8b.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/script.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index 959cf6bd9..019b17cff 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7292,7 +7292,7 @@ BUILDIN(successrefitem) clif->additem(sd,i,1,0); pc_equipitem(sd,i,ep); clif->misceffect(&sd->bl,3); - if(sd->status.inventory[i].refine == MAX_REFINE && + if(sd->status.inventory[i].refine == 10 && sd->status.inventory[i].card[0] == CARD0_FORGE && sd->status.char_id == (int)MakeDWord(sd->status.inventory[i].card[2],sd->status.inventory[i].card[3]) ){ // Fame point system [DracoRPG] @@ -9804,6 +9804,31 @@ BUILDIN(homunculus_shuffle) { return true; } +/*========================================== + * Check for homunculus state. + * Return: -1 = No homunculus + * 0 = Homunculus is active + * 1 = Homunculus is vaporized (rest) + * 2 = Homunculus is in morph state + *------------------------------------------*/ +BUILDIN(checkhomcall) +{ + TBL_PC *sd = script_rid2sd(st); + TBL_HOM *hd; + + if( sd == NULL ) + return false; + + hd = sd->hd; + + if( !hd ) + script_pushint(st, -1); + else + script_pushint(st, hd->homunculus.vaporize); + + return true; +} + //These two functions bring the eA MAPID_* class functionality to scripts. BUILDIN(eaclass) { @@ -17710,6 +17735,7 @@ void script_parse_builtin(void) { BUILDIN_DEF2(homunculus_evolution,"homevolution",""), //[orn] BUILDIN_DEF2(homunculus_mutate,"hommutate","?"), BUILDIN_DEF2(homunculus_shuffle,"homshuffle",""), //[Zephyrus] + BUILDIN_DEF(checkhomcall,""), BUILDIN_DEF(eaclass,"?"), //[Skotlex] BUILDIN_DEF(roclass,"i?"), //[Skotlex] BUILDIN_DEF(checkvending,"?"), |