diff --git a/campgns/ancntkpr/map00019.txt b/campgns/ancntkpr/map00019.txt index 221de04587..dbbe4ce126 100644 --- a/campgns/ancntkpr/map00019.txt +++ b/campgns/ancntkpr/map00019.txt @@ -7,6 +7,9 @@ REM ******************************************** COMPUTER_PLAYER(PLAYER1,0) COMPUTER_PLAYER(PLAYER2,0) +SET_COMPUTER_PROCESS(PLAYER1,"DIG TO CLOSE GOLD",0,30999,144000,1,1) +SET_COMPUTER_PROCESS(PLAYER2,"DIG TO CLOSE GOLD",0,30999,144000,1,1) + DISPLAY_OBJECTIVE(105,PLAYER0) DISPLAY_INFORMATION(107,PLAYER0) diff --git a/campgns/dzjr06lv_crtr/demonspawn.cfg b/campgns/dzjr06lv_crtr/demonspawn.cfg index 279f28351b..dca28c4b56 100644 --- a/campgns/dzjr06lv_crtr/demonspawn.cfg +++ b/campgns/dzjr06lv_crtr/demonspawn.cfg @@ -17,7 +17,8 @@ Defence = 50 Luck = 8 Recovery = 5 HungerRate = 0 -HungerFill = 0 +; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic. +HungerFill = 1 LairSize = 1 HurtByLava = 0 BaseSpeed = 56 diff --git a/campgns/dzjr06lv_crtr/ghost.cfg b/campgns/dzjr06lv_crtr/ghost.cfg index 0695863b21..e38b64e38e 100644 --- a/campgns/dzjr06lv_crtr/ghost.cfg +++ b/campgns/dzjr06lv_crtr/ghost.cfg @@ -17,7 +17,8 @@ Defence = 250 Luck = 10 Recovery = 10 HungerRate = 0 -HungerFill = 0 +; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic. +HungerFill = 1 HurtByLava = 2 BaseSpeed = 56 Size = 200 512 diff --git a/campgns/dzjr06lv_crtr/skeleton.cfg b/campgns/dzjr06lv_crtr/skeleton.cfg index e1108a4264..bd1763baae 100644 --- a/campgns/dzjr06lv_crtr/skeleton.cfg +++ b/campgns/dzjr06lv_crtr/skeleton.cfg @@ -17,7 +17,8 @@ Defence = 40 Luck = 2 Recovery = 24 HungerRate = 0 -HungerFill = 0 +; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic. +HungerFill = 1 LairSize = 1 HurtByLava = 2 BaseSpeed = 72 diff --git a/campgns/postanck/map00191.txt b/campgns/postanck/map00191.txt index 297067c47a..f1df002f7e 100644 --- a/campgns/postanck/map00191.txt +++ b/campgns/postanck/map00191.txt @@ -5,6 +5,8 @@ REM REM ******************************************** COMPUTER_PLAYER(PLAYER1,1) +SET_COMPUTER_EVENT(PLAYER1,"EVENT ENEMY DOOR",144000,41,2500,2,0) + START_MONEY(PLAYER1,10000) MAX_CREATURES(PLAYER1,40) ADD_CREATURE_TO_POOL(ORC,9) diff --git a/levels/legacy_cfgs/magic.cfg b/levels/legacy_cfgs/magic.cfg index ef49f83f8b..c637122a82 100644 --- a/levels/legacy_cfgs/magic.cfg +++ b/levels/legacy_cfgs/magic.cfg @@ -11,6 +11,10 @@ Name = SHOT_LIGHTNING BaseExperienceGain = 256 Properties = REBOUND_IMMUNE WIND_IMMUNE FIXED_DAMAGE +[shot11] +Name = SHOT_GRENADE +WithstandHitAgainst = WALL DOOR LAVA WATER + [shot12] Name = SHOT_DRAIN BaseExperienceGain = 256 @@ -25,6 +29,10 @@ Properties = Name = SHOT_BOULDER Health = 210 +[shot30] +Name = SHOT_WORD_OF_POWER +AreaDamage = 5 150 150 + [spell21] Name = SPELL_SIGHT SpellPower = POWER_SIGHT diff --git a/levels/legacy_cfgs/rules.cfg b/levels/legacy_cfgs/rules.cfg index 7f72ce27bd..460d37db5e 100644 --- a/levels/legacy_cfgs/rules.cfg +++ b/levels/legacy_cfgs/rules.cfg @@ -3,6 +3,7 @@ ; Note that it is partial config file - do not replace global config with this file. [game] +GoldPerHoard = 2250 DungeonHeartHealHealth = 1 PreserveClassicBugs = RESURRECT_FOREVER OVERFLOW_8BIT CLAIM_ROOM_ALL_THINGS RESURRECT_REMOVED NO_HAND_PURGE_ON_DEFEAT MUST_OBEY_KEEPS_NOT_DO_JOBS BREAK_NEUTRAL_WALLS ALWAYS_TUNNEL_TO_RED FULLY_HAPPY_WITH_GOLD FAINTED_IMMUNE_TO_BOULDER REBIRTH_KEEPS_SPELLS STUN_FRIENDLY_UNITS PASSIVE_NEUTRALS NEUTRAL_TORTURE_CONVERTS MapCreatureLimit = 255 diff --git a/levels/legacy_crtr/ghost.cfg b/levels/legacy_crtr/ghost.cfg index dc8250fc8b..1367e64348 100644 --- a/levels/legacy_crtr/ghost.cfg +++ b/levels/legacy_crtr/ghost.cfg @@ -7,6 +7,8 @@ Name = GHOST FearStronger = 10000 Defence = 60 Luck = 4 +; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic. +HungerFill = 1 Properties = IMMUNE_TO_GAS FLYING SEE_INVISIBLE EVIL [experience] diff --git a/levels/legacy_crtr/skeleton.cfg b/levels/legacy_crtr/skeleton.cfg index 32ca6e4ba5..400844198c 100644 --- a/levels/legacy_crtr/skeleton.cfg +++ b/levels/legacy_crtr/skeleton.cfg @@ -6,6 +6,8 @@ Name = SKELETON Defence = 50 Luck = 1 +; In the original game, you could force-feed creatures even if they did not have any needs for eating. Setting HungerFill to 1 while HungerRate is set to 0 enables this mechanic. +HungerFill = 1 [jobs] PrimaryJobs = TRAIN diff --git a/src/creature_states_gardn.c b/src/creature_states_gardn.c index 5db7d095e6..ab44523705 100644 --- a/src/creature_states_gardn.c +++ b/src/creature_states_gardn.c @@ -61,7 +61,7 @@ TbBool creature_able_to_eat(const struct Thing *creatng) struct CreatureStats* crstat = creature_stats_get_from_thing(creatng); if (creature_stats_invalid(crstat)) return false; - return ((crstat->hunger_rate > 0) && (crstat->hunger_fill > 0)); + return ((crstat->hunger_rate > 0) || (crstat->hunger_fill > 0)); } TbBool hunger_is_creature_hungry(const struct Thing *creatng)