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

- Added LOOK_*** script constants, same names as from map.h

Browse Source 
- Changed atcommand "@changelook" to changelook script command in custom quest_shop.txt

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16862 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-11-05 18:25:15 +00:00
parent 9c9eb668af
commit 70edb63177
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
db/const.txt
View File

@ -599,6 +599,20 @@ EQI_ACC_R 8
EQI_HEAD_MID 9
EQI_HEAD_LOW 10
LOOK_BASE 0
LOOK_HAIR 1
LOOK_WEAPON 2
LOOK_HEAD_BOTTOM 3
LOOK_HEAD_TOP 4
LOOK_HEAD_MID 5
LOOK_HAIR_COLOR 6
LOOK_CLOTHES_COLOR 7
LOOK_SHIELD 8
LOOK_SHOES 9
LOOK_BODY 10
LOOK_FLOOR 11
LOOK_ROBE 12
Eff_Stone 0
Eff_Freeze 1
Eff_Stun 2

6
npc/custom/etc/monster_arena.txt
View File

@ -766,11 +766,7 @@ gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
// Skill Disabler //
gon_test,57,99,5 script Skill Disable 111,3,3,{
atcommand strcharinfo(0) + "@skilloff";
disablenpc "Skill Disable";
end;
}
gon_test mapflag noskill
// Duel Arena //
gon_test,58,103,5 script Duel Master#01 92,{

2
npc/custom/etc/shifty_assassin.txt
View File

@ -100,7 +100,7 @@ M_Kill:
mes "Your attack succeeded but only ^FF0000" + #ninjasr + "^000000 Ninjas survived.";
atcommand strcharinfo(0) + "@kill "+@name$;
announce @name$+" has been assassinated by " + strcharinfo(0) +"'s Ninjas.",8;
announce @name$+" has been assassinated by " + strcharinfo(0) +"'s Ninjas.",bc_npc;
close;
// FAILED ATTACK //

18
npc/custom/quests/quest_shop.txt
View File

@ -102,13 +102,13 @@ OnBuyItem:
specialeffect2 699;
close;
case 2:
set @qe3, getlook(3);
set @qe4, getlook(4);
set @qe5, getlook(5);
set @qe3, getlook(LOOK_HEAD_BOTTOM);
set @qe4, getlook(LOOK_HEAD_TOP);
set @qe5, getlook(LOOK_HEAD_MID);
set @qe6,1;
if (@qe1&1) atcommand "@changelook 3 "+@qe2;
if (@qe1&256) atcommand "@changelook 1 "+@qe2;
if (@qe1&512) atcommand "@changelook 2 "+@qe2;
if (@qe1&1) changelook LOOK_HEAD_BOTTOM, @qe2;
if (@qe1&256) changelook LOOK_HEAD_TOP, @qe2;
if (@qe1&512) changelook LOOK_HEAD_MID, @qe2;
break;
case 3:
close;
@ -116,9 +116,9 @@ OnBuyItem:
}
OnEnd:
if (@qe6) {
atcommand "@changelook 3 "+@qe3;
atcommand "@changelook 1 "+@qe4;
atcommand "@changelook 2 "+@qe5;
changelook LOOK_HEAD_BOTTOM, @qe3;
changelook LOOK_HEAD_TOP, @qe4;
changelook LOOK_HEAD_MID, @qe5;
}
for(set .@i,0; .@i<7; set .@i,.@i+1)
setd "@qe"+.@i,0;

4
src/map/npc.c
View File

@ -1577,7 +1577,7 @@ static int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short*
script_cleararray_pc(sd, "@sold_attribute", (void*)0);
script_cleararray_pc(sd, "@sold_identify", (void*)0);
for( j = 0; MAX_SLOTS > j; j++ )
for( j = 0; j < MAX_SLOTS; j++ )
{// clear each of the card slot entries
key_card[j] = 0;
snprintf(card_slot, sizeof(card_slot), "@sold_card%d", j + 1);
@ -1598,7 +1598,7 @@ static int npc_selllist_sub(struct map_session_data* sd, int n, unsigned short*
script_setarray_pc(sd, "@sold_attribute", i, (void*)(intptr_t)sd->status.inventory[idx].attribute, &key_attribute);
script_setarray_pc(sd, "@sold_identify", i, (void*)(intptr_t)sd->status.inventory[idx].identify, &key_identify);
for( j = 0; MAX_SLOTS > j; j++ )
for( j = 0; j < MAX_SLOTS; j++ )
{// store each of the cards from the equipment in the array
snprintf(card_slot, sizeof(card_slot), "@sold_card%d", j + 1);
script_setarray_pc(sd, card_slot, i, (void*)(intptr_t)sd->status.inventory[idx].card[j], &key_card[j]);