diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2024-03-05 23:17:23 +0100 |
|---|---|---|
| committer | HoraK-FDF <horak-fdf@web.de> | 2024-04-14 11:16:01 +0200 |
| commit | a8213b62e772af5374512a1a28ab6b61df1967a5 (patch) | |
| tree | 18409fc8281f9ef6ab54d2102f525e273202378c | |
| parent | 5cc35f23e8536e7a8c94ddcb114f60a6668441b7 (diff) | |
| download | serverdata-a8213b62e772af5374512a1a28ab6b61df1967a5.tar.gz serverdata-a8213b62e772af5374512a1a28ab6b61df1967a5.tar.bz2 serverdata-a8213b62e772af5374512a1a28ab6b61df1967a5.tar.xz serverdata-a8213b62e772af5374512a1a28ab6b61df1967a5.zip | |
added some trailing new lines
| -rw-r--r-- | world/map/db/mob_skill_db.txt | 5 | ||||
| -rw-r--r-- | world/map/npc/018-1/mapflags.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/018-2/mapflags.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/018-3/mapflags.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/055-1/mapflags.txt | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/world/map/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt index b8368fc9..b11980d7 100644 --- a/world/map/db/mob_skill_db.txt +++ b/world/map/db/mob_skill_db.txt @@ -124,6 +124,7 @@ // Rotter Skills 1176,Rotter@NPC_SUMMONSLAVE_rotX6,any,198,1,8000,1000,5000,no,self,slavelt,6,1177,0,0,0,0, 1176,Rotter@NPC_POISON,attack,178,10,8000,0,2222,yes,target,always,0,0,10,0,0,0, +<<<<<<< HEAD 1177,Rot@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,always,0,30,0,0,0,0, 1177,Rot@NPC_POISON,attack,178,10,3000,0,500,yes,target,always,0,0,10,0,0,0, @@ -131,3 +132,7 @@ 1196,RickLime@NPC_SUMMONSLAVE_brblowX2,any,198,1,10000,1000,5000,no,self,slavelt,2,1195,0,0,0,0, 1196,RickLime@NPC_SUMMONSLAVE_cloverX1,any,198,1,5000,5000,15000,no,self,slavelt,1,1037,0,0,0,0, 1195,Brainblow@NPC_SELFDESTRUCTION,attack,175,1,10000,100,300,yes,target,always,0,30,0,0,0,0, +======= +1177,Rot@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,notintown,0,30,0,0,0,0, +1177,Rot@NPC_POISON,attack,178,10,3000,0,500,yes,target,always,0,0,10,0,0,0, +>>>>>>> c9522c04 (added some trailing new lines) diff --git a/world/map/npc/018-1/mapflags.txt b/world/map/npc/018-1/mapflags.txt index 434b6d7c..a1b62aab 100644 --- a/world/map/npc/018-1/mapflags.txt +++ b/world/map/npc/018-1/mapflags.txt @@ -1 +1 @@ -018-1|mapflag|resave|018-2,88,32
\ No newline at end of file +018-1|mapflag|resave|018-2,88,32 diff --git a/world/map/npc/018-2/mapflags.txt b/world/map/npc/018-2/mapflags.txt index 8de271e1..146c0378 100644 --- a/world/map/npc/018-2/mapflags.txt +++ b/world/map/npc/018-2/mapflags.txt @@ -1 +1 @@ -018-2|mapflag|resave|018-2,88,32
\ No newline at end of file +018-2|mapflag|resave|018-2,88,32 diff --git a/world/map/npc/018-3/mapflags.txt b/world/map/npc/018-3/mapflags.txt index 3f703925..6495e15c 100644 --- a/world/map/npc/018-3/mapflags.txt +++ b/world/map/npc/018-3/mapflags.txt @@ -1 +1 @@ -018-3|mapflag|resave|018-2,88,32
\ No newline at end of file +018-3|mapflag|resave|018-2,88,32 diff --git a/world/map/npc/055-1/mapflags.txt b/world/map/npc/055-1/mapflags.txt index d58a3bf8..31c2f835 100644 --- a/world/map/npc/055-1/mapflags.txt +++ b/world/map/npc/055-1/mapflags.txt @@ -1 +1 @@ -055-1|mapflag|resave|055-1,133,61
\ No newline at end of file +055-1|mapflag|resave|055-1,133,61 |