Skip to content

Commit

Permalink
Update Geffen Magic Tournament Quest DB & Clean up (#4028)
Browse files Browse the repository at this point in the history
* Corrected Geffen Magic Tournament Quest name DB
* Fix last match reward
  • Loading branch information
teededung authored and Atemo committed Mar 22, 2019
1 parent bce4e0b commit 42810ad
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
66 changes: 33 additions & 33 deletions db/re/quest_db.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2115,39 +2115,39 @@
9270,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The way to be a strong Mage - 4"

//Geffen Magic Tournament
9284,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9293,0,1106,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9295,0,2549,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9296,0,2550,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9297,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9298,0,2553,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9299,0,2554,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9300,0,2555,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9301,0,2556,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9302,0,2557,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9303,0,2558,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9304,0,2559,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9305,0,2560,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9306,0,2561,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9307,0,2562,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9315,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9316,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Geffen"
9284,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Stopping Geffen Gangsters"
9285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Beating Geffen Gangsters"
9286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Stop Geffen Gangsters"
9287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Defeating Geffen Gangsters"
9288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Catch a Geffen thief"
9289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Get things back from the thief"
9290,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Participate in Magic competitions"
9291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Participate in Magic competitions"
9292,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Participate in Magic competitions"
9293,0,1106,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Register in Magic Competition"
9294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Registration Complete"
9295,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"1st match of the Tournament has started"
9296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"2nd match of the Competition has started"
9297,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"3rd match of the Competition has started"
9298,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"4th match of the Competition has started"
9299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"5th match of the Competition has started"
9300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"6th match of the Competition has started"
9301,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"7th match of the Competition has started"
9302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"8th match of the Competition has started"
9303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"9th match of the Competition has started"
9304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"10th match of the Competition has started"
9305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"11th match of the Competition has started"
9306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"12th match of the Competition has started"
9307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Final match of the Competition has started"
9308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Magic Competition Win~!"
9309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Magic Tournament defeat"
9310,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Encounter Iris"
9311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Encounter Chaos"
9312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Encounter Lydia"
9313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Encounter Fenrir"
9314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Encounter Loki"
9315,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Exploring the dimensional gap"
9316,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Re-exploring the crack of spaces"

// EP14.3 Morse's Cave
9318,0,3000,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Pursuing Hiding Morroc"
Expand Down
2 changes: 1 addition & 1 deletion npc/custom/official/GeffenMagicTournament.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,7 @@ OnInstanceInit:
"Geffen Festivities.";
close2;
cutin "",255;
getitem 6671,20;
getitem 6671,'reward[getarraysize('reward[0]) - 1];
warp instance_mapname("1@gef"), 120,35;
end;
case 2:
Expand Down

0 comments on commit 42810ad

Please sign in to comment.