diff --git a/game/modules/tome/data/general/encounters/arda-fareast.lua b/game/modules/tome/data/general/encounters/arda-fareast.lua index 267374c987e0f4a8823a4ab54ac2739eb17a8323..10281b5074807ddbb01f8319c0661ef4aa21e937 100644 --- a/game/modules/tome/data/general/encounters/arda-fareast.lua +++ b/game/modules/tome/data/general/encounters/arda-fareast.lua @@ -87,7 +87,7 @@ newEntity{ name = "Orcs", type = "hostile", subtype = "ambush", level_range = {1, 50}, - rarity = 11118, + rarity = 8, coords = {{ x=0, y=0, w=100, h=100}}, special_filter = function(self) return game.player:reactionToward{faction="orc-pride"} < 0 and true or false diff --git a/game/modules/tome/data/maps/towns/gates-of-morning.lua b/game/modules/tome/data/maps/towns/gates-of-morning.lua index 5ab6352de65e841131b3355dc22266bb25776913..7d58a625deeacf2e6d5147a40e81e578252fdde6 100644 --- a/game/modules/tome/data/maps/towns/gates-of-morning.lua +++ b/game/modules/tome/data/maps/towns/gates-of-morning.lua @@ -25,7 +25,7 @@ quickEntity('s', {name='brick roof', display='#', color=colors.RED, block_move=t quickEntity('t', {name='brick roof chimney', display='#', color=colors.LIGHT_RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true}) quickEntity('#', {name='wall', display='#', color=colors.WHITE, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true}) quickEntity('T', {name='tree', display='#', color=colors.LIGHT_GREEN, block_move=true, block_sight=true, image="terrain/grass.png", add_displays = {mod.class.Grid.new{image="terrain/tree_alpha2.png"}}}, {no_teleport=true}) -quickEntity('P', {name='palm tree', display='#', color=colors.LIGHT_GREEN, back_color={r=163,g=149,b=42}, image="terrain/palmtree.png", block_move=true}, {no_teleport=true}) +quickEntity('P', {name='palm tree', display='#', color=colors.LIGHT_GREEN, back_color={r=163,g=149,b=42}, image="terrain/sand.png", add_displays = {mod.class.Grid.new{image="terrain/palmtree_alpha1.png"}}, block_move=true}, {no_teleport=true}) quickEntity('~', {name='river', display='~', color=colors.BLUE, block_move=true, image="terrain/river.png", add_displays = mod.class.Grid:makeWater(true)}, {no_teleport=true}) quickEntity('O', {name='cobblestone road', display='.', color=colors.WHITE, image="terrain/stone_road1.png"}, {no_teleport=true}) quickEntity(':', {name='sand', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", can_encounter="desert", equilibrium_level=-10}, {no_teleport=true})