Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 003c47c8 authored by feihuaduo's avatar feihuaduo
Browse files
Options

Merge branch 'master' of https://github.com/fallenstardust/YGOMobile-cn-ko-en

parents abb707b5 c69cb14f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 569 additions and 188 deletions
Classes/ocgcore/card.cpp
View file @ 003c47c8
...@@ -1979,12 +1979,14 @@ uint8 card::refresh_control_status() { ...@@ -1979,12 +1979,14 @@ uint8 card::refresh_control_status() {
effect* peffect = eset.get_last(); effect* peffect = eset.get_last();
if(peffect->id >= last_id) { if(peffect->id >= last_id) {
card* pcard = peffect->get_handler(); card* pcard = peffect->get_handler();
pduel->game_field->core.readjust_map[pcard]++; uint8 val = (uint8)peffect->get_value(this);
if(pduel->game_field->core.readjust_map[pcard] > 3) { if(val != current.controler)
pduel->game_field->core.readjust_map[pcard]++;
if(pduel->game_field->core.readjust_map[pcard] > 5) {
pduel->game_field->send_to(pcard, 0, REASON_RULE, peffect->get_handler_player(), PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP); pduel->game_field->send_to(pcard, 0, REASON_RULE, peffect->get_handler_player(), PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
return final; return final;
} }
final = (uint8)peffect->get_value(this); final = val;
} }
} }
return final; return final;
......
Classes/ocgcore/effect.cpp
View file @ 003c47c8
...@@ -436,15 +436,12 @@ int32 effect::is_activate_check(uint8 playerid, const tevent& e, int32 neglect_c ...@@ -436,15 +436,12 @@ int32 effect::is_activate_check(uint8 playerid, const tevent& e, int32 neglect_c
pduel->game_field->restore_lp_cost(); pduel->game_field->restore_lp_cost();
return result; return result;
} }
// check if pcard is the target of the field effect this
int32 effect::is_target(card* pcard) { int32 effect::is_target(card* pcard) {
if(type & EFFECT_TYPE_ACTIONS) if(type & EFFECT_TYPE_ACTIONS)
return FALSE; return FALSE;
if(type & (EFFECT_TYPE_SINGLE | EFFECT_TYPE_EQUIP | EFFECT_TYPE_XMATERIAL) && !(type & EFFECT_TYPE_FIELD)) if(type & (EFFECT_TYPE_SINGLE | EFFECT_TYPE_EQUIP | EFFECT_TYPE_XMATERIAL) && !(type & EFFECT_TYPE_FIELD))
return TRUE; return TRUE;
if((type & EFFECT_TYPE_TARGET) && !(type & EFFECT_TYPE_FIELD)) { if((type & EFFECT_TYPE_TARGET) && !(type & EFFECT_TYPE_FIELD)) {
if(pcard->get_status(STATUS_SUMMONING | STATUS_SUMMON_DISABLED | STATUS_ACTIVATE_DISABLED | STATUS_SPSUMMON_STEP))
return FALSE;
return is_fit_target_function(pcard); return is_fit_target_function(pcard);
} }
if(pcard && !is_flag(EFFECT_FLAG_SET_AVAILABLE) && (pcard->current.location & LOCATION_ONFIELD) if(pcard && !is_flag(EFFECT_FLAG_SET_AVAILABLE) && (pcard->current.location & LOCATION_ONFIELD)
......
Classes/ocgcore/processor.cpp
View file @ 003c47c8
...@@ -2620,6 +2620,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2620,6 +2620,7 @@ int32 field::process_battle_command(uint16 step) {
return FALSE; return FALSE;
} }
case 8: { case 8: {
core.attack_cancelable = TRUE;
pduel->write_buffer8(MSG_ATTACK); pduel->write_buffer8(MSG_ATTACK);
pduel->write_buffer32(core.attacker->get_info_location()); pduel->write_buffer32(core.attacker->get_info_location());
if(core.attack_target) { if(core.attack_target) {
...@@ -2703,6 +2704,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2703,6 +2704,7 @@ int32 field::process_battle_command(uint16 step) {
add_process(PROCESSOR_SELECT_YESNO, 0, 0, 0, infos.turn_player, 30); add_process(PROCESSOR_SELECT_YESNO, 0, 0, 0, infos.turn_player, 30);
else { else {
returns.ivalue[0] = TRUE; returns.ivalue[0] = TRUE;
core.attack_cancelable = FALSE;
} }
return FALSE; return FALSE;
} }
...@@ -2711,7 +2713,6 @@ int32 field::process_battle_command(uint16 step) { ...@@ -2711,7 +2713,6 @@ int32 field::process_battle_command(uint16 step) {
if(returns.ivalue[0]) { if(returns.ivalue[0]) {
core.units.begin()->arg1 = TRUE; core.units.begin()->arg1 = TRUE;
core.units.begin()->arg3 = FALSE; core.units.begin()->arg3 = FALSE;
core.attack_cancelable = TRUE;
core.units.begin()->step = 3; core.units.begin()->step = 3;
} }
return FALSE; return FALSE;
......
mobile/assets/data/conf/lflist.conf
View file @ 003c47c8
This diff is collapsed.
mobile/assets_en/data/conf/lflist.conf
View file @ 003c47c8
#[2019.10 TCG][2019.7 TCG][2019.04 TCG][2019.01 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1] #[2019.10 TCG][2019.7 TCG][2019.04 TCG][2019.01 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
!2020.1 TCG
#forbidden
76794549 0 --Astrograph Sorcerer
09929398 0 --Blackwing - Gofu the Vague Shadow
53804307 0 --Blaster, Dragon Ruler of Infernos
34124316 0 --Cyber Jar
15341821 0 --Dandylion
08903700 0 --Djinn Releaser of Rituals
49684352 0 --Double Iris Magician
51858306 0 --Eclipse Wyvern
55623480 0 --Fairy Tail - Snow
78706415 0 --Fiber Jar
93369354 0 --Fishborg Blaster
75732622 0 --Grinder Golem
57421866 0 --Level Eater
34206604 0 --Magical Scientist
31178212 0 --Majespecter Unicorn - Kirin
21593977 0 --Makyura the Destructor
21377582 0 --Master Peace, the True Dracoslaying King
23434538 0 --Maxx "C"
96782886 0 --Mind Master
57835716 0 --Orcust Harp Horror
07563579 0 --Performage Plushfire
17330916 0 --Performapal Monkeyboard
40318957 0 --Performapal Skullcrobat Joker
23558733 0 --Phoenixian Cluster Amaryllis
90411554 0 --Redox, Dragon Ruler of Boulders
05592689 0 --Samsara Lotus
20663556 0 --Substitoad
88071625 0 --The Tyrant Neptune
26400609 0 --Tidal, Dragon Ruler of Waterfalls
44910027 0 --Victory Dragon
03078576 0 --Yata-Garasu
17412721 0 --Elder Entity Norden
43387895 0 --Supreme King Dragon Starving Venom
15291624 0 --Thunder Dragon Colossus
05043010 0 --Firewall Dragon
59537380 0 --Guardragon Agarpain
24094258 0 --Heavymetalfoes Electrumite
39064822 0 --Knightmare Goblin
03679218 0 --Knightmare Mermaid
61665245 0 --Summon Sorceress
26692769 0 --The Phantom Knights of Rusty Bardiche
22593417 0 --Topologic Gumblar Dragon
25862681 0 --Ancient Fairy Dragon
65536818 0 --Denglong, First of the Yang Zing
94677445 0 --Ib the World Chalice Justiciar
63101919 0 --Tempest Magician
34086406 0 --Lavalval Chain
04423206 0 --M-X-Saber Invoker
54719828 0 --Number 16: Shock Master
10389142 0 --Number 42: Galaxy Tomahawk
63504681 0 --Number 86: Heroic Champion - Rhongomyniad
58820923 0 --Number 95: Galaxy-Eyes Dark Matter Dragon
34945480 0 --Outer Entity Azathot
87327776 0 --Salamangreat Miragestallio
18326736 0 --Tellarknight Ptolemaeus
81122844 0 --Wind-Up Carrier Zenmaity
85115440 0 --Zoodiac Broadbull
48905153 0 --Zoodiac Drident
07394770 0 --Brilliant Fusion
69243953 0 --Butterfly Dagger - Elma
57953380 0 --Card of Safe Return
04031928 0 --Change of Heart
67616300 0 --Chicken Game
60682203 0 --Cold Wave
17375316 0 --Confiscation
44763025 0 --Delinquent Duo
23557835 0 --Dimension Fusion
42703248 0 --Giant Trunade
79571449 0 --Graceful Charity
18144506 0 --Harpie's Feather Duster
19613556 0 --Heavy Storm
35059553 0 --Kaiser Colosseum
85602018 0 --Last Will
34906152 0 --Mass Driver
46411259 0 --Metamorphosis
41482598 0 --Mirage of Nightmare
74191942 0 --Painful Choice
55144522 0 --Pot of Greed
70828912 0 --Premature Burial
94220427 0 --Rank-Up-Magic Argent Chaos Force
63166095 0 --Sky Striker Mobilize - Engage!
45986603 0 --Snatch Steal
54447022 0 --Soul Charge
46448938 0 --Spellbook of Judgment
11110587 0 --That Grass Looks Greener
42829885 0 --The Forceful Sentry
28566710 0 --Last Turn
27174286 0 --Return from the Different Dimension
93016201 0 --Royal Oppression
57585212 0 --Self-Destruct Button
03280747 0 --Sixth Sense
35316708 0 --Time Seal
64697231 0 --Trap Dustshoot
80604091 0 --Ultimate Offering
05851097 0 --Vanity's Emptiness
#limit
07902349 1 --Left Arm of the Forbidden One
44519536 1 --Left Leg of the Forbidden One
70903634 1 --Right Arm of the Forbidden One
08124921 1 --Right Leg of the Forbidden One
42790071 1 --Altergeist Multifaker
28985331 1 --Armageddon Knight
61901281 1 --Black Dragon Collapserpent
57143342 1 --Cir, Malebranche of the Burning Abyss
69015963 1 --Cyber-Stein
70711847 1 --Danger! Nessie!
14536035 1 --Dark Grepher
58984738 1 --Dinomight Knight, the True Dracofighter
82385847 1 --Dinowrestler Pankratops
33396948 1 --Exodia the Forbidden One
64034255 1 --Genex Ally Birdman
20758643 1 --Graff, Malebranche of the Burning Abyss
99177923 1 --Infernity Archfiend
33508719 1 --Morphing Jar
16226786 1 --Night Assailant
12958919 1 --Phantom Skyblaster
88264978 1 --Red-Eyes Darkness Metal Dragon
26889158 1 --Salamangreat Gazelle
92559258 1 --Servant of Endymion
81275020 1 --Speedroid Terrortop
04474060 1 --SPYRAL GEAR - Drone
78080961 1 --SPYRAL Quik-Fix
89399912 1 --Tempest, Dragon Ruler of Storms
30539496 1 --True King Lithosagym, the Disaster
99234526 1 --White Dragon Wyverburster
78872731 1 --Zoodiac Ratpier
45222299 1 --Evigishki Gustkraken
11877465 1 --Evigishki Mind Augus
89463537 1 --Nekroz of Unicore
39512984 1 --Gem-Knight Master Diamond
48063985 1 --Ritual Beast Ulti-Cannahawk
70583986 1 --Dewloren, Tiger King of the Ice Barrier
18239909 1 --Ignister Prominence, the Blasting Dracoslayer
74586817 1 --PSY-Framelord Omega
27552504 1 --Beatrice, Lady of the Eternal
00581014 1 --Daigusto Emeral
08949584 1 --A Hero Lives
72892473 1 --Card Destruction
59750328 1 --Card of Demise
91623717 1 --Chain Strike
81674782 1 --Dimensional Fissure
15854426 1 --Divine Wind of Mist Valley
14733538 1 --Draco Face-Off
13035077 1 --Dragonic Diagram
67723438 1 --Emergency Teleport
95308449 1 --Final Countdown
81439173 1 --Foolish Burial
27970830 1 --Gateway of the Six
75500286 1 --Gold Sarcophagus
66957584 1 --Infernity Launcher
93946239 1 --Into the Void
71650854 1 --Magical Mid-Breaker Field
83764718 1 --Monster Reborn
33782437 1 --One Day of Peace
02295440 1 --One for One
22842126 1 --Pantheism of the Monarchs
67169062 1 --Pot of Avarice
12580477 1 --Raigeki
58577036 1 --Reasoning
32807846 1 --Reinforcement of the Army
52155219 1 --Salamangreat Circle
73915051 1 --Scapegoat
24940422 1 --Sekka's Light
73468603 1 --Set Rotation
52340444 1 --Sky Striker Mecha - Hornet Drones
98338152 1 --Sky Striker Mecha - Widow Anchor
24010609 1 --Sky Striker Mecha Modules - Multirole
71344451 1 --Slash Draw
54631665 1 --SPYRAL Resort
45305419 1 --Symbol of Heritage
73628505 1 --Terraforming
35371948 1 --Trickstar Light Stage
70368879 1 --Upstart Goblin
61740673 1 --Imperial Order
30241314 1 --Macro Cosmos
32723153 1 --Magical Explosion
89208725 1 --Metaverse
23002292 1 --Red Reboot
82732705 1 --Skill Drain
35125879 1 --True King's Return
17078030 1 --Wall of Revealing Light
#semi limit
43694650 2 --Danger!? Jackalope?
99745551 2 --Danger!? Tsuchinoko?
78868119 2 --Deep Sea Diva
28297833 2 --Necroface
10802915 2 --Tour Guide From the Underworld
37520316 2 --Mind Control
!2019.10 TCG !2019.10 TCG
#forbidden #forbidden
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment