Merge branch 'obc/scorer-generator' into ok/obc-alpha-release

tlentz · Jan 30, 2021 · c60afda · c60afda
2 parents c2f7e48 + e9c08dd
commit c60afda
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -203,6 +203,9 @@ Anyone who donates, will get recognition in the form of a role in the Discord.
 Thanks!
 
 # Change Log
+## v0.5.2-alpha-22
+* [bugfix] PropScores lines weren't allowing Faith or Exiles Path
+
 ## v0.5.2-alpha-21
 * Expanded level and item availability of auras for the Generator
 * Merged in cleanup from obc/mobdensity branch

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-v0.5.2-alpha-21
+v0.5.2-alpha-22
diff --git a/assets/propscores/PropScores.txt b/assets/propscores/PropScores.txt
@@ -50,8 +50,9 @@ att/lvl	24	0	0	lvl		12	15														111		Angelic Halo	SetItems	0
 att%	0	10	300	r=	10	120	15														111		Aldur's Watchtower	Sets	0
 aura	Concentration	1	30	smm	90	900		18				weap	armo								254		Pride	Runes	0
 aura	Conviction	1	30	smm	135	900		30				weap	armo								254		Infinity	Runes	0
-aura	Defiance	1	30	smm	44	228	5	6				weap	armo								254		Exile's Path	Runes	0
-aura	Fanaticism	1	30	smm	75	900		30				weap	armo								254	dmg	The Beast	Runes	0
+aura	Defiance	1	30	smm	44	228	5	6				weap	armo	pala							254		Exile's Path	Runes	0
+aura	Fanaticism	1	30	smm	75	900		30				weap	armo	miss							254	dmg	The Beast	Runes	0
+aura	fanaticism	1	30	smm	75	900		30				weap	armo	miss							254	dmg	The Beast	Runes	0
 aura	Holy Fire	1	30	smm	16	125		6				weap  	armo								254		Hand of Justice	Runes	0
 aura	Holy Freeze	1	30	smm	15	250		18				weap	armo								254		Ice	Runes	0
 aura	Holy Shock	1	30	smm	41	500		24				weap	armo								254		Dream	Runes	0

diff --git a/cfg.json b/cfg.json
@@ -36,7 +36,7 @@
         "ElementalSkills": true
     },
     "GeneratorOptions": {
-        "Generate": false,
+        "Generate": true,
         "UseSeed": true,
         "Seed": 1234,
         "UseSetsSeed": true,

diff --git a/gui/react-ui/src/components/D2ModMaker/Main.js b/gui/react-ui/src/components/D2ModMaker/Main.js
@@ -21,7 +21,7 @@ const _ = require('lodash');
 const axios = require("axios");
 
 const defaultCfg = {
-  Version: "v0.5.2-alpha-21",
+  Version: "v0.5.2-alpha-22",
   SourceDir: "",
   OutputDir: "",
   MeleeSplash: false,

diff --git a/internal/d2fs/assets/assets_vfsdata.go b/internal/d2fs/assets/assets_vfsdata.go
diff --git a/internal/d2mod/config/cfg.go b/internal/d2mod/config/cfg.go
@@ -69,7 +69,7 @@ type Data struct {
 // DefaultData Default configuration should the cfg.json not read/be missing anything.
 func DefaultData() Data {
 	return Data{
-		Version:                 "v0.5.2-alpha-21",
+		Version:                 "v0.5.2-alpha-22",
 		SourceDir:               "",
 		OutputDir:               "",
 		MeleeSplash:             false,

diff --git a/internal/d2mod/scorer/PropAnalysis.ods b/internal/d2mod/scorer/PropAnalysis.ods