From a342e2cc6406898cea359441446a8dd011ba0834 Mon Sep 17 00:00:00 2001 From: Artefact2 Date: Sun, 18 Sep 2016 14:59:24 +0200 Subject: [PATCH] Prepare for YC118.8. --- src/extra/capacitor.c | 2 +- tools/bootstrap_from_json | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/extra/capacitor.c b/src/extra/capacitor.c index 4ae48bd..471fad4 100644 --- a/src/extra/capacitor.c +++ b/src/extra/capacitor.c @@ -189,7 +189,7 @@ static inline int dogma_fill_entity(dogma_context_t* ctx, dogma_env_t* source, )); DOGMA_ASSUME_OK(dogma_get_module_attribute( - ctx, source->index, ATT_EnergyDestabilizationAmount, &(ent->other_amount) + ctx, source->index, ATT_EnergyNeutralizerAmount, &(ent->other_amount) )); ent->type = DOGMA_EENT_Neutralization; diff --git a/tools/bootstrap_from_json b/tools/bootstrap_from_json index 68c15f5..7f69528 100755 --- a/tools/bootstrap_from_json +++ b/tools/bootstrap_from_json @@ -512,7 +512,7 @@ foreach($json['effects'] as &$effect) { info("overwriting expressions of effect ".$effect['effectName']." using modifierInfo"); $info = yaml_parse($effect['modifierInfo']); - foreach($info as &$modifier) { + foreach($info as $k => &$modifier) { /* Lots of code to create, tediously, an expression that looks like: For ItemModifiers: @@ -531,6 +531,13 @@ foreach($json['effects'] as &$effect) { [($skillTypeID.$modifiedAttributeID).($operator)].$func($modifyingAttributeID) */ + if($modifier['func'] === 'EffectStopper') { + /* XXX: properly implement this */ + warn("ignoring EffectStopper for effect ".$effect['effectID']); + unset($info[$k]); + continue; + } + $modifiedattribute = query_or_insert_expression($json, [ 'operandID' => 22, /* DEFATTRIBUTE */ 'expressionAttributeID' => $modifier['modifiedAttributeID'], @@ -561,6 +568,7 @@ foreach($json['effects'] as &$effect) { break; case 'targetID': + case 'target': /* XXX? */ $domain = query_or_insert_expression($json, [ 'operandID' => 24, /* DEFENVIDX */ 'expressionValue' => 'Target',