Skip to content

Commit d29a44d

Browse files
committed
fix: TibiaCreaturesCreature issues
1 parent 8f0899b commit d29a44d

File tree

9 files changed

+4368
-3588
lines changed

9 files changed

+4368
-3588
lines changed

src/TibiaCreaturesCreature.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type CreatureResponse struct {
4242
}
4343

4444
var (
45-
CreatureDataRegex = regexp.MustCompile(`.*;">(.*)<\/h2> <img src="(.*)"\/>.*<p>(.*)<\/p> <p>(.*)<\/p> <p>(.*)<\/p>.*`)
45+
CreatureDataRegex = regexp.MustCompile(`.*;">(.*)<\/h2> <img src="(.*)"\/>.*<p>(.*)<\/p> <p>(.*)<\/p> <p>(.*)<\/p>.*`)
4646
CreatureHitpointsRegex = regexp.MustCompile(`.*have (.*) hitpoints. (.*)`)
4747
CreatureImmuneRegex = regexp.MustCompile(`.*are immune to (.*)`)
4848
CreatureStrongRegex = regexp.MustCompile(`.*are strong against (.*)`)

src/TibiaCreaturesCreature_test.go

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestDemon(t *testing.T) {
6666
assert.False(demonJson.Creature.Featured)
6767
}
6868

69-
func TestQuaraPredatorFeatured(t *testing.T) {
69+
func TestQuaraPredator(t *testing.T) {
7070
file, err := static.TestFiles.Open("testdata/creatures/creature/quara predator.html")
7171
if err != nil {
7272
t.Fatalf("file opening error: %s", err)
@@ -108,14 +108,14 @@ func TestQuaraPredatorFeatured(t *testing.T) {
108108
assert.False(quaraPredatorJson.Creature.BeConvinced)
109109
assert.Equal(0, quaraPredatorJson.Creature.ConvincedMana)
110110
assert.True(quaraPredatorJson.Creature.SeeInvisible)
111-
assert.Equal(1600, quaraPredatorJson.Creature.ExperiencePoints)
111+
assert.Equal(1850, quaraPredatorJson.Creature.ExperiencePoints)
112112
assert.True(quaraPredatorJson.Creature.IsLootable)
113113

114114
assert.Equal(2, len(quaraPredatorJson.Creature.LootList))
115115
assert.Equal("gold coins", quaraPredatorJson.Creature.LootList[0])
116116
assert.Equal("quara bones", quaraPredatorJson.Creature.LootList[1])
117117

118-
assert.True(quaraPredatorJson.Creature.Featured)
118+
assert.False(quaraPredatorJson.Creature.Featured)
119119
}
120120

121121
func TestCentipede(t *testing.T) {
@@ -211,3 +211,24 @@ func TestLavaLurkers(t *testing.T) {
211211
assert.Equal(1, len(lavalurkersJson.Creature.HealedBy))
212212
assert.Equal("fire", lavalurkersJson.Creature.HealedBy[0])
213213
}
214+
215+
func TestFeralWerecrocodilesFeatured(t *testing.T) {
216+
file, err := static.TestFiles.Open("testdata/creatures/creature/feral werecrocodile.html")
217+
if err != nil {
218+
t.Fatalf("file opening error: %s", err)
219+
}
220+
defer file.Close()
221+
222+
data, err := io.ReadAll(file)
223+
if err != nil {
224+
t.Fatalf("File reading error: %s", err)
225+
}
226+
227+
feralwerecrocodileJson, _ := TibiaCreaturesCreatureImpl("Feral Werecrocodiles", string(data), "")
228+
assert := assert.New(t)
229+
230+
assert.Equal("Feral Werecrocodiles", feralwerecrocodileJson.Creature.Name)
231+
assert.Equal("Feral Werecrocodiles", feralwerecrocodileJson.Creature.Race)
232+
233+
assert.False(feralwerecrocodileJson.Creature.Featured)
234+
}

src/static/testdata/creatures/creature/centipede.html

Lines changed: 587 additions & 599 deletions
Large diffs are not rendered by default.

src/static/testdata/creatures/creature/demon.html

Lines changed: 591 additions & 594 deletions
Large diffs are not rendered by default.

src/static/testdata/creatures/creature/feral werecrocodile.html

Lines changed: 813 additions & 0 deletions
Large diffs are not rendered by default.

src/static/testdata/creatures/creature/hunter.html

Lines changed: 587 additions & 599 deletions
Large diffs are not rendered by default.

src/static/testdata/creatures/creature/lava lurkers.html

Lines changed: 587 additions & 599 deletions
Large diffs are not rendered by default.

src/static/testdata/creatures/creature/quara predator.html

Lines changed: 591 additions & 594 deletions
Large diffs are not rendered by default.

src/static/testdata/creatures/creature/skunk.html

Lines changed: 587 additions & 599 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)