Merge remote-tracking branch 'upstream/master'

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	sql-files/main.sql
	sql-files/upgrades/index.txt
	src/common/mmo.h

1 files changed, 10 insertions, 10 deletions

diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt
index 6523ceece..b7b46d16d 100644
--- a/npc/warps/dungeons/c_tower.txt
+++ b/npc/warps/dungeons/c_tower.txt
@@ -22,7 +22,7 @@ c_tower2,273,26,0	warp	clt005	1,1,c_tower1,235,223
 //============================================================
 //= Level 2 ==================================================
 //= Random 2-1 ===============================================
-c_tower2,13,288,4	script	clt006r	45,1,1,{
+c_tower2,13,288,4	script	clt006r	WARPNPC,1,1,{
 	switch(rand(3)) {
 		case 0: warp "c_tower2",13,282; end;
 		case 1: warp "alde_dun03",175,131; end;
@@ -31,7 +31,7 @@ c_tower2,13,288,4	script	clt006r	45,1,1,{
 }
 //============================================================
 //= Random 2-2 ===============================================
-c_tower2,223,267,4	script	clt007r	45,1,1,{
+c_tower2,223,267,4	script	clt007r	WARPNPC,1,1,{
 	switch(rand(3)) {
 		case 0: warp "c_tower2",288,267; end;
 		case 1: warp "alde_dun03",130,130; end;
@@ -47,7 +47,7 @@ c_tower3,42,41,0	warp	clt012	1,1,alde_dun02,127,169
 c_tower3,146,8,0	warp	clt013	1,1,c_tower1,235,223
 //============================================================
 //= Random 3-1 ===============================================
-c_tower3,163,252,4	script	clt014r	45,1,1,{
+c_tower3,163,252,4	script	clt014r	WARPNPC,1,1,{
 	if (rand(2))
 		warp "c_tower3",168,252;
 	else
@@ -56,7 +56,7 @@ c_tower3,163,252,4	script	clt014r	45,1,1,{
 }
 //============================================================
 //= Random 3-2 ===============================================
-c_tower3,240,7,4	script	clt015r	45,1,1,{
+c_tower3,240,7,4	script	clt015r	WARPNPC,1,1,{
 	switch(rand(3)) {
 		case 0: warp "c_tower2",13,282; end;
 		case 1: warp "alde_dun03",175,131; end;
@@ -65,7 +65,7 @@ c_tower3,240,7,4	script	clt015r	45,1,1,{
 }
 //============================================================
 //= Random 3-3 ===============================================
-c_tower3,252,24,4	script	clt016r	45,1,1,{
+c_tower3,252,24,4	script	clt016r	WARPNPC,1,1,{
 	switch(rand(3)) {
 		case 0: warp "c_tower2",228,267; end;
 		case 1: warp "alde_dun03",130,130; end;
@@ -86,7 +86,7 @@ c_tower4,198,59,0	warp	clt025	1,1,c_tower4,152,98
 c_tower4,204,57,0	warp	clt026	1,1,c_tower4,65,77
 //============================================================
 //= Random 4-1 ===============================================
-c_tower4,75,156,4	script	clt027r	45,0,0,{
+c_tower4,75,156,4	script	clt027r	WARPNPC,0,0,{
 	switch(rand(4)) {
 		case 0: warp "c_tower3",168,252; end;
 		case 1: warp "alde_dun02",262,41; end;
@@ -96,7 +96,7 @@ c_tower4,75,156,4	script	clt027r	45,0,0,{
 }
 //============================================================
 //= Random 4-2 ===============================================
-c_tower4,68,79,4	script	clt028r	45,0,0,{
+c_tower4,68,79,4	script	clt028r	WARPNPC,0,0,{
 	switch(rand(4)) {
 		case 0: warp "c_tower2",13,282; end;
 		case 1: warp "alde_dun03",175,131; end;
@@ -106,7 +106,7 @@ c_tower4,68,79,4	script	clt028r	45,0,0,{
 }
 //============================================================
 //= Random 4-3 ===============================================
-c_tower4,142,151,4	script	clt029r	45,0,0,{
+c_tower4,142,151,4	script	clt029r	WARPNPC,0,0,{
 	switch(rand(4)) {
 		case 0: warp "c_tower3",168,252; end;
 		case 1: warp "alde_dun02",262,41; end;
@@ -116,7 +116,7 @@ c_tower4,142,151,4	script	clt029r	45,0,0,{
 }
 //============================================================
 //= Random 4-4 ===============================================
-c_tower4,151,96,4	script	clt030r	45,0,0,{
+c_tower4,151,96,4	script	clt030r	WARPNPC,0,0,{
 	switch(rand(4)) {
 		case 0: warp "c_tower2",228,267; end;
 		case 1: warp "alde_dun03",130,130; end;
@@ -126,7 +126,7 @@ c_tower4,151,96,4	script	clt030r	45,0,0,{
 }
 //============================================================
 //= Random 4-5 ===============================================
-c_tower4,189,40,4	script	clt031r	45,2,2,{
+c_tower4,189,40,4	script	clt031r	WARPNPC,2,2,{
 	switch(rand(4)) {
 		case 0: warp "c_tower2",228,267; end;
 		case 1: warp "alde_dun03",130,130; end;