Merge branch 'main' into Review-Quests-V9

htc16 · Aug 21, 2024 · b90c467 · b90c467
2 parents ca24e96 + 88a4db9
commit b90c467
Show file tree

Hide file tree

Showing 210 changed files with 463 additions and 513 deletions.
diff --git a/data-canary/scripts/actions/other/blessing_charms.lua b/data-canary/scripts/actions/other/blessing_charms.lua
diff --git a/data-canary/scripts/actions/other/blueberry_bush.lua b/data-canary/scripts/actions/other/blueberry_bush.lua
diff --git a/data-canary/scripts/actions/other/clay_lump.lua b/data-canary/scripts/actions/other/clay_lump.lua
diff --git a/data-canary/scripts/actions/other/piggy_bank.lua b/data-canary/scripts/actions/other/piggy_bank.lua
diff --git a/data-canary/scripts/actions/other/watch.lua b/data-canary/scripts/actions/other/watch.lua
diff --git a/data-canary/scripts/actions/other/waterpipe.lua b/data-canary/scripts/actions/other/waterpipe.lua
diff --git a/data-canary/scripts/movements/cake.lua b/data-canary/scripts/movements/cake.lua
diff --git a/data-canary/scripts/movements/decay_to.lua b/data-canary/scripts/movements/decay_to.lua
diff --git a/data-canary/scripts/movements/dough.lua b/data-canary/scripts/movements/dough.lua
diff --git a/data-canary/scripts/movements/trap.lua b/data-canary/scripts/movements/trap.lua
diff --git a/data-otservbr-global/monster/amphibics/azure_frog.lua b/data-otservbr-global/monster/amphibics/azure_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/bog_frog.lua b/data-otservbr-global/monster/amphibics/bog_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/coral_frog.lua b/data-otservbr-global/monster/amphibics/coral_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/crimson_frog.lua b/data-otservbr-global/monster/amphibics/crimson_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/filth_toad.lua b/data-otservbr-global/monster/amphibics/filth_toad.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/green_frog.lua b/data-otservbr-global/monster/amphibics/green_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/infernal_frog.lua b/data-otservbr-global/monster/amphibics/infernal_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/amphibics/orchid_frog.lua b/data-otservbr-global/monster/amphibics/orchid_frog.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/abyssal_calamary.lua b/data-otservbr-global/monster/aquatics/abyssal_calamary.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/calamary.lua b/data-otservbr-global/monster/aquatics/calamary.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/crustacea_gigantica.lua b/data-otservbr-global/monster/aquatics/crustacea_gigantica.lua
@@ -62,6 +62,7 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/deepling_brawler.lua b/data-otservbr-global/monster/aquatics/deepling_brawler.lua
@@ -66,6 +66,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/deepling_elite.lua b/data-otservbr-global/monster/aquatics/deepling_elite.lua
@@ -66,6 +66,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/deepling_master_librarian.lua b/data-otservbr-global/monster/aquatics/deepling_master_librarian.lua
@@ -63,6 +63,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/deepling_tyrant.lua b/data-otservbr-global/monster/aquatics/deepling_tyrant.lua
@@ -66,6 +66,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/deepsea_blood_crab.lua b/data-otservbr-global/monster/aquatics/deepsea_blood_crab.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = false,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/jellyfish.lua b/data-otservbr-global/monster/aquatics/jellyfish.lua
@@ -63,6 +63,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/manta_ray.lua b/data-otservbr-global/monster/aquatics/manta_ray.lua
@@ -60,6 +60,7 @@ monster.flags = {
 	canWalkOnEnergy = true,
 	canWalkOnFire = true,
 	canWalkOnPoison = true,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/renegade_quara_constrictor.lua b/data-otservbr-global/monster/aquatics/renegade_quara_constrictor.lua
@@ -63,6 +63,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/renegade_quara_hydromancer.lua b/data-otservbr-global/monster/aquatics/renegade_quara_hydromancer.lua
@@ -63,6 +63,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {

diff --git a/data-otservbr-global/monster/aquatics/renegade_quara_mantassin.lua b/data-otservbr-global/monster/aquatics/renegade_quara_mantassin.lua
@@ -63,6 +63,7 @@ monster.flags = {
 	canWalkOnEnergy = false,
 	canWalkOnFire = true,
 	canWalkOnPoison = false,
+	isPreyExclusive = true,
 }
 
 monster.light = {