[xoreos-git] [xoreos/xoreos] 31d483: NWN2: Skeleton framework for Trap class

Fri Nov 23 22:37:03 CET 2018

  Branch: refs/heads/master
  Home:   https://github.com/xoreos/xoreos
  Commit: 31d4836ca91422d6c9417c3fabee74a9c290fbe5
      https://github.com/xoreos/xoreos/commit/31d4836ca91422d6c9417c3fabee74a9c290fbe5
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/rules.mk
    A src/engines/nwn2/trap.cpp
    A src/engines/nwn2/trap.h

  Log Message:
  -----------
  NWN2: Skeleton framework for Trap class

Create an initial Trap class definition by including NWN2 script
function calls as well as variables set in the .gff file for traps.
This class will be inherited by Door, Placeable, and Trigger classes;
it is not intended as a stand-alone object. The class includes calls
to process detect, disarm, and trigger events on the trap. A Trap
class instance can be created either from a GFF3Struct or by a
Creature class instance using a data row in the traps.2da file.
The latter is intended for a trigger region created from a trap item
or spell.

Note: This version of the trap.cpp file compiles with multiple
warnings for unused variables.

  Commit: da3f846fab8a2dcdf372613bf170f52e435654ec
      https://github.com/xoreos/xoreos/commit/da3f846fab8a2dcdf372613bf170f52e435654ec
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/trap.h

  Log Message:
  -----------
  NWN2: Load trap info from GFF3Struct

  Commit: 395112dbb65d7ad7c62edff53b28b949f653ded5
      https://github.com/xoreos/xoreos/commit/395112dbb65d7ad7c62edff53b28b949f653ded5
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/trap.h

  Log Message:
  -----------
  NWN2: Load trap information from the traps.2da file

  Commit: 2709ce03bb00ee376fd559371b7846dfd753c108
      https://github.com/xoreos/xoreos/commit/2709ce03bb00ee376fd559371b7846dfd753c108
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trap.cpp

  Log Message:
  -----------
  NWN2: Set the creature detecting the trap

  Commit: 0a5080b4ea00f9e1f87a86ead3168d8d9eb6b4f1
      https://github.com/xoreos/xoreos/commit/0a5080b4ea00f9e1f87a86ead3168d8d9eb6b4f1
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/creature.h
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Implement detectTrap call

  Commit: 464b92e2e97ff5aa52a24f11514014f1dd74c5e1
      https://github.com/xoreos/xoreos/commit/464b92e2e97ff5aa52a24f11514014f1dd74c5e1
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trap.cpp

  Log Message:
  -----------
  NWN2: Implement disableTrap call

  Commit: 9fb981efb12d6af41d1be9252a38361d2b24aa3f
      https://github.com/xoreos/xoreos/commit/9fb981efb12d6af41d1be9252a38361d2b24aa3f
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp

  Log Message:
  -----------
  NWN2: Add ability modifier to creature skill check

  Commit: 45293465369c798ef6695cd18740d80216fc87d9
      https://github.com/xoreos/xoreos/commit/45293465369c798ef6695cd18740d80216fc87d9
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/door.cpp
    M src/engines/nwn2/door.h
    M src/engines/nwn2/placeable.cpp
    M src/engines/nwn2/placeable.h
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/trap.h

  Log Message:
  -----------
  NWN2: Add Trap class to the Door and Placeable classes

  Commit: c39b4005bb2e4eb02ca0d506265d4240cdbfb856
      https://github.com/xoreos/xoreos/commit/c39b4005bb2e4eb02ca0d506265d4240cdbfb856
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    A src/engines/nwn2/feats.cpp
    A src/engines/nwn2/feats.h
    M src/engines/nwn2/rules.mk
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Add feat class to process feat benefits

  Commit: 6c9922a9b2fec3e995a7e94716116d53fd075bec
      https://github.com/xoreos/xoreos/commit/6c9922a9b2fec3e995a7e94716116d53fd075bec
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/creature.h

  Log Message:
  -----------
  NWN2: Add Feat class variable in Creature class

  Commit: 818fa07e15c8cb1a21d1ce633167b8eaa32f9177
      https://github.com/xoreos/xoreos/commit/818fa07e15c8cb1a21d1ce633167b8eaa32f9177
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/rules.mk
    A src/engines/nwn2/trigger.cpp
    A src/engines/nwn2/trigger.h

  Log Message:
  -----------
  NWN2: Adapt Trigger class from KotOR

  Commit: 528e87a5a18c377e83ad96b798cf28802b2ca0d6
      https://github.com/xoreos/xoreos/commit/528e87a5a18c377e83ad96b798cf28802b2ca0d6
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trigger.cpp
    M src/engines/nwn2/trigger.h

  Log Message:
  -----------
  NWN2: Add Trap class to the Trigger class

  Commit: bd4dfaff3c6c67da2106898e06cdf6a1539404b9
      https://github.com/xoreos/xoreos/commit/bd4dfaff3c6c67da2106898e06cdf6a1539404b9
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/door.cpp
    M src/engines/nwn2/placeable.cpp
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/trap.h

  Log Message:
  -----------
  NWN2: Trapped object runs the trap trigger script

  Commit: 07c81252df8665d2f5aff0f2370c94fc06964925
      https://github.com/xoreos/xoreos/commit/07c81252df8665d2f5aff0f2370c94fc06964925
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/trap.h

  Log Message:
  -----------
  NWN2: Implement the disarm trap options

This partly implements the four disarm trap options documented in
the NWN2 manual entry for the Disable Device skill. The following
remain incomplete:

 - Examine trap: find the dialog.tlk rows for reporting the results
   of a trap Disable Device examine skill check, then post the
   appropriate string to the player's message window.
 - Recover trap: on a successful recover trap skill check, add an
   item with the matching resref to the agent creature's inventory.

  Commit: a8622ea828776fe450be08ba2ce0d896cd283c7e
      https://github.com/xoreos/xoreos/commit/a8622ea828776fe450be08ba2ce0d896cd283c7e
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp

  Log Message:
  -----------
  NWN2: Add skill synergies to skill check

  Commit: c84ecff87632bf6df05524ffc6501b9f71754b32
      https://github.com/xoreos/xoreos/commit/c84ecff87632bf6df05524ffc6501b9f71754b32
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/feats.h
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Add PC history feats and implement their saving throw modifiers

  Commit: af934b3948863e3dfa67a471ee579e2878db7d37
      https://github.com/xoreos/xoreos/commit/af934b3948863e3dfa67a471ee579e2878db7d37
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/feats.h

  Log Message:
  -----------
  NWN2: Add boolean flags for lookup of feats that need special code

  Commit: a2b2fa2437ea69e2eaca140aa22940e341aea6c1
      https://github.com/xoreos/xoreos/commit/a2b2fa2437ea69e2eaca140aa22940e341aea6c1
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/area.cpp
    M src/engines/nwn2/area.h

  Log Message:
  -----------
  NWN2: Check for 'natural', 'underground' and 'interior' area bit flags

  Commit: b62734dcb2eb9adc842021e929910aeb9ff5803d
      https://github.com/xoreos/xoreos/commit/b62734dcb2eb9adc842021e929910aeb9ff5803d
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/feats.h
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Add skill modifiers for racial feats

  Commit: a913c2cc18d178945f06bd84e6bcae906212def6
      https://github.com/xoreos/xoreos/commit/a913c2cc18d178945f06bd84e6bcae906212def6
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/creature.h

  Log Message:
  -----------
  NWN2: Add getAbilityModifier call to Creature class

  Commit: 049462fc31de46d1a9392576d024648c283a6030
      https://github.com/xoreos/xoreos/commit/049462fc31de46d1a9392576d024648c283a6030
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/creature.h
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/feats.h

  Log Message:
  -----------
  NWN2: Add getHasSkill function to Creature class

  Commit: e1e5ea72227cd802d903936a273d472e89a11d1d
      https://github.com/xoreos/xoreos/commit/e1e5ea72227cd802d903936a273d472e89a11d1d
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/creature.h

  Log Message:
  -----------
  NWN2: Use _ranks[] array to tally skills across multiple levels

  Commit: d18e475829b97a21d14dbed8f3dd4c44ae09afc0
      https://github.com/xoreos/xoreos/commit/d18e475829b97a21d14dbed8f3dd4c44ae09afc0
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/feats.h
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Add background feats

  Commit: 39bdfa38ede0ea5b6c8cada78a1f72dbee494ef4
      https://github.com/xoreos/xoreos/commit/39bdfa38ede0ea5b6c8cada78a1f72dbee494ef4
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/area.cpp
    M src/engines/nwn2/area.h
    M src/engines/nwn2/creature.cpp
    M src/engines/nwn2/creature.h
    M src/engines/nwn2/door.cpp
    M src/engines/nwn2/door.h
    A src/engines/nwn2/faction.cpp
    A src/engines/nwn2/faction.h
    M src/engines/nwn2/module.cpp
    M src/engines/nwn2/module.h
    M src/engines/nwn2/object.cpp
    M src/engines/nwn2/object.h
    M src/engines/nwn2/placeable.cpp
    M src/engines/nwn2/placeable.h
    M src/engines/nwn2/rules.mk
    M src/engines/nwn2/trap.cpp
    M src/engines/nwn2/trigger.cpp
    M src/engines/nwn2/trigger.h
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Implement Factions class

Factions are stored at the module level of the game, so the
Factions class is added to the Module class and accessed by the
Object class via the _module variable in the Area class. A faction
ID is assigned to a Creature, Door, Placeable, and Trigger object,
with the faction vs. faction reputations determining whether a
Creature or Trap behaves in a friendly, neutral, or hostile manner.
(Traps will not trigger vs. a friendly faction, for example.)

Creatures can store additional reputation information for
individuals that can be modified via script calls. This is held by
a Reputation class. Each creature stores how other creatures feel
about them, with the default being the faction reputation.

Initially, Faction data is just retrieved from the repute.2da data
file. The door and placeable classes will check the faction
reputation before determining whether to trigger their trap.

  Commit: b73f2ecc8603065f52bfa5a0cf87478d3184dfc8
      https://github.com/xoreos/xoreos/commit/b73f2ecc8603065f52bfa5a0cf87478d3184dfc8
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/faction.cpp
    M src/engines/nwn2/faction.h

  Log Message:
  -----------
  NWN2: Add personal reputation functionality

  Commit: c8843daefd739642a3ffb79666cf9084c866fb4f
      https://github.com/xoreos/xoreos/commit/c8843daefd739642a3ffb79666cf9084c866fb4f
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/faction.cpp
    M src/engines/nwn2/faction.h

  Log Message:
  -----------
  NWN2: Load module factions from 'repute.FAC' file

  Commit: 68864cfc49f26a00ffc59dfe5e84f7348f0a19ea
      https://github.com/xoreos/xoreos/commit/68864cfc49f26a00ffc59dfe5e84f7348f0a19ea
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/faction.cpp

  Log Message:
  -----------
  NWN2: Clear personal rep

  Commit: 91f195e9ead4956ff0148245638ee95b0efd3c20
      https://github.com/xoreos/xoreos/commit/91f195e9ead4956ff0148245638ee95b0efd3c20
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/faction.cpp

  Log Message:
  -----------
  NWN2: Get the object's reputation with the faction

  Commit: 4eb1b91dd0a22329d8db6bc8b12c4538ef220a67
      https://github.com/xoreos/xoreos/commit/4eb1b91dd0a22329d8db6bc8b12c4538ef220a67
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/trap.cpp

  Log Message:
  -----------
  NWN2: Get trap detected by

  Commit: 70c494f0b22fee106c11855a6e0ce51a8f159fac
      https://github.com/xoreos/xoreos/commit/70c494f0b22fee106c11855a6e0ce51a8f159fac
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Add skill focus feats

  Commit: c580b6b984dff16f09b4ba74cde87758987ffc10
      https://github.com/xoreos/xoreos/commit/c580b6b984dff16f09b4ba74cde87758987ffc10
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/types.h

  Log Message:
  -----------
  NWN2: Add skill feats

  Commit: 739f281040b2eb73efb806ed43b3c672d27e2308
      https://github.com/xoreos/xoreos/commit/739f281040b2eb73efb806ed43b3c672d27e2308
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/feats.cpp
    M src/engines/nwn2/feats.h

  Log Message:
  -----------
  NWN2: Store feats with level information

  Commit: 1fbce0525c90375eddb8e7b27bcca5656de1d347
      https://github.com/xoreos/xoreos/commit/1fbce0525c90375eddb8e7b27bcca5656de1d347
  Author: Bob Hall <rjh405 at gmail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/engines/nwn2/faction.cpp

  Log Message:
  -----------
  NWN2: Fix for potential misordered reputation list

  Commit: 92f92f896a9ee00cd095f7a2bdadc4d5677fb8e6
      https://github.com/xoreos/xoreos/commit/92f92f896a9ee00cd095f7a2bdadc4d5677fb8e6
  Author: patrick <nostritius at googlemail.com>
  Date:   2018-11-23 (Fri, 23 Nov 2018)

  Changed paths:
    M src/video/quicktime.cpp

  Log Message:
  -----------
  VIDEOS: Fix quicktime compilation without libfaad

Compare: https://github.com/xoreos/xoreos/compare/8b3fbd834a86...92f92f896a9e
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.