Skip to content
This repository has been archived by the owner on Jun 3, 2023. It is now read-only.

Commit

Permalink
Fixes and Reviews
Browse files Browse the repository at this point in the history
-Fixed map void showing in some positions (#307)
-Fixed Koshei's reset (#306)
-Fixed Jack Fate not sending players to Goroma (#305)
-Finished Mustelids Category (#279)(#227)
  • Loading branch information
Giorox committed Jun 23, 2019
1 parent 7357dee commit fd418e7
Show file tree
Hide file tree
Showing 9 changed files with 1,286 additions and 1,218 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

config.lua
5 changes: 3 additions & 2 deletions data/actions/scripts/other/KosheiSunWatch.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ function onUse(cid, item, fromPosition, itemEx, toPosition)
local statue4 = getThing(4003)
local statue5 = getThing(4004)
if((statue1.itemid == 3697) and (statue2.itemid == 3698) and (statue3.itemid == 3698) and (statue4.itemid == 3697) and (statue5.itemid == 3697)) then
doTransformItem(4006, 7525)
coffinladder = getThingFromPos({x=33273,y=32458,z=8, stackpos=1}).uid
doTransformItem(coffinladder, 7525)
doTransformItem(4007, 7521)
doCreatureSay(cid, "CLICK", TALKTYPE_ORANGE_1, nil, nil, {x=33275,y=32451,z=8})
else
doCreatureSay(cid, "CRANK", TALKTYPE_ORANGE_1)
doCreatureSay(cid, "CRANK", TALKTYPE_ORANGE_1, nil, nil, {x=33281,y=32447,z=8})
end

end
4 changes: 4 additions & 0 deletions data/items/items.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15534,6 +15534,10 @@
<attribute key="corpseType" value="blood" />
<attribute key="fluidSource" value="blood" />
</item>
<item id="9114" article="a" name="bulb of garlic">
<attribute key="weight" value="140" />
<attribute key="showcount" value="0" />
</item>
<item fromid="9118" toid="9133" article="a" name="stone wall" />
<item fromid="9135" toid="9139" article="a" name="stone wall" />
<item fromid="9142" toid="9143" article="a" name="stone wall" />
Expand Down
74 changes: 74 additions & 0 deletions data/logs/talkactions/GOD Giorox.log
Original file line number Diff line number Diff line change
Expand Up @@ -13438,3 +13438,77 @@
[03/02/2019 16:55:38] /r
[03/02/2019 16:55:40] /r
[03/02/2019 16:55:41] /r
[19/06/2019 17:10:59] /i 2666
[19/06/2019 17:11:06] /r 100
[19/06/2019 17:11:27] /i 2666
[19/06/2019 18:36:57] /r 100
[19/06/2019 18:36:58] /r 100
[22/06/2019 22:30:49] /goto Velho Barrero
[22/06/2019 22:30:51] /ghost
[22/06/2019 22:30:55] /r
[22/06/2019 22:30:56] /r
[22/06/2019 22:30:57] /r
[22/06/2019 22:30:58] /r
[22/06/2019 23:46:04] /ghost
[22/06/2019 23:46:07] /goto Beatrix
[23/06/2019 00:00:54] /goto Velho Barrero
[23/06/2019 00:00:56] /r
[23/06/2019 00:33:55] /reload npc
[23/06/2019 00:51:34] /goto Angelina
[23/06/2019 00:51:39] /c Beatrix
[23/06/2019 00:51:43] /c Velho Barrero
[23/06/2019 01:30:17] /goto Angelina
[23/06/2019 01:30:21] /c Velho Barrero
[23/06/2019 01:31:06] /goto Angelina
[23/06/2019 01:31:54] /c Velho Barrero
[23/06/2019 01:39:34] /c Velho Barrero
[23/06/2019 01:40:10] /c Velho Barrero
[23/06/2019 01:42:49] /c Beatrix
[23/06/2019 02:01:44] /c Velho Barrero
[23/06/2019 02:20:05] /c Velho Barrero
[23/06/2019 03:12:30] /t Thais
[23/06/2019 03:12:34] /goto Thais
[23/06/2019 03:12:37] /town Thais
[23/06/2019 03:12:57] /goto Beatrix
[23/06/2019 03:13:35] /goto Angelina
[23/06/2019 03:21:04] /c Velho Barrero
[23/06/2019 03:58:56] /goto Jack Fate
[23/06/2019 03:59:05] /c Velho Barrero
[23/06/2019 03:59:58] /ghost
[23/06/2019 04:00:16] /i great fireball rune
[23/06/2019 04:02:48] /goto Angelina
[23/06/2019 04:02:59] /a 60
[23/06/2019 04:02:59] /a 60
[23/06/2019 04:03:17] /c Beatrix
[23/06/2019 04:06:53] /goto Hydra
[23/06/2019 04:06:57] /goto Ghost Pirate
[23/06/2019 04:07:03] /goto Pirate Ghost
[23/06/2019 04:07:09] /goto Blood Crab
[23/06/2019 04:07:13] /goto Island Troll
[23/06/2019 04:07:27] /up
[23/06/2019 04:08:01] /c Velho Barrero
[23/06/2019 04:08:07] /ghost
[23/06/2019 04:08:47] /up
[23/06/2019 04:12:47] /town Thais
[23/06/2019 04:12:54] /a 60
[23/06/2019 04:12:55] /a 60
[23/06/2019 04:13:01] /a 60
[23/06/2019 13:09:59] /goto 31994,32565,6,0
[23/06/2019 13:10:02] /goto 31994,32565,6
[23/06/2019 13:10:14] /goto 31994, 32565, 6
[23/06/2019 13:10:25] /goto (31994, 32565, 6)
[23/06/2019 13:10:43] /goto 31994 32565 6
[23/06/2019 13:10:51] /goto (31994 32565 6)
[23/06/2019 13:10:56] /goto 31994 32565 6
[23/06/2019 13:11:48] /goto 31994, 32565, 6
[23/06/2019 13:11:57] /goto Jack Fate
[23/06/2019 13:14:13] /reload npc
[23/06/2019 16:52:25] /goto Darashia
[23/06/2019 16:52:28] /town Darashia
[23/06/2019 16:52:31] /down
[23/06/2019 16:52:32] /down
[23/06/2019 16:52:32] /down
[23/06/2019 16:52:32] /down
[23/06/2019 16:52:33] /down
[23/06/2019 16:52:34] /down
[23/06/2019 17:00:56] /reload actions
29 changes: 8 additions & 21 deletions data/monster/Animals/skunk.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,13 @@
<attribute key="areaEffect" value="greenbubble"/>
</attack>
</attacks>
<defenses armor="1" defense="5"/>
<defenses armor="1" defense="5">
<defense name="healing" interval="2000" chance="5" min="8" max="50">
<attribute key="areaEffect" value="blueshimmer"/>
</defense>
</defenses>
<loot>
<item id="" chance="4290" /><!-- bulb of garlic -->
<item id="11185" chance="820" /><!-- skunk tail -->
</loot>

















<item id="9114" chance="4290" /><!-- bulb of garlic -->
<item id="11185" chance="820" /><!-- skunk tail -->
</loot>
</monster>
2 changes: 1 addition & 1 deletion data/npc/Jack Fate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parameter key="message_farewell" value="Good bye. Recommend us if you were satisfied with our service."/>

<parameter key="module_travel" value="1"/>
<parameter key="travel_destinations" value="ankrahmun,33092,32883,6,0;darashia,33289,32480,6,0;edron,33173,31764,6,0;goroma,31994,32565,6,0;kick,32274,32902,6,0;port hope,32529,32784,6,0;venore,32952,32022,6,0;yalahar,614,679,5,0;"/>
<parameter key="travel_destinations" value="ankrahmun,33092,32883,6,0;darashia,33289,32480,6,0;edron,33173,31764,6,0;goroma,32160,32558,6,0;port hope,32529,32784,6,0;venore,32952,32022,6,0;yalahar,614,679,5,0;"/>
<parameter key="keywords" value="captain;travel;" />
<parameter key="keyword_reply1" value="I\'m the captain of this ship." />
<parameter key="keyword_reply2" value="I can take you to Ankrahmun, Darashia, Edron, Goroma, Port Hope, Thais, Venore and Yalahar." />
Expand Down
Binary file modified data/world/World.otbm
Binary file not shown.
Loading

0 comments on commit fd418e7

Please sign in to comment.