Commit a182c50a authored by Micksha's avatar Micksha

Merge branch 'calamity-rename' into 'master'

Rename Calamity dungeon, lets see what I forgot.

See merge request !231
parents dcc0b38a e0af309d
Pipeline #138908279 passed with stages
in 22 minutes and 28 seconds
......@@ -95,7 +95,7 @@ map_list: (
"008-2-9",
"008-3-0",
"008-3-1",
"008-4-1",
"008-3-2",
"012-1",
"012-2-1",
"012-2-2",
......
......@@ -92,7 +92,7 @@
008-2-9 92
008-3-0 93
008-3-1 94
008-4-1 95
008-3-2 95
012-1 96
012-2-1 97
012-2-2 98
......
......@@ -1984,16 +1984,16 @@ skill_db: (
AttackType: "Weapon"
Element: "Ele_Poison"
SkillData2: {
Lv1: 15000
Lv2: 20000
Lv3: 25000
Lv4: 30000
Lv5: 35000
Lv6: 40000
Lv7: 45000
Lv8: 50000
Lv9: 55000
Lv10: 60000
Lv1: 20000
Lv2: 40000
Lv3: 60000
Lv4: 80000
Lv5: 100000
Lv6: 120000
Lv7: 140000
Lv8: 160000
Lv9: 180000
Lv10: 200000
}
FixedCastTime: 0
Requirements: {
......
......@@ -25,6 +25,6 @@
008-1,233,131,0 warp #008-1_233_131 0,0,008-2-29,36,24
008-1,287,133,0 warp #008-1_287_133 0,0,008-2-30,52,39
008-1,20,85,0 warp #008-1_20_85 0,1,008-1-1,246,85
008-1,165,171,0 warp #008-1_165_171 0,0,008-4-1,175,19
008-1,165,171,0 warp #008-1_165_171 0,0,008-3-2,175,19
008-1,289,125,0 warp #008-1_289_125 0,0,008-2-31,29,25
008-1,22,216,0 warp #008-1_22_216 0,0,008-1-2,248,48
// Map 008-3-2: Calamity Dungeon
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 008-4-1: Cave Of Trials warps
008-4-1,175,18,0 warp #008-4-1_175_18 2,0,008-1,165,170
"npc/008-3-2/_mobs.txt",
"npc/008-3-2/_warps.txt",
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 008-3-2: Calamity Dungeon mobs
008-3-2,106,73,73,63 monster Cave Maggot 1027,80,30000,2500
008-3-2,136,71,47,50 monster Thief Slime 1105,35,50000,2500
008-3-2,101,83,73,30 monster AngryCrafty 1103,60,50000,2500
008-3-2,100,79,32,31 monster Black Scorpion 1104,14,45000,2500
008-3-2,94,98,11,9 monster Green Slime 1024,4,500,2500
// Map 008-4-1: Cave Of Trials
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/008-4-1/_mobs.txt",
"npc/008-4-1/_warps.txt",
"npc/008-4-1/boss.txt",
// Map 008-3-2: Calamity Dungeon warps
008-3-2,175,19,0 warp #008-3-2_175_19 2,0,008-1,165,170
......@@ -2,10 +2,10 @@
// Author:
// Jesusalva
// Description:
// Controls the boss on 008-4-1 and the Master Book Learning
// Controls the boss on 008-3-2 and the Master Book Learning
// see npc/items/master_skillbook.txt for explanation about variables
008-4-1,0,0,0 script #BossCtrl_008-4-1 NPC_HIDDEN,{
008-3-2,0,0,0 script #BossCtrl_008-3-2 NPC_HIDDEN,{
end;
// Test server: 15 minutes only
......@@ -17,8 +17,8 @@ OnTimer900000:
OnTimer3600000:
stopnpctimer;
OnInit:
[email protected]MB_00841=0;
monster "008-4-1", 67, 30, strmobinfo(1, GameBalance), GameBalance, 1, "#BossCtrl_008-4-1::OnBossDeath";
[email protected]MB_00832=0;
monster "008-3-2", 67, 30, strmobinfo(1, SpiderQueen), SpiderQueen, 1, "#BossCtrl_008-3-2::OnBossDeath";
end;
OnBossDeath:
......@@ -28,16 +28,16 @@ OnBossDeath:
.@party=getcharid(1);
if (.@party > 0)
{
[email protected]MB_00841=.@party;
areatimer("008-4-1", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-4-1::OnBossCheck");
mapannounce "008-4-1", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
[email protected]MB_00832=.@party;
areatimer("008-3-2", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-3-2::OnBossCheck");
mapannounce "008-3-2", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
}
else
{
[email protected]MB_00841=-2;
areatimer("008-4-1", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-4-1::OnBossCheck");
addtimer(20, "#BossCtrl_008-4-1::OnBegin");
mapannounce "008-4-1", "Boss deafeated by: " + strcharinfo(0), bc_all;
[email protected]MB_00832=-2;
areatimer("008-3-2", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-3-2::OnBossCheck");
addtimer(20, "#BossCtrl_008-3-2::OnBegin");
mapannounce "008-3-2", "Boss deafeated by: " + strcharinfo(0), bc_all;
}
end;
......@@ -45,14 +45,14 @@ OnBossCheck:
@mb_BossId=-1;
// TODO: Check if you really fought or was just lurking
// Check if party is correct
if (getcharid(1) != [email protected]MB_00841)
if (getcharid(1) != [email protected]MB_00832)
end;
OnBegin:
@mb_BossId=GameBalance;
@mb_SkillId=MG_COLDBOLT;
@mb_BossId=SpiderQueen;
@mb_SkillId=TF_POISON;
@mb_ItemId=MagicFeather; // Placeholder
@mb_ItemAm=1;
addtimer(15000, "#BossCtrl_008-4-1::OnFinish");
addtimer(15000, "#BossCtrl_008-3-2::OnFinish");
end;
OnFinish:
......
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 008-4-1: Cave Of Trials mobs
008-4-1,106,73,73,63 monster Cave Maggot 1027,80,30000,2500
008-4-1,136,71,47,50 monster Thief Slime 1105,35,50000,2500
008-4-1,101,83,73,30 monster AngryCrafty 1103,60,50000,2500
008-4-1,100,79,32,31 monster Black Scorpion 1104,14,45000,2500
008-4-1,94,98,11,9 monster Green Slime 1024,4,500,2500
......@@ -94,7 +94,7 @@
@include "npc/008-2-9/_import.txt"
@include "npc/008-3-0/_import.txt"
@include "npc/008-3-1/_import.txt"
@include "npc/008-4-1/_import.txt"
@include "npc/008-3-2/_import.txt"
@include "npc/012-1/_import.txt"
@include "npc/012-2-1/_import.txt"
@include "npc/012-2-2/_import.txt"
......
......@@ -87,6 +87,6 @@ OnTouch:
// npc/008-3-1/_warps.txt
008-3-1,34,34,0 duplicate(#SpotlightMaster) #SPOT008-3-1_34_34 NPC_HIDDEN,2,2
// npc/008-4-1/_warps.txt
008-4-1,175,18,0 duplicate(#SpotlightMaster) #SPOT008-4-1_175_18 NPC_HIDDEN,2,2
// npc/008-3-2/_warps.txt
008-3-2,175,18,0 duplicate(#SpotlightMaster) #SPOT008-3-2_175_18 NPC_HIDDEN,2,2
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment