From 5068c23aaf3557cbef08a8344d6f4f1733d149a5 Mon Sep 17 00:00:00 2001 From: nmaligec Date: Sat, 29 Jan 2011 07:08:49 -0500 Subject: second last commit: crypt tileset and other misc graphic updates. Removed windows CR from some files to comply with unix EOL. Removed debugroom completely. Someone keeps pushing 027-4_Inner_Chanmber instead of 027-4_Reaper. I just switched my working directories to match the inner chamber naming. --- data/debugroom.wlk | Bin 2504 -> 0 bytes data/resnametable.txt | 1 - db/mob_db.txt | 1 - db/mob_skill_db.txt | 5 +- npc/001-1_Tulimshar/_import.txt | 1 - npc/001-1_Tulimshar/tester.txt | 25 ---------- npc/027-2_Caretakers_House/alacrius.txt | 80 +++++++++++++++--------------- npc/027-3_Crypt/mapflags.txt | 2 +- npc/027-4_Inner_Chamber/_import.txt | 2 + npc/027-4_Inner_Chamber/_mobs.txt | 8 +-- npc/027-4_Inner_Chamber/_warps.txt | 8 +-- npc/027-4_Inner_Chamber/mapflags.txt | 1 + npc/027-4_Inner_Chamber/reaper_script.txt | 15 ++++++ npc/027-4_Reaper/_import.txt | 5 -- npc/027-4_Reaper/_mobs.txt | 1 - npc/027-4_Reaper/_warps.txt | 5 -- npc/027-4_Reaper/mapflags.txt | 1 - npc/027-4_Reaper/reaper_script.txt | 15 ------ npc/debugroom/_import.txt | 6 --- npc/debugroom/_mobs.txt | 0 npc/debugroom/_warps.txt | 0 npc/debugroom/reaper-test.txt | 43 ---------------- npc/debugroom/tester.txt | 24 --------- npc/debugroom/weapon-test.txt | 16 ------ 24 files changed, 66 insertions(+), 199 deletions(-) delete mode 100644 data/debugroom.wlk delete mode 100644 npc/001-1_Tulimshar/tester.txt mode change 100644 => 100755 npc/027-4_Inner_Chamber/_import.txt mode change 100644 => 100755 npc/027-4_Inner_Chamber/_mobs.txt mode change 100644 => 100755 npc/027-4_Inner_Chamber/_warps.txt create mode 100755 npc/027-4_Inner_Chamber/mapflags.txt create mode 100755 npc/027-4_Inner_Chamber/reaper_script.txt delete mode 100755 npc/027-4_Reaper/_import.txt delete mode 100755 npc/027-4_Reaper/_mobs.txt delete mode 100755 npc/027-4_Reaper/_warps.txt delete mode 100755 npc/027-4_Reaper/mapflags.txt delete mode 100755 npc/027-4_Reaper/reaper_script.txt delete mode 100755 npc/debugroom/_import.txt delete mode 100755 npc/debugroom/_mobs.txt delete mode 100755 npc/debugroom/_warps.txt delete mode 100755 npc/debugroom/reaper-test.txt delete mode 100755 npc/debugroom/tester.txt delete mode 100755 npc/debugroom/weapon-test.txt diff --git a/data/debugroom.wlk b/data/debugroom.wlk deleted file mode 100644 index abf8574b..00000000 Binary files a/data/debugroom.wlk and /dev/null differ diff --git a/data/resnametable.txt b/data/resnametable.txt index fef4c32a..ad9eecc2 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -73,4 +73,3 @@ 032-1.gat#032-1.wlk# 032-3.gat#032-3.wlk# botcheck.gat#botcheck.wlk# -debugroom.gat#debugroom.wlk# diff --git a/db/mob_db.txt b/db/mob_db.txt index 267f2e3c..dae837af 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -80,6 +80,5 @@ 1077, DrunkenSkeleton, DrunkenSkeleton, 90, 7200, 0, 0, 90, 1, 55, 284, 30, 10, 35, 10, 3, 8, 71, 65, 1, 1, 1, 0, 29, 137, 350, 1800, 672, 950, 790, 300, 789, 280, 3003, 100, 3000, 50, 3009, 250, 3006, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1078, TipsySkeleton, TipsySkeleton, 90, 7000, 0, 0, 90, 1, 60, 284, 33, 10, 35, 10, 3, 8, 71, 65, 1, 1, 1, 0, 29, 137, 350, 1800, 672, 950, 787, 300, 788, 280, 3002, 100, 3000, 50, 3007, 400, 3010, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 1079, DrunkenLadySkeleton, DrunkenLadySkeleton, 90, 6000, 0, 0, 90, 2, 75, 146, 40, 8, 20, 20, 15, 8, 51, 48, 1, 1, 1, 0, 29, 137, 660, 750, 672, 700, 785, 300, 786, 280, 3001, 100, 3000, 50, 3010, 250, 3009, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 -1999, Dummy, Dummy, 1, 5000, 0, 1, 1, 1, 0, 0, 100, 100, 5, 5, 5, 5, 5, 200, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 681, 3000, 681, 3000, 681, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0 #ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop1id,Drop1per, Drop2id,Drop2per, Drop3id,Drop3per, Drop4id,Drop4per, Drop5id,Drop5per, Drop6id,Drop6per, Drop7id,Drop7per, Drop8id,Drop8per, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount, mutationstrength diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt index a3e7dd42..0b786cfd 100644 --- a/db/mob_skill_db.txt +++ b/db/mob_skill_db.txt @@ -84,7 +84,4 @@ //1067,Reaper@NPC_SUMMONSLAVE_ballX3,any,198,3,6000,1000,10000,no,self,myhpltmaxrate,60,1070,,,,, //1067,Reaper@NPC_SUMMONSLAVE_ballX9,any,198,9,4000,1000,15000,no,self,myhpltmaxrate,20,1070,,,,, //1067,Reaper@AL_TELEPORT,attack,28,2,3500,500,5000,yes,self,always,,,,,,, -1070,BallLightning@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,notintown,0,30,,,,, - -// Auto heal for weapons testing dummy -1999,Dummy@AL_HEAL,any,30,100,100,2500,2500,no,self,myhpltmaxrate,50,,,,,,5 +1070,BallLightning@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,notintown,0,30,,,,, \ No newline at end of file diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt index 6778edf3..b7ea36c1 100644 --- a/npc/001-1_Tulimshar/_import.txt +++ b/npc/001-1_Tulimshar/_import.txt @@ -21,6 +21,5 @@ npc: npc/001-1_Tulimshar/rewards_master.txt npc: npc/001-1_Tulimshar/sandra.txt npc: npc/001-1_Tulimshar/sarah.txt npc: npc/001-1_Tulimshar/soul-menhir.txt -//npc: npc/001-1_Tulimshar/tester.txt npc: npc/001-1_Tulimshar/trader.txt npc: npc/001-1_Tulimshar/vincent.txt diff --git a/npc/001-1_Tulimshar/tester.txt b/npc/001-1_Tulimshar/tester.txt deleted file mode 100644 index 56408b9b..00000000 --- a/npc/001-1_Tulimshar/tester.txt +++ /dev/null @@ -1,25 +0,0 @@ -//testing server instant level and item NPC - -001-1.gat,21,25,0 script Mr. Invisible#todebug 127,{ -L_Debug: - mes "[Mr. Invisible]"; - mes "\"Do you want to go to the debug room?\""; - menu - "Send me there right away!", L_Go, - "Debug room? What's that?", L_Explain, - "No way, I'm staying right here.", -; - mes "[Mr. Invisible]"; - mes "\"If you want to go later on just talk to me again.\""; - close; - -L_Go: - warp "debugroom.gat",25,25; - mes "Welcome to the dbug room. Help test everything!"; - close; - -L_Explain: - mes "[Mr. Invisible]"; - mes "\"Its a room full of de bugs.\""; - next; - goto L_Debug; -} \ No newline at end of file diff --git a/npc/027-2_Caretakers_House/alacrius.txt b/npc/027-2_Caretakers_House/alacrius.txt index 40ae2df1..16ebf399 100755 --- a/npc/027-2_Caretakers_House/alacrius.txt +++ b/npc/027-2_Caretakers_House/alacrius.txt @@ -1,40 +1,40 @@ -// Starts the reaper quest - -027-2.gat,107,29,0 script Alacrius 313,{ - // if started, go to started - // if fail go to failed - // if complete go to complete - // if cooldown go to cooldown - -// start quest section - mes "Hi, want to fight the reaper?"; - menu - "Let's go",L_START, - "No thank you",-; - close; - -L_START: - monster "027-4.gat",40,55,"Reaper Quest",1111,1,"Reaper::OnDead"; - enablenpc "#gatecontrol"; - enablenpc "#closedgate"; - disablenpc "#opengate"; -// Open doors to reaper level - warp "027-3.gat",41,70; - initnpctimer; - close; - -// 5 min mark for testing purposes, up it when finished. -OnTimer300000: - mapwarp "027-3.gat", "027-2.gat",104,41; - mapwarp "027-4.gat", "027-2.gat",104,41; - killmonsterall "027-4.gat"; - end; -OnTimer301000: - npctalk "You have failed the mission"; - end; - -// cooldown before the quest can be restarted -OnTimer360000: - // set quest var - end; -} +// Starts the reaper quest + +027-2.gat,107,29,0 script Alacrius 313,{ + // if started, go to started + // if fail go to failed + // if complete go to complete + // if cooldown go to cooldown + +// start quest section + mes "Hi, want to fight the reaper?"; + menu + "Let's go",L_START, + "No thank you",-; + close; + +L_START: + monster "027-4.gat",40,55,"Reaper Quest",1067,1,"Reaper::OnDead"; + enablenpc "#gatecontrol"; + enablenpc "#closedgate"; + disablenpc "#opengate"; +// Open doors to reaper level + warp "027-3.gat",41,70; + initnpctimer; + close; + +// 5 min mark for testing purposes, up it when finished. +OnTimer300000: + mapwarp "027-3.gat", "027-2.gat",104,41; + mapwarp "027-4.gat", "027-2.gat",104,41; + killmonsterall "027-4.gat"; + end; +OnTimer301000: + npctalk "You have failed the mission"; + end; + +// cooldown before the quest can be restarted +OnTimer360000: + // set quest var + end; +} diff --git a/npc/027-3_Crypt/mapflags.txt b/npc/027-3_Crypt/mapflags.txt index 533b7a6c..5f9c091d 100755 --- a/npc/027-3_Crypt/mapflags.txt +++ b/npc/027-3_Crypt/mapflags.txt @@ -1 +1 @@ -027-3.gat mapflag nosave 027-2,104,41; +027-3.gat mapflag nosave 027-2,107,31; diff --git a/npc/027-4_Inner_Chamber/_import.txt b/npc/027-4_Inner_Chamber/_import.txt old mode 100644 new mode 100755 index 460e6396..da04b18c --- a/npc/027-4_Inner_Chamber/_import.txt +++ b/npc/027-4_Inner_Chamber/_import.txt @@ -1,3 +1,5 @@ map: 027-4.gat npc: npc/027-4_Inner_Chamber/_mobs.txt npc: npc/027-4_Inner_Chamber/_warps.txt +npc: npc/027-4_Inner_Chamber/mapflags.txt +npc: npc/027-4_Inner_Chamber/reaper_script.txt diff --git a/npc/027-4_Inner_Chamber/_mobs.txt b/npc/027-4_Inner_Chamber/_mobs.txt old mode 100644 new mode 100755 index e2c36ab5..50c5d033 --- a/npc/027-4_Inner_Chamber/_mobs.txt +++ b/npc/027-4_Inner_Chamber/_mobs.txt @@ -1,7 +1 @@ -// 027-4 Inner Chamber mobs - - - -027-4.gat,0,0,0 script Mob027-4 -1,{ - end; -} +// 027-4 Reaper mobs diff --git a/npc/027-4_Inner_Chamber/_warps.txt b/npc/027-4_Inner_Chamber/_warps.txt old mode 100644 new mode 100755 index b6adf1f4..ca462cbe --- a/npc/027-4_Inner_Chamber/_warps.txt +++ b/npc/027-4_Inner_Chamber/_warps.txt @@ -1,3 +1,5 @@ -// 027-4 Inner Chamber warps - -027-4.gat,37,19 warp toCryptLevel1 1,-1,027-3.gat,127,42 +// 027-4 Reaper warps + +027-4.gat,36,19,0 warp ToCryptL -1,-1,027-3.gat,126,42 +027-4.gat,37,19,0 warp ToCryptM -1,-1,027-3.gat,127,42 +027-4.gat,38,19,0 warp ToCryptR -1,-1,027-3.gat,128,42 diff --git a/npc/027-4_Inner_Chamber/mapflags.txt b/npc/027-4_Inner_Chamber/mapflags.txt new file mode 100755 index 00000000..1784cd64 --- /dev/null +++ b/npc/027-4_Inner_Chamber/mapflags.txt @@ -0,0 +1 @@ +027-4.gat mapflag nosave 027-2,107,31; diff --git a/npc/027-4_Inner_Chamber/reaper_script.txt b/npc/027-4_Inner_Chamber/reaper_script.txt new file mode 100755 index 00000000..b09a2399 --- /dev/null +++ b/npc/027-4_Inner_Chamber/reaper_script.txt @@ -0,0 +1,15 @@ +// The scripts associated with the reaper mob summoned by Alacrius in the 027-2 + +027-4.gat,0,0,0 script Reaper -1,{ +OnDead: + mes "you won!"; + mapwarp "027-4.gat", "027-2.gat",104,41; + close; + +OnPCDieEvent: + // summon a zombie and give a message and sfx + end; +OnAvenged: + // tell players your fallen comrad has been avenged + end; +} \ No newline at end of file diff --git a/npc/027-4_Reaper/_import.txt b/npc/027-4_Reaper/_import.txt deleted file mode 100755 index 78db21ba..00000000 --- a/npc/027-4_Reaper/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -map: 027-4.gat -npc: npc/027-4_Reaper/_mobs.txt -npc: npc/027-4_Reaper/_warps.txt -npc: npc/027-4_Reaper/mapflags.txt -npc: npc/027-4_Reaper/reaper_script.txt diff --git a/npc/027-4_Reaper/_mobs.txt b/npc/027-4_Reaper/_mobs.txt deleted file mode 100755 index 50c5d033..00000000 --- a/npc/027-4_Reaper/_mobs.txt +++ /dev/null @@ -1 +0,0 @@ -// 027-4 Reaper mobs diff --git a/npc/027-4_Reaper/_warps.txt b/npc/027-4_Reaper/_warps.txt deleted file mode 100755 index ca462cbe..00000000 --- a/npc/027-4_Reaper/_warps.txt +++ /dev/null @@ -1,5 +0,0 @@ -// 027-4 Reaper warps - -027-4.gat,36,19,0 warp ToCryptL -1,-1,027-3.gat,126,42 -027-4.gat,37,19,0 warp ToCryptM -1,-1,027-3.gat,127,42 -027-4.gat,38,19,0 warp ToCryptR -1,-1,027-3.gat,128,42 diff --git a/npc/027-4_Reaper/mapflags.txt b/npc/027-4_Reaper/mapflags.txt deleted file mode 100755 index 791565cf..00000000 --- a/npc/027-4_Reaper/mapflags.txt +++ /dev/null @@ -1 +0,0 @@ -027-4.gat mapflag nosave 027-2,104,41; diff --git a/npc/027-4_Reaper/reaper_script.txt b/npc/027-4_Reaper/reaper_script.txt deleted file mode 100755 index b09a2399..00000000 --- a/npc/027-4_Reaper/reaper_script.txt +++ /dev/null @@ -1,15 +0,0 @@ -// The scripts associated with the reaper mob summoned by Alacrius in the 027-2 - -027-4.gat,0,0,0 script Reaper -1,{ -OnDead: - mes "you won!"; - mapwarp "027-4.gat", "027-2.gat",104,41; - close; - -OnPCDieEvent: - // summon a zombie and give a message and sfx - end; -OnAvenged: - // tell players your fallen comrad has been avenged - end; -} \ No newline at end of file diff --git a/npc/debugroom/_import.txt b/npc/debugroom/_import.txt deleted file mode 100755 index f9fad285..00000000 --- a/npc/debugroom/_import.txt +++ /dev/null @@ -1,6 +0,0 @@ -map: debugroom.gat -npc: npc/debugroom/_mobs.txt -npc: npc/debugroom/_warps.txt -npc: npc/debugroom/tester.txt -npc: npc/debugroom/reaper-test.txt -npc: npc/debugroom/weapon-test.txt \ No newline at end of file diff --git a/npc/debugroom/_mobs.txt b/npc/debugroom/_mobs.txt deleted file mode 100755 index e69de29b..00000000 diff --git a/npc/debugroom/_warps.txt b/npc/debugroom/_warps.txt deleted file mode 100755 index e69de29b..00000000 diff --git a/npc/debugroom/reaper-test.txt b/npc/debugroom/reaper-test.txt deleted file mode 100755 index 162b3977..00000000 --- a/npc/debugroom/reaper-test.txt +++ /dev/null @@ -1,43 +0,0 @@ -//testing server instant level and item NPC - -debugroom.gat,30,25,0 script gy-inn-test 307,{ - - mes "[Tester]"; - mes "\"This is to test out the reaper quest and the gy-inn. The recommended level for this quest is 95+ \""; - menu - "Spec me up to lvl95 with gear.", L_Spec, - "Take me to the graveyard inn.", L_Inn, - "Take me to the crypt.", L_Cryp, - "Take me to the reaper.", L_Reap, - "Nevemind.", L_Nvm; - close; - -L_Spec: - set baselevel, 90; - getitem "WarlordHelmet", 1; - getitem "WarlordPlate", 1; - getitem "JeansChaps", 1; - getitem "LeatherGloves", 1; - getitem "FurBoots", 1; - getitem "SteelShield", 1; - getitem "Setzer", 1; - getitem "ForestBow", 1; - getitem "IronArrow", 2000; - mes "[Tester]"; - mes "\"Here you go! Enjoy your testing experience.\""; - close; -L_Inn: - warp "027-2.gat",104,41; - close; -L_Cryp: - warp "027-3.gat",41,70; - close; -L_Reap: - monster "027-4.gat",40,55,"Reaper Quest",1111,1,"Reaper::OnDead"; - warp "027-4.gat",40,30; - close; -L_Nvm: - mes "[Tester]"; - mes "\"Okay.\""; - close; -} diff --git a/npc/debugroom/tester.txt b/npc/debugroom/tester.txt deleted file mode 100755 index 5efaf210..00000000 --- a/npc/debugroom/tester.txt +++ /dev/null @@ -1,24 +0,0 @@ -//testing server instant level and item NPC - -debugroom.gat,25,23,0 script Tester#Out 134,{ - - mes "[Tester]"; - mes "\"Explenation.... \""; - menu - "Warp back to Tulimshar", L_Yes, - "Set save point here", L_Do_Save, - "Nevemind.", L_No; - close; - - -L_Yes: - warp "001-1.gat",28,74; - close; -L_Do_Save: - savepoint "debugroom.gat",25,25; - close; -L_Nvm: - mes "[Tester]"; - mes "\"Okay.\""; - close; -} diff --git a/npc/debugroom/weapon-test.txt b/npc/debugroom/weapon-test.txt deleted file mode 100755 index 123edf97..00000000 --- a/npc/debugroom/weapon-test.txt +++ /dev/null @@ -1,16 +0,0 @@ -//testing server instant level and item NPC - -debugroom.gat,15,21,0 script WeaponsTest 114,{ - - mes "[Weapons Tester]"; - mes "\"Explenation.... \""; - menu - "Creater test dummy", L_Yes, - "Nevemind.", -; - close; - - -L_Yes: - monster "debugroom.gat",18,25,"Funny",1999,1,0; - close; -} -- cgit v1.2.3-70-g09d2