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

- More scripts fixes.

Browse Source 
- Some cleanups to the code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12695 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-05-09 03:12:26 +00:00
parent 8898af1c45
commit 9bfb1ac1be
7 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
db/item_noequip.txt
View File

@ -33,6 +33,11 @@
//Zone 2 - Jail
601,8 //Fly Wing - not really needed here but ...
602,8 //Butterfly Wing - also not needed
12212,8 //Giant Fly Wing
14582,8
14583,8
14584,8
14585,8
//Zone 3 - Izlude Battle Arena
601,16 //Fly Wing

3
npc/cities/umbala.txt
View File

@ -53,7 +53,6 @@ comodo,171,137,1 script Haith#um 92,{
mes "[La Ed]";
mes "Let's do it~ !!";
emotion e_gg;
emotion e_gg;
next;
mes "[Haith]";
mes "................";
@ -1024,7 +1023,7 @@ OnTouch:
case 3:
//if (rand(1,2) == 2) {
// percentheal -99,0;
// warp "warp "nif_in",69,15;
// warp "nif_in",69,15;
//}
end;
}

35
npc/other/CashShop_Functions.txt
View File

@ -75,20 +75,27 @@ function script F_CashReset {
// due to lack of information.
// - No arguments.
function script F_CashDungeon {
switch(select("Nogg Road:Mjolnir Dead Pit:Umbala Dungeon:Einbroch Mine Dungeon:Payon Dungeon:Toy Dungeon:Glast Heim Underprison:Louyang Dungeon:Hermit's Checkers:Izlude Dungeon:Turtle Island Dungeon:Clock Tower B3f:Clock Tower")) {
case 1: warp "mag_dun01",0,0; end;
case 2: warp "mjolnir_02",0,0; end;
case 3: warp "um_dun01",0,0; end;
case 4: warp "ein_dun01",0,0; end;
case 5: warp "pay_dun00",0,0; end;
case 6: warp "xmas_dun01",0,0; end;
case 7: warp "gl_prison",0,0; end;
case 8: warp "lou_dun01",0,0; end;
case 9: warp "gon_dun02",0,0; end;
case 10: warp "iz_dun00",0,0; end;
case 11: warp "tur_dun02",0,0; end;
case 12: warp "alde_dun03",0,0; end;
case 13: warp "c_tower1",0,0; end;
switch(select("Nogg Road:Mjolnir Dead Pit:Umbala Dungeon:Payon Caves:Toy Factory:Glast Heim Prison:Louyang Dungeon:Kunlun Dungeon:Izlude Undersea Tunnel:Turtle Island:Clocktower 3F:Clocktower B3F:Glast Heim Sewers 2F:Sphinx Dungeon 4F:Pyramid Dungeon 4F:Prontera Culverts 3F:Amatsu Dungeon 1F:Somatology Laboratory 1F:Ayotaya Dungeon 2F"))
{
case 1: warp "mag_dun01",0,0; end; // Nogg Road
case 2: warp "mjo_dun01",0,0; end; // Mjolnir Dead Pit
case 3: warp "um_dun01",0,0; end; // Umbala Dungeon
case 4: warp "pay_dun00",0,0; end; // Payon Caves
case 5: warp "xmas_dun01",0,0; end; // Toy Factory
case 6: warp "gl_prison",0,0; end; // Glast Heim Prison
case 7: warp "lou_dun01",0,0; end; // Louyang Dungeon
case 8: warp "gon_dun01",0,0; end; // Kunlun Dungeon
case 9: warp "iz_dun00",0,0; end; // Izlude Undersea Tunnel
case 10: warp "tur_dun01",0,0; end; // Turtle Island
case 11: warp "c_tower3",0,0; end; // Clocktower 3F
case 12: warp "alde_dun03",0,0; end; // Clocktower B3F
case 13: warp "gl_sew02",0,0; end; // Glast Heim Sewers 2F
case 14: warp "in_sphinx4",0,0; end; // Sphinx Dungeon 4F
case 15: warp "moc_pryd04",0,0; end; // Pyramid Dungeon 4F
case 16: warp "prt_sewb3",0,0; end; // Prontera Culverts 3F
case 17: warp "ama_dun01",0,0; end; // Amatsu Dungeon 1F
case 18: warp "lhz_dun01",0,0; end; // Somatology Laboratory 1F
case 19: warp "ayo_dun02",0,0; end; // Ayotaya Dungeon 2F
}
return;
}

2
npc/warps/other/arena.txt
View File

@ -33,7 +33,7 @@ sec_in02,79,180,3 script #arenacontrol 81,{
DLGTEMP:
input @input_arena;
if (@input_arena < 0 || @input_arena > 2000) goto DLGTEMP; //CHECK
if (@input == 0)
if (@input_arena == 0)
{
mes "Error!";
close;

2
src/map/mail.c
View File

@ -76,7 +76,7 @@ unsigned char mail_setitem(struct map_session_data *sd, int idx, int amount)
amount = 0;
sd->mail.zeny = amount;
clif_updatestatus(sd, SP_ZENY);
// clif_updatestatus(sd, SP_ZENY);
return 0;
}
else

24
src/map/pc.c
View File

@ -6743,7 +6743,7 @@ int pc_divorce(struct map_session_data *sd)
struct map_session_data *p_sd;
int i;
if (sd == NULL || !pc_ismarried(sd))
if( sd == NULL || !pc_ismarried(sd) )
return -1;
if( !sd->status.partner_id )
@ -6758,23 +6758,23 @@ int pc_divorce(struct map_session_data *sd)
return 0;
#else
ShowError("pc_divorce: p_sd nullpo\n");
return -1;
return -1;
#endif
}
}
// Both players online, lets do the divorce manually
sd->status.partner_id = 0;
p_sd->status.partner_id = 0;
sd->status.partner_id = 0;
p_sd->status.partner_id = 0;
for( i = 0; i < MAX_INVENTORY; i++ )
{
if (sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F)
pc_delitem(sd, i, 1, 0);
if (p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F)
pc_delitem(p_sd, i, 1, 0);
}
if( sd->status.inventory[i].nameid == WEDDING_RING_M || sd->status.inventory[i].nameid == WEDDING_RING_F )
pc_delitem(sd, i, 1, 0);
if( p_sd->status.inventory[i].nameid == WEDDING_RING_M || p_sd->status.inventory[i].nameid == WEDDING_RING_F )
pc_delitem(p_sd, i, 1, 0);
}
clif_divorced(sd, p_sd->status.name);
clif_divorced(p_sd, sd->status.name);
clif_divorced(sd, p_sd->status.name);
clif_divorced(p_sd, sd->status.name);
return 0;
}

2
src/map/script.c
View File

@ -3385,7 +3385,7 @@ static int script_load_mapreg(void)
int s = add_str(varname);
int i = index;
int v = atoi(value);
idb_put(mapreg_db, (i<<24)|s, (void *)v);
idb_put(mapreg_db, (i<<24)|s, (void *)v);
}
}