summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/help.txt2
-rw-r--r--db/item_trade.txt33
-rw-r--r--npc/other/turbotrack/Expert_16.txt2
-rw-r--r--npc/other/turbotrack/Normal_16.txt2
-rw-r--r--src/map/map.c1
5 files changed, 3 insertions, 37 deletions
diff --git a/conf/help.txt b/conf/help.txt
index baf0692ad..13a958798 100644
--- a/conf/help.txt
+++ b/conf/help.txt
@@ -97,7 +97,7 @@
40: 4 Sleeping 04 Silenced 08 Level 1 Cart 256 Level 3 Cart
40: 6 darkness 08 ??? 16 Falcon 512 Level 4 Cart
40: 16 darkness 1024 Level 5 Cart
- 40:
+ 40:
40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
40:@option <param1> <param2> <param3> - Adds different visual effects on or around your character
40:@dye/@ccolor <clothes color: 0-4> - Changes your characters appearence (only clothes color).
diff --git a/db/item_trade.txt b/db/item_trade.txt
index ff7ca41e5..75f3b3a5e 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -311,36 +311,6 @@
12180,115,100 // SpearMercenary_Scroll8
12181,115,100 // SpearMercenary_Scroll9
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
7713,115,100 // BlueCard_A_
@@ -355,8 +325,6 @@
7466,115,100 // BlueCard_N
7467,115,100 // BlueCard_O
7854,64,100 // Pass_CF
-7865,115,100 // Gold_Pouch
-7866,115,100 // Certificate
5189,72,100 // Fallen_Leaves
5188,72,100 // Minstrel_Hat
5150,72,100 // Joker_Jester_
@@ -1343,7 +1311,6 @@
12332,123,100 // Fruit_Juice
7928,123,100 // Brazilian_Flag_
7929,123,100 // Golden_Coin_
-12333,123,100 // Ansila
5450,91,100 // Sun_Cap
5451,91,100 // Dragonhelm_Gold
5452,91,100 // Dragonhelm_Silver
diff --git a/npc/other/turbotrack/Expert_16.txt b/npc/other/turbotrack/Expert_16.txt
index cd758bb3a..4314aa635 100644
--- a/npc/other/turbotrack/Expert_16.txt
+++ b/npc/other/turbotrack/Expert_16.txt
@@ -20,7 +20,7 @@ turbo_room,124,135,3 script Expert mode - 16 person 124,{
end;
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
enablewaitingroomevent "Expert mode - 16 person";
end;
diff --git a/npc/other/turbotrack/Normal_16.txt b/npc/other/turbotrack/Normal_16.txt
index d321e8c1f..a375e96f8 100644
--- a/npc/other/turbotrack/Normal_16.txt
+++ b/npc/other/turbotrack/Normal_16.txt
@@ -21,7 +21,7 @@ turbo_room,91,135,3 script Normal mode - 16 person 124,{
end;
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
enablewaitingroomevent "Normal mode - 16 person";
end;
diff --git a/src/map/map.c b/src/map/map.c
index ea938ab8f..1215246b1 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2785,7 +2785,6 @@ int map_readgat (struct map_data* m)
}
/*======================================
-/*======================================
* Add/Remove map to the map_db
*--------------------------------------*/
void map_addmap2db(struct map_data *m)