From dd5e686d0325bdc49b86dd7191388fcd2db542bb Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 26 Dec 2021 20:44:32 +0900 Subject: [PATCH] =?UTF-8?q?game:=20=EC=9C=A0=EB=8B=88=ED=81=AC=20=EB=AA=85?= =?UTF-8?q?=EB=A7=88,=20=EB=AA=85=EA=B2=80,=20=EC=84=9C=EC=A0=81=20?= =?UTF-8?q?=EA=B0=AF=EC=88=98=202=EB=B0=B0=20-=20=EB=A7=90=20=EC=9C=A0?= =?UTF-8?q?=EB=8B=88=ED=81=AC=EB=A1=9C=20=EB=B0=B1=EC=83=81,=20=EC=98=A4?= =?UTF-8?q?=ED=99=98=EB=A7=88,=20=ED=9D=89=EB=85=B8=EB=A7=88,=20=EC=9D=98?= =?UTF-8?q?=EB=82=A8=EB=B0=B1=EB=A7=88,=20=EC=98=A5=EC=B6=94=EB=A7=88,=20?= =?UTF-8?q?=ED=99=94=EC=A2=85=EB=A7=88,=20=EC=98=A5=EB=9E=80=EB=B0=B1?= =?UTF-8?q?=EC=9A=A9=EA=B5=AC=20=EC=B6=94=EA=B0=80=20=20=20-=20=EB=B0=B1?= =?UTF-8?q?=EC=83=81,=20=EC=98=A5=EB=9E=80=EB=B0=B1=EC=9A=A9=EA=B5=AC?= =?UTF-8?q?=EB=8A=94=20=ED=8A=B9=EC=88=98=ED=9A=A8=EA=B3=BC=20=EB=B6=80?= =?UTF-8?q?=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/ActionItem/che_명마_07_백상.php | 32 +++++ hwe/sammo/ActionItem/che_명마_07_오환마.php | 7 ++ hwe/sammo/ActionItem/che_명마_08_흉노마.php | 7 ++ hwe/sammo/ActionItem/che_명마_09_의남백마.php | 9 ++ hwe/sammo/ActionItem/che_명마_10_옥추마.php | 9 ++ hwe/sammo/ActionItem/che_명마_11_화종마.php | 9 ++ .../ActionItem/che_명마_12_옥란백용구.php | 27 ++++ hwe/sammo/GameConstBase.php | 28 +++-- hwe/scenario/scenario_2221.json | 119 +++++++++--------- hwe/scenario/scenario_902.json | 30 ++--- 10 files changed, 193 insertions(+), 84 deletions(-) create mode 100644 hwe/sammo/ActionItem/che_명마_07_백상.php create mode 100644 hwe/sammo/ActionItem/che_명마_07_오환마.php create mode 100644 hwe/sammo/ActionItem/che_명마_08_흉노마.php create mode 100644 hwe/sammo/ActionItem/che_명마_09_의남백마.php create mode 100644 hwe/sammo/ActionItem/che_명마_10_옥추마.php create mode 100644 hwe/sammo/ActionItem/che_명마_11_화종마.php create mode 100644 hwe/sammo/ActionItem/che_명마_12_옥란백용구.php diff --git a/hwe/sammo/ActionItem/che_명마_07_백상.php b/hwe/sammo/ActionItem/che_명마_07_백상.php new file mode 100644 index 00000000..ed79579a --- /dev/null +++ b/hwe/sammo/ActionItem/che_명마_07_백상.php @@ -0,0 +1,32 @@ +info .= "
[전투] 공격력 +20%, 소모 군량 +10%, 공격 시 페이즈 -1"; + } + + public function onCalcStat(General $general, string $statName, $value, $aux=null){ + $value = parent::onCalcStat($general, $statName, $value, $aux); + if($statName == 'killRice'){ + return $value * 1.1; + } + if($statName === 'initWarPhase'){ + return $value - 1; + } + return $value; + } + + public function getWarPowerMultiplier(WarUnit $unit): array + { + return [1.2, 1]; + } +} \ No newline at end of file diff --git a/hwe/sammo/ActionItem/che_명마_07_오환마.php b/hwe/sammo/ActionItem/che_명마_07_오환마.php new file mode 100644 index 00000000..259a2972 --- /dev/null +++ b/hwe/sammo/ActionItem/che_명마_07_오환마.php @@ -0,0 +1,7 @@ +info .= "
[전투] 남은 병력에 따라 회피 확률 증가. 최대 +30%p"; + } + + public function onCalcStat(General $general, string $statName, $value, $aux = null) + { + $value = parent::onCalcStat($general, $statName, $value, $aux); + if($statName == 'warAvoidRatio'){ + $leadership = $general->getLeadership(true, true, true, false); + $crewL = $general->getVar('crew') / 100; + + return $value + \sammo\Util::valueFit((1 - $crewL / $leadership) * 0.3, 0, 0.3); + } + return $value; + } +} \ No newline at end of file diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php index 3e256343..8941f651 100644 --- a/hwe/sammo/GameConstBase.php +++ b/hwe/sammo/GameConstBase.php @@ -221,29 +221,31 @@ class GameConstBase 'che_명마_01_노기' => 0, 'che_명마_02_조랑' => 0, 'che_명마_03_노새' => 0, 'che_명마_04_나귀' => 0, 'che_명마_05_갈색마' => 0, 'che_명마_06_흑색마' => 0, - 'che_명마_07_백마' => 2, 'che_명마_07_기주마' => 2, - 'che_명마_08_양주마' => 2, 'che_명마_09_과하마' => 2, - 'che_명마_10_대완마' => 2, 'che_명마_11_서량마' => 2, - 'che_명마_12_사륜거' => 2, 'che_명마_13_절영' => 1, 'che_명마_13_적로' => 1, - 'che_명마_14_적란마' => 1, 'che_명마_14_조황비전' => 1, 'che_명마_15_한혈마' => 1, 'che_명마_15_적토마' => 1, + 'che_명마_07_백마' => 2, 'che_명마_07_기주마' => 2, 'che_명마_07_오환마' => 2, 'che_명마_07_백상' => 2, + 'che_명마_08_양주마' => 2, 'che_명마_08_흉노마' => 2, 'che_명마_09_과하마' => 2, 'che_명마_09_의남백마' => 2, + 'che_명마_10_대완마' => 2, 'che_명마_10_옥추마' => 2, 'che_명마_11_서량마' => 2, 'che_명마_11_화종마' => 2, + 'che_명마_12_사륜거' => 2, 'che_명마_12_옥란백용구'=> 2, 'che_명마_13_절영' => 2, 'che_명마_13_적로' => 2, + 'che_명마_14_적란마' => 2, 'che_명마_14_조황비전' => 2, 'che_명마_15_한혈마' => 2, 'che_명마_15_적토마' => 2, ], 'weapon' => [ 'che_무기_01_단도' => 0, 'che_무기_02_단궁' => 0, 'che_무기_03_단극' => 0, 'che_무기_04_목검' => 0, 'che_무기_05_죽창' => 0, 'che_무기_06_소부' => 0, - 'che_무기_07_동추' => 1, 'che_무기_07_철편' => 1, 'che_무기_07_철쇄' => 1, 'che_무기_07_맥궁' => 1, - 'che_무기_08_유성추' => 1, 'che_무기_08_철질여골' => 1, 'che_무기_09_쌍철극' => 1, 'che_무기_09_동호비궁' => 1, 'che_무기_10_삼첨도' => 1, 'che_무기_10_대부' => 1, 'che_무기_11_고정도' => 1, 'che_무기_11_이광궁' => 1, 'che_무기_12_철척사모' => 1, 'che_무기_12_칠성검' => 1, 'che_무기_13_사모' => 1, 'che_무기_13_양유기궁' => 1, - 'che_무기_14_언월도' => 1, 'che_무기_14_방천화극' => 1, 'che_무기_15_청홍검' => 1, 'che_무기_15_의천검' => 1 + 'che_무기_07_동추' => 2, 'che_무기_07_철편' => 2, 'che_무기_07_철쇄' => 2, 'che_무기_07_맥궁' => 2, + 'che_무기_08_유성추' => 2, 'che_무기_08_철질여골' => 2, 'che_무기_09_쌍철극' => 2, 'che_무기_09_동호비궁' => 2, + 'che_무기_10_삼첨도' => 2, 'che_무기_10_대부' => 2, 'che_무기_11_고정도' => 2, 'che_무기_11_이광궁' => 2, + 'che_무기_12_철척사모' => 2, 'che_무기_12_칠성검' => 2, 'che_무기_13_사모' => 2, 'che_무기_13_양유기궁' => 2, + 'che_무기_14_언월도' => 2, 'che_무기_14_방천화극' => 2, 'che_무기_15_청홍검' => 2, 'che_무기_15_의천검' => 2 ], 'book' => [ 'che_서적_01_효경전' => 0, 'che_서적_02_회남자' => 0, 'che_서적_03_변도론' => 0, 'che_서적_04_건상역주' => 0, 'che_서적_05_여씨춘추' => 0, 'che_서적_06_사민월령' => 0, - 'che_서적_07_위료자' => 1, 'che_서적_07_사마법' => 1, 'che_서적_07_한서' => 1, 'che_서적_07_논어' => 1, - 'che_서적_08_전론' => 1, 'che_서적_08_사기' => 1, 'che_서적_09_장자' => 1, 'che_서적_09_역경' => 1, - 'che_서적_10_시경' => 1, 'che_서적_10_구국론' => 1, 'che_서적_11_상군서' => 1, 'che_서적_11_춘추전' => 1, - 'che_서적_12_산해경' => 1, 'che_서적_12_맹덕신서' => 1, 'che_서적_13_관자' => 1, 'che_서적_13_병법24편' => 1, - 'che_서적_14_한비자' => 1, 'che_서적_14_오자병법' => 1, 'che_서적_15_노자' => 1, 'che_서적_15_손자병법' => 1, + 'che_서적_07_위료자' => 2, 'che_서적_07_사마법' => 2, 'che_서적_07_한서' => 2, 'che_서적_07_논어' => 2, + 'che_서적_08_전론' => 2, 'che_서적_08_사기' => 2, 'che_서적_09_장자' => 2, 'che_서적_09_역경' => 2, + 'che_서적_10_시경' => 2, 'che_서적_10_구국론' => 2, 'che_서적_11_상군서' => 2, 'che_서적_11_춘추전' => 2, + 'che_서적_12_산해경' => 2, 'che_서적_12_맹덕신서' => 2, 'che_서적_13_관자' => 2, 'che_서적_13_병법24편' => 2, + 'che_서적_14_한비자' => 2, 'che_서적_14_오자병법' => 2, 'che_서적_15_노자' => 2, 'che_서적_15_손자병법' => 2, ], 'item' => [ 'che_치료_환약' => 0, 'che_저격_수극' => 0, 'che_사기_탁주' => 0, diff --git a/hwe/scenario/scenario_2221.json b/hwe/scenario/scenario_2221.json index b70cf639..ec9b9177 100644 --- a/hwe/scenario/scenario_2221.json +++ b/hwe/scenario/scenario_2221.json @@ -26,19 +26,26 @@ "che_명마_05_갈색마": 0, "che_명마_06_흑색마": 0, - "che_명마_07_백마": 2, - "che_명마_07_기주마": 2, - "che_명마_08_양주마": 2, - "che_명마_09_과하마": 2, - "che_명마_10_대완마": 2, - "che_명마_11_서량마": 2, - "che_명마_12_사륜거": 2, - "che_명마_13_절영": 1, - "che_명마_13_적로": 1, - "che_명마_14_적란마": 1, - "che_명마_14_조황비전": 1, - "che_명마_15_한혈마": 1, - "che_명마_15_적토마": 1 + "che_명마_07_백마" : 2, + "che_명마_07_기주마" : 2, + "che_명마_07_오환마" : 2, + "che_명마_07_백상" : 2, + "che_명마_08_양주마" : 2, + "che_명마_08_흉노마" : 2, + "che_명마_09_과하마" : 2, + "che_명마_09_의남백마" : 2, + "che_명마_10_대완마" : 2, + "che_명마_10_옥추마" : 2, + "che_명마_11_서량마" : 2, + "che_명마_11_화종마" : 2, + "che_명마_12_사륜거" : 2, + "che_명마_12_옥란백용구": 2, + "che_명마_13_절영" : 2, + "che_명마_13_적로" : 2, + "che_명마_14_적란마" : 2, + "che_명마_14_조황비전" : 2, + "che_명마_15_한혈마" : 2, + "che_명마_15_적토마" : 2 }, "weapon": { "che_무기_01_단도": 0, @@ -48,26 +55,26 @@ "che_무기_05_죽창": 0, "che_무기_06_소부": 0, - "che_무기_07_동추": 1, - "che_무기_07_철편": 1, - "che_무기_07_철쇄": 1, - "che_무기_07_맥궁": 1, - "che_무기_08_유성추": 1, - "che_무기_08_철질여골": 1, - "che_무기_09_쌍철극": 1, - "che_무기_09_동호비궁": 1, - "che_무기_10_삼첨도": 1, - "che_무기_10_대부": 1, - "che_무기_11_고정도": 1, - "che_무기_11_이광궁": 1, - "che_무기_12_철척사모": 1, - "che_무기_12_칠성검": 1, - "che_무기_13_사모": 1, - "che_무기_13_양유기궁": 1, - "che_무기_14_언월도": 1, - "che_무기_14_방천화극": 1, - "che_무기_15_청홍검": 1, - "che_무기_15_의천검": 1 + "che_무기_07_동추": 2, + "che_무기_07_철편": 2, + "che_무기_07_철쇄": 2, + "che_무기_07_맥궁": 2, + "che_무기_08_유성추": 2, + "che_무기_08_철질여골": 2, + "che_무기_09_쌍철극": 2, + "che_무기_09_동호비궁": 2, + "che_무기_10_삼첨도": 2, + "che_무기_10_대부": 2, + "che_무기_11_고정도": 2, + "che_무기_11_이광궁": 2, + "che_무기_12_철척사모": 2, + "che_무기_12_칠성검": 2, + "che_무기_13_사모": 2, + "che_무기_13_양유기궁": 2, + "che_무기_14_언월도": 2, + "che_무기_14_방천화극": 2, + "che_무기_15_청홍검": 2, + "che_무기_15_의천검": 2 }, "book": { "che_서적_01_효경전": 0, @@ -77,26 +84,26 @@ "che_서적_05_여씨춘추": 0, "che_서적_06_사민월령": 0, - "che_서적_07_위료자": 1, - "che_서적_07_사마법": 1, - "che_서적_07_한서": 1, - "che_서적_07_논어": 1, - "che_서적_08_전론": 1, - "che_서적_08_사기": 1, - "che_서적_09_장자": 1, - "che_서적_09_역경": 1, - "che_서적_10_시경": 1, - "che_서적_10_구국론": 1, - "che_서적_11_상군서": 1, - "che_서적_11_춘추전": 1, - "che_서적_12_산해경": 1, - "che_서적_12_맹덕신서": 1, - "che_서적_13_관자": 1, - "che_서적_13_병법24편": 1, - "che_서적_14_한비자": 1, - "che_서적_14_오자병법": 1, - "che_서적_15_노자": 1, - "che_서적_15_손자병법": 1 + "che_서적_07_위료자": 2, + "che_서적_07_사마법": 2, + "che_서적_07_한서": 2, + "che_서적_07_논어": 2, + "che_서적_08_전론": 2, + "che_서적_08_사기": 2, + "che_서적_09_장자": 2, + "che_서적_09_역경": 2, + "che_서적_10_시경": 2, + "che_서적_10_구국론": 2, + "che_서적_11_상군서": 2, + "che_서적_11_춘추전": 2, + "che_서적_12_산해경": 2, + "che_서적_12_맹덕신서": 2, + "che_서적_13_관자": 2, + "che_서적_13_병법24편": 2, + "che_서적_14_한비자": 2, + "che_서적_14_오자병법": 2, + "che_서적_15_노자": 2, + "che_서적_15_손자병법": 2 }, "item": { "che_치료_환약": 0, @@ -129,7 +136,7 @@ } }, "iconPath": ".", - "fiction": 1, + "fiction": 2, "nation": [], "diplomacy": [], "general": [ @@ -281,7 +288,7 @@ [0, "오반", null, 0, null, 74, 71, 50, 0, 160, 300, null, null], [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null], [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null], - [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null], + [0, "채화", null, 0, null, 39, 50, 2, 0, 160, 300, null, null], [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null], [0, "채모", null, 0, null, 70, 55, 77, 0, 160, 300, null, null], [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null], @@ -694,7 +701,7 @@ [0, "성만", null, 0, null, 61, 68, 46, 0, 160, 300, null, null], [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null], [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null], - [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null], + [0, "잠혼", null, 0, null, 2, 2, 22, 0, 160, 300, null, null], [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null], [0, "심영", null, 0, null, 70, 77, 55, 0, 160, 300, null, null], [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null], diff --git a/hwe/scenario/scenario_902.json b/hwe/scenario/scenario_902.json index 556b37b0..987283e5 100644 --- a/hwe/scenario/scenario_902.json +++ b/hwe/scenario/scenario_902.json @@ -19,31 +19,31 @@ "che_명마_01_노기":0, "che_명마_02_조랑":0, "che_명마_03_노새":0, "che_명마_04_나귀":0, "che_명마_05_갈색마":0, "che_명마_06_흑색마":0, - "che_명마_07_백마":2, "che_명마_07_기주마":2, - "che_명마_08_양주마":2, "che_명마_09_과하마":2, - "che_명마_10_대완마":2, "che_명마_11_서량마":2, - "che_명마_12_사륜거":2, "che_명마_13_절영":1, "che_명마_13_적로":1, - "che_명마_14_적란마":1, "che_명마_14_조황비전":1, "che_명마_15_한혈마":1, "che_명마_15_적토마":1 + "che_명마_07_백마" : 2, "che_명마_07_기주마" : 2, "che_명마_07_오환마" : 2, "che_명마_07_백상" : 2, + "che_명마_08_양주마" : 2, "che_명마_08_흉노마" : 2, "che_명마_09_과하마" : 2, "che_명마_09_의남백마" : 2, + "che_명마_10_대완마" : 2, "che_명마_10_옥추마" : 2, "che_명마_11_서량마" : 2, "che_명마_11_화종마" : 2, + "che_명마_12_사륜거" : 2, "che_명마_12_옥란백용구": 2, "che_명마_13_절영" : 2, "che_명마_13_적로" : 2, + "che_명마_14_적란마" : 2, "che_명마_14_조황비전" : 2, "che_명마_15_한혈마" : 2, "che_명마_15_적토마" : 2 }, "weapon":{ "che_무기_01_단도":0, "che_무기_02_단궁":0, "che_무기_03_단극":0, "che_무기_04_목검":0, "che_무기_05_죽창":0, "che_무기_06_소부":0, - "che_무기_07_동추":1, "che_무기_07_철편":1, "che_무기_07_철쇄":1, "che_무기_07_맥궁":1, - "che_무기_08_유성추":1, "che_무기_08_철질여골":1, "che_무기_09_쌍철극":1, "che_무기_09_동호비궁":1, - "che_무기_10_삼첨도":1, "che_무기_10_대부":1, "che_무기_11_고정도":1, "che_무기_11_이광궁":1, - "che_무기_12_철척사모":1, "che_무기_12_칠성검":1, "che_무기_13_사모":1, "che_무기_13_양유기궁":1, - "che_무기_14_언월도":1, "che_무기_14_방천화극":1, "che_무기_15_청홍검":1, "che_무기_15_의천검":1 + "che_무기_07_동추":2, "che_무기_07_철편":2, "che_무기_07_철쇄":2, "che_무기_07_맥궁":2, + "che_무기_08_유성추":2, "che_무기_08_철질여골":2, "che_무기_09_쌍철극":2, "che_무기_09_동호비궁":2, + "che_무기_10_삼첨도":2, "che_무기_10_대부":2, "che_무기_11_고정도":2, "che_무기_11_이광궁":2, + "che_무기_12_철척사모":2, "che_무기_12_칠성검":2, "che_무기_13_사모":2, "che_무기_13_양유기궁":2, + "che_무기_14_언월도":2, "che_무기_14_방천화극":2, "che_무기_15_청홍검":2, "che_무기_15_의천검":2 }, "book":{ "che_서적_01_효경전":0, "che_서적_02_회남자":0, "che_서적_03_변도론":0, "che_서적_04_건상역주":0, "che_서적_05_여씨춘추":0, "che_서적_06_사민월령":0, - "che_서적_07_위료자":1, "che_서적_07_사마법":1, "che_서적_07_한서":1, "che_서적_07_논어":1, - "che_서적_08_전론":1, "che_서적_08_사기":1, "che_서적_09_장자":1, "che_서적_09_역경":1, - "che_서적_10_시경":1, "che_서적_10_구국론":1, "che_서적_11_상군서":1, "che_서적_11_춘추전":1, - "che_서적_12_산해경":1, "che_서적_12_맹덕신서":1, "che_서적_13_관자":1, "che_서적_13_병법24편":1, - "che_서적_14_한비자":1, "che_서적_14_오자병법":1, "che_서적_15_노자":1, "che_서적_15_손자병법":1 + "che_서적_07_위료자":2, "che_서적_07_사마법":2, "che_서적_07_한서":2, "che_서적_07_논어":2, + "che_서적_08_전론":2, "che_서적_08_사기":2, "che_서적_09_장자":2, "che_서적_09_역경":2, + "che_서적_10_시경":2, "che_서적_10_구국론":2, "che_서적_11_상군서":2, "che_서적_11_춘추전":2, + "che_서적_12_산해경":2, "che_서적_12_맹덕신서":2, "che_서적_13_관자":2, "che_서적_13_병법24편":2, + "che_서적_14_한비자":2, "che_서적_14_오자병법":2, "che_서적_15_노자":2, "che_서적_15_손자병법":2 }, "item":{ "che_치료_환약":0, "che_저격_수극":0, "che_사기_탁주":0,