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

- Added a missing space in help.txt (bugreport:3632)

Browse Source 
- Removed duplicate lines in item_trade.txt (bugreport:3630)
- Fixed typos in Turbo Track waitingrooms. (bugreport:3628)
- Removed a duplicate comment line from r14003 that caused a warning.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14081 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2009-10-04 19:58:23 +00:00
parent 5acd2aca91
commit ebc71ca92f
5 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
db/item_trade.txt
View File

@ -311,36 +311,6 @@
12180,115,100 // SpearMercenary_Scroll8 12180,115,100 // SpearMercenary_Scroll8
12181,115,100 // SpearMercenary_Scroll9 12181,115,100 // SpearMercenary_Scroll9
12182,115,100 // SpearMercenary_Scroll10 12182,115,100 // SpearMercenary_Scroll10
12153,115,100 // Bow_Mercenary_Scroll1
12154,115,100 // Bow_Mercenary_Scroll2
12155,115,100 // Bow_Mercenary_Scroll3
12156,115,100 // Bow_Mercenary_Scroll4
12157,115,100 // Bow_Mercenary_Scroll5
12158,115,100 // Bow_Mercenary_Scroll6
12159,115,100 // Bow_Mercenary_Scroll7
12160,115,100 // Bow_Mercenary_Scroll8
12161,115,100 // Bow_Mercenary_Scroll9
12162,115,100 // Bow_Mercenary_Scroll10
12163,115,100 // SwordMercenary_Scroll1
12164,115,100 // SwordMercenary_Scroll2
12165,115,100 // SwordMercenary_Scroll3
12166,115,100 // SwordMercenary_Scroll4
12167,115,100 // SwordMercenary_Scroll5
12168,115,100 // SwordMercenary_Scroll6
12169,115,100 // SwordMercenary_Scroll7
12170,115,100 // SwordMercenary_Scroll8
12171,115,100 // SwordMercenary_Scroll9
12172,115,100 // SwordMercenary_Scroll10
12173,115,100 // SpearMercenary_Scroll1
12174,115,100 // SpearMercenary_Scroll2
12175,115,100 // SpearMercenary_Scroll3
12176,115,100 // SpearMercenary_Scroll4
12177,115,100 // SpearMercenary_Scroll5
12178,115,100 // SpearMercenary_Scroll6
12179,115,100 // SpearMercenary_Scroll7
12180,115,100 // SpearMercenary_Scroll8
12181,115,100 // SpearMercenary_Scroll9
12182,115,100 // SpearMercenary_Scroll10
// Additonal mixed items // Additonal mixed items
7713,115,100 // BlueCard_A_ 7713,115,100 // BlueCard_A_
@ -355,8 +325,6 @@
7466,115,100 // BlueCard_N 7466,115,100 // BlueCard_N
7467,115,100 // BlueCard_O 7467,115,100 // BlueCard_O
7854,64,100 // Pass_CF 7854,64,100 // Pass_CF
7865,115,100 // Gold_Pouch
7866,115,100 // Certificate
5189,72,100 // Fallen_Leaves 5189,72,100 // Fallen_Leaves
5188,72,100 // Minstrel_Hat 5188,72,100 // Minstrel_Hat
5150,72,100 // Joker_Jester_ 5150,72,100 // Joker_Jester_
@ -1343,7 +1311,6 @@
12332,123,100 // Fruit_Juice 12332,123,100 // Fruit_Juice
7928,123,100 // Brazilian_Flag_ 7928,123,100 // Brazilian_Flag_
7929,123,100 // Golden_Coin_ 7929,123,100 // Golden_Coin_
12333,123,100 // Ansila
5450,91,100 // Sun_Cap 5450,91,100 // Sun_Cap
5451,91,100 // Dragonhelm_Gold 5451,91,100 // Dragonhelm_Gold
5452,91,100 // Dragonhelm_Silver 5452,91,100 // Dragonhelm_Silver

2
npc/other/turbotrack/Expert_16.txt
View File

@ -20,7 +20,7 @@ turbo_room,124,135,3 script Expert mode - 16 person 124,{
end; end;
OnInit: OnInit:
waitingroom "Expert mode - 16 person",60,"Expert mode - 8 person::OnStartArena",16; waitingroom "Expert mode - 16 person",60,"Expert mode - 16 person::OnStartArena",16;
//SetFeeZeny 1000 //SetFeeZeny 1000
enablewaitingroomevent "Expert mode - 16 person"; enablewaitingroomevent "Expert mode - 16 person";
end; end;

2
npc/other/turbotrack/Normal_16.txt
View File

@ -21,7 +21,7 @@ turbo_room,91,135,3 script Normal mode - 16 person 124,{
end; end;
OnInit: OnInit:
waitingroom "Normal mode - 16 person",60,"Normal mode - 8 person::OnStartArena",16; waitingroom "Normal mode - 16 person",60,"Normal mode - 16 person::OnStartArena",16;
//SetFeeZeny 1000 //SetFeeZeny 1000
enablewaitingroomevent "Normal mode - 16 person"; enablewaitingroomevent "Normal mode - 16 person";
end; end;

1
src/map/map.c
View File

@ -2784,7 +2784,6 @@ int map_readgat (struct map_data* m)
return 1; return 1;
} }
/*======================================
/*====================================== /*======================================
* Add/Remove map to the map_db * Add/Remove map to the map_db
*--------------------------------------*/ *--------------------------------------*/