diff options
| -rw-r--r-- | maps/005-1.tmx | 1 | ||||
| -rw-r--r-- | maps/005-3.tmx | 3 | ||||
| -rw-r--r-- | quests.xml | 18 |
3 files changed, 15 insertions, 7 deletions
diff --git a/maps/005-1.tmx b/maps/005-1.tmx index 15aa7f49..503d11c4 100644 --- a/maps/005-1.tmx +++ b/maps/005-1.tmx @@ -1385,7 +1385,6 @@ <property name="death" value="300000"/> <property name="max_beings" value="4"/> <property name="monster_id" value="1075"/> - <property name="script" value="Trainer::OnKillManaBug"/> <property name="spawn" value="35000"/> </properties> </object> diff --git a/maps/005-3.tmx b/maps/005-3.tmx index db01cc45..43c461dd 100644 --- a/maps/005-3.tmx +++ b/maps/005-3.tmx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27"> +<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> @@ -603,6 +603,7 @@ <property name="death" value="300000"/> <property name="max_beings" value="8"/> <property name="monster_id" value="1084"/> + <property name="script" value="Trainer::OnKillHouseMaggot"/> <property name="spawn" value="40000"/> </properties> </object> @@ -346,8 +346,16 @@ Copyright (C) 2012-2013 Evol Online --> </quest> </var> <var id="39"> - <!-- LiveNPCs (the ones with equipment) cannot have quest log effects --> - <quest name="Trainment" group="Candor" incomplete="1,2"> + <effect map="005-7.tmx" npc="800" value="0,2,3,5,6,8,9,11" effect="12"/> + <quest name="Trainment" group="Candor" incomplete="2,3,5,6,8,9,11"> + <name>Trainment</name> + <text>I have to report to the trainer.</text> + <text></text> + <questgiver>Trainer</questgiver> + <coordinates x="92" y="96">Candor Island. (92,96)</coordinates> + <reward>40 xp, 25 gp</reward> + </quest> + <quest name="Trainment" group="Candor" incomplete="1"> <name>Trainment</name> <text text1="Maggots">I have to kill {@@1}.</text> <text></text> @@ -355,7 +363,7 @@ Copyright (C) 2012-2013 Evol Online --> <coordinates x="92" y="96">Candor Island. (92,96)</coordinates> <reward>40 xp, 25 gp</reward> </quest> - <quest name="Trainment" group="Candor" incomplete="4,5"> + <quest name="Trainment" group="Candor" incomplete="4"> <name>Trainment</name> <text text1="House Maggots">I have to kill {@@1}.</text> <text></text> @@ -363,7 +371,7 @@ Copyright (C) 2012-2013 Evol Online --> <coordinates x="92" y="96">Candor Island. (92,96)</coordinates> <reward>40 xp, 25 gp</reward> </quest> - <quest name="Trainment" group="Candor" incomplete="7,8"> + <quest name="Trainment" group="Candor" incomplete="7"> <name>Trainment</name> <text text1="Candor Scorpion">I have to kill {@@1}.</text> <text></text> @@ -371,7 +379,7 @@ Copyright (C) 2012-2013 Evol Online --> <coordinates x="92" y="96">Candor Island. (92,96)</coordinates> <reward>40 xp, 25 gp</reward> </quest> - <quest name="Trainment" group="Candor" incomplete="10,11"> + <quest name="Trainment" group="Candor" incomplete="10"> <name>Trainment</name> <text text1="Scorpion">I have to kill {@@1}.</text> <text></text> |