Skip to content

Commit

Permalink
update tl and amiya
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aceship
Aceship committed May 1, 2024
1 parent 608dc7a commit 1a10327
Show file tree
Hide file tree
Showing 4 changed files with 661 additions and 17 deletions.
41 changes: 33 additions & 8 deletions js/chara-detail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
var opapp;
var classfilter;
var sort;
var opSType;
var opSType = 0;
var skeletonType = "skel"
var chibitype = 'character'
var charName = 'char_180_amgoat';
Expand Down Expand Up @@ -1310,7 +1310,6 @@
var opdata = query(db.chars2,"name_cn",opname);
var opclass = query(db.classes,"type_cn",opdata.type);
var opdata2 = query(db.chars,"name",opdata.name_cn,true,true);
var opdata3 = db.charpatch.patchChars.char_1001_amiya2
curropname = opname
var opcode2 = ""
// console.log(opdata3)
Expand Down Expand Up @@ -1371,11 +1370,18 @@

if(opKey=="char_002_amiya"){
$('#class-change').show();
if(opSType){
if(opSType == 1){
opcode = "char_1001_amiya2"
opcode2 = "char_002_amiya"
opKey=opcode
opdataFull = opdata3
opdataFull = db.charpatch.patchChars.char_1001_amiya2
opdataFull.id = opcode
}
if(opSType == 2){
opcode = "char_1037_amiya3"
opcode2 = "char_002_amiya"
opKey=opcode
opdataFull = db.charpatch.patchChars.char_1037_amiya3
opdataFull.id = opcode
}
}else{
Expand Down Expand Up @@ -1559,7 +1565,21 @@
+"</div>"));
}
}

if(opKey=="char_1037_amiya3"){
zoombtn.push($(`<button class="btn ak-c-black btn-dark" style="margin:2px;padding:2px; height: 50px; width: 50px;" onclick="ChangeZoomChara('char_1037_amiya3_2')"><img src='https://raw.githubusercontent.com/Aceship/Arknight-Images/main/ui/elite/${i}-s.png'></button>`))
if(i == 0){
$("#charazoom").attr("src","https://raw.githubusercontent.com/Aceship/Arknight-Images/main/characters/char_1037_amiya3.png");
$('#charazoom').modal('handleUpdate')

tabcontent.push($("<div class='tab-pane container active' id='opCG_0_tab'>"
+"<img class='chara-image' src='https://raw.githubusercontent.com/Aceship/Arknight-Images/main/characters/char_1037_amiya3.png'>"
+"</div>"));
} else {
tabcontent.push($("<div class='tab-pane container' id='opCG_"+i+"_tab'>"
+"<img class='chara-image' src='https://raw.githubusercontent.com/Aceship/Arknight-Images/main/characters/char_1037_amiya3.png'>"
+"</div>"));
}
}

var elitehtml = getEliteHTML(i,opdataFull);
tabcontent2.push(elitehtml);
Expand Down Expand Up @@ -1741,7 +1761,7 @@

//Story

if(db.handbookInfo.handbookDict[opdataFull.id]|| opdataFull.id == "char_1001_amiya2"){
if(db.handbookInfo.handbookDict[opdataFull.id]|| opdataFull.id == "char_1001_amiya2" || opdataFull.id == "char_1037_amiya3" ){
GetStory(opdataFull)
}else{
$('#info-illustrator').html("")
Expand Down Expand Up @@ -3256,9 +3276,10 @@
currStory = db.handbookInfoEN.handbookDict[opdataFull.id]
isEN = true
}
if(opdataFull.id=="char_1001_amiya2"){
if(opdataFull.id=="char_1001_amiya2" || opdataFull.id=="char_1037_amiya3"){
currStory = db.handbookInfoEN.handbookDict["char_002_amiya"]?db.handbookInfoEN.handbookDict["char_002_amiya"]:db.handbookInfo.handbookDict["char_002_amiya"]
}

// console.log(currStory)
// console.log(currStory.drawName)
// console.log(db.vaTL[currStory.infoName]?db.vaTL[currStory.infoName]:currStory.infoName)
Expand Down Expand Up @@ -5664,7 +5685,11 @@
}

function ChangeSType(){
opSType= !opSType
opSType+=1

if(opSType >=3){
opSType = 0
}
selectOperator(curropname)
console.log(opSType)
}
Expand Down
94 changes: 92 additions & 2 deletions json/ace/riic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
"desc": "When stationed at the Command Center, order acquisition efficiency of all Trade Stations +7% (Only highest effect becomes active)",
"descformat": "When stationed at the Command Center, order acquisition efficiency of all Trade Stations <@cc.vup>+7%</> (Only highest effect becomes active)"
},
"control_tra_spd[030]": {
"name": "Intelligence Mastermind",
"desc": "When stationed at the Command Center, order acquisition efficiency of all Trade Stations +7% (Only highest effect becomes active)",
"descformat": "When stationed at the Command Center, order acquisition efficiency of all Trade Stations <@cc.vup>+7%</> (Only highest effect becomes active)"
},
"control_tra_limit&spd[000]": {
"name": "Precise Calculations",
"desc": "When stationed at the Command Center, every operator from Karlan Trading stationed in a Trade Station gains order acquisition efficiency -15% and order limit +6",
Expand All @@ -61,8 +66,23 @@
},
"control_upMeetingSpeed[000]": {
"name": "Worldly Insight",
"desc": "When stationed at the Command Center, clue collection speed +25%",
"descformat": "When stationed at the Command Center, clue collection speed <@cc.vup>+25%</>"
"desc": "When stationed at the Command Center, clue collection speed +25% (Only highest effect becomes active)",
"descformat": "When stationed at the Command Center, clue collection speed <@cc.vup>+25%</> (Only highest effect becomes active)"
},
"control_upMeetingSpeed[100]": {
"name": "Convergence of Expectations",
"desc": "When stationed at the Command Center, clue collection speed +15% (Only highest effect becomes active)",
"descformat": "When stationed at the Command Center, clue collection speed <@cc.vup>+15%</> (Only highest effect becomes active)"
},
"control_meeting&ord[000]": {
"name": "Accomplice·α",
"desc": "When stationed at the Command Center, if Ines is stationed at Reception, increase clue collection speed by +5%; if Hoederer is stationed at a Trade Stations, increase the order limit of the Trade Station Hoederer is in by +1",
"descformat": "When stationed at the Command Center, if <@cc.kw>Ines</> is stationed at Reception, increase clue collection speed by <@cc.vup>+5%</>; if <@cc.kw>Hoederer</> is stationed at a Trade Stations, increase the order limit of the Trade Station Hoederer is in by <@cc.vup>+1</>"
},
"control_meeting&ord[001]": {
"name": "Accomplice·β",
"desc": "When stationed at the Command Center, if Ines is stationed at Reception, increase clue collection speed by +5%; if Hoederer is stationed at a Trade Stations, increase the order limit of the Trade Station Hoederer is in by +2",
"descformat": "When stationed at the Command Center, if <@cc.kw>Ines</> is stationed at Reception, increase clue collection speed by <@cc.vup>+5%</>; if <@cc.kw>Hoederer</> is stationed at a Trade Stations, increase the order limit of the Trade Station Hoederer is in by <@cc.vup>+2</>"
},
"control_clue_cost[000]": {
"name": "Neurotic",
Expand Down Expand Up @@ -144,6 +164,16 @@
"desc": "When stationed at the Command Center, mood recovery per hour of all operators in the Command Center +0.05",
"descformat": "When stationed at the Command Center, mood recovery per hour of all operators in the Command Center <@cc.vup>+0.05</>"
},
"control_mp_cost_double[000]": {
"name": "Sarkaz King's Inheritance",
"desc": "When stationed at the Command Center with Amiya, mood recovery per hour of self and Amiya +0.05",
"descformat": "When stationed at the Command Center with <@cc.kw>Amiya</>, mood recovery per hour of self and <@cc.kw>Amiya</> <@cc.vup>+0.05</>"
},
"control_mp_cost_double[001]": {
"name": "“Unfinished Story”",
"desc": "When stationed at the Command Center with Amiya, mood recovery per hour of self and Amiya +0.1",
"descformat": "When stationed at the Command Center with <@cc.kw>Amiya</>, mood recovery per hour of self and <@cc.kw>Amiya</> <@cc.vup>+0.1</>"
},
"control_allCost_condChar[000]": {
"name": "Moment of Respite",
"desc": "When stationed together with Aak at the Command Center, mood recovery per hour of all operators in the Command Center +0.25",
Expand Down Expand Up @@ -204,6 +234,11 @@
"desc": "When stationed at the Command Center, mood recovery per hour of operators working in other facilities +0.05. Additionally, further increase mood recovery per hour by +0.05 for every 20 Worldly Plight (has Special Comparison Rules with Command Center effect)",
"descformat": "When stationed at the Command Center, mood recovery per hour of operators working in <$cc.c.room2><@cc.kw>other facilities</></> <@cc.vup>+0.05</>. Additionally, further increase mood recovery per hour by <@cc.vup>+0.05</> for every <@cc.vup>20</> <$cc.bd_b1><@cc.rem>Worldly Plight</></> (has <$cc.c.sui2_1><@cc.rem>Special Comparison Rules</></> with Command Center effect)"
},
"control_mp_expand_double[000]": {
"name": "Flag of Babel",
"desc": "When stationed at the Command Center, mood recovery per hour of operators working in other facilities +0.1. If Civilight Eterna is stationed at the Command Center, mood recovery increases by another +0.1 (has Special Comparison Rules with Command Center effect)",
"descformat": "When stationed at the Command Center, mood recovery per hour of operators working in <$cc.c.room2><@cc.kw>other facilities</></> <@cc.vup>+0.1</>. If <@cc.kw>Civilight Eterna</> is stationed at the Command Center, mood recovery increases by another <@cc.vup>+0.1</> (has <$cc.c.sui2_1><@cc.rem>Special Comparison Rules</></> with Command Center effect)"
},
"control_mp_cost&bd2[010]": {
"name": "Stamina Recovery",
"desc": "When stationed at the Command Center, self mood reduction per hour +0.5, Silvervine +8",
Expand Down Expand Up @@ -269,6 +304,11 @@
"desc": "When stationed at the Command Center, mood recovery per hour of all operators in all Dorms +0.05 (Only highest effect becomes active)",
"descformat": "When stationed at the Command Center, mood recovery per hour of all operators in all Dorms <@cc.vup>+0.05</> (Only highest effect becomes active)"
},
"control_train_spd[010]": {
"name": "S.W.E.E.P. Director",
"desc": "When stationed at the Command Center and there is an operator being trained in the Training Station, increase the skill training speed by +5% (Only highest effect becomes active)",
"descformat": "When stationed at the Command Center and there is an operator being trained in the Training Station, increase the skill training speed by <@cc.vup>+5%</> (Only highest effect becomes active)"
},
"control_tra_limit&spd[010]": {
"name": "Operations Expert",
"desc": "When stationed at the Command Center, for every 1 Glasgow Group operator stationed in the same Trade Station, order acquisition efficiency +10%",
Expand Down Expand Up @@ -359,6 +399,11 @@
"desc": "When stationed at a Power Station, drone recovery +15%",
"descformat": "When stationed at a Power Station, drone recovery <@cc.vup>+15%</>"
},
"power_rec_spd[004]": {
"name": "Elegy Recharging·α",
"desc": "When stationed at a Power Station, drone recovery +10%",
"descformat": "When stationed at a Power Station, drone recovery <@cc.vup>+10%</>"
},
"power_rec_drone[000]": {
"name": "Patrol Framework",
"desc": "When stationed at a Power Station, drone recovery +1% for every 10 drone max limit",
Expand All @@ -379,6 +424,11 @@
"desc": "When stationed at a Power Station and Kal'tsit is stationed in the Command Center, drone recovery +5%",
"descformat": "When stationed at a Power Station and <@cc.kw>Kal'tsit</> is stationed in the Command Center, drone recovery <@cc.vup>+5%</>"
},
"power_rec_spd_P[001]": {
"name": "Incantation Resonance",
"desc": "When stationed at a Power Station and Logos is stationed in the Training Station, drone recovery +5%",
"descformat": "When stationed at a Power Station and <@cc.kw>Logos</> is stationed in the Training Station, drone recovery <@cc.vup>+5%</>"
},
"power_rec_rhine[000]": {
"name": "Ecology Section Director",
"desc": "When stationed at a Power Station, drone recovery +10%. Additionally, gain +3% drone recovery for every Rhine Labs operator stationed in the base except self (excluding Assistants), up to 5",
Expand Down Expand Up @@ -419,6 +469,11 @@
"desc": "When stationed at a Craft Station, production +15%",
"descformat": "When stationed at a Craft Station, production <@cc.vup>+15%</>"
},
"manu_prod_spd[1000]": {
"name": "Standardization·α",
"desc": "When stationed at a Craft Station, production +15%",
"descformat": "When stationed at a Craft Station, production <@cc.vup>+15%</>"
},
"manu_prod_spd[010]": {
"name": "Standardization·β",
"desc": "When stationed at a Craft Station, production +25%",
Expand Down Expand Up @@ -504,6 +559,11 @@
"desc": "When stationed at a Craft Station, production +15% for the first hour. Thereafter, increase by +2% every hour, capping at +25%",
"descformat": "When stationed at a Craft Station, production <@cc.vup>+15%</> for the first hour. Thereafter, increase by <@cc.vup>+2%</> every hour, capping at <@cc.vup>+25%</>"
},
"manu_prod_spd_addition[100]": {
"name": "Routine Cleaning",
"desc": "When stationed at a Craft Station, production +2% every hour, capping at +20%",
"descformat": "When stationed at a Craft Station, production <@cc.vup>+2%</> every hour, capping at <@cc.vup>+20%</>"
},
"manu_prod_spd_reduce[000]": {
"name": "Blurry Vision",
"desc": "When stationed at a Craft Station, production +30%. For every 4 Mood Difference, production -5%",
Expand All @@ -524,6 +584,11 @@
"desc": "When stationed at a Craft Station, storage capacity +10 and production +10%",
"descformat": "When stationed at a Craft Station, storage capacity <@cc.vup>+10</> and production <@cc.vup>+10%</>"
},
"manu_prod_spd&fraction[000]": {
"name": "Reunion Time",
"desc": "When stationed at a Craft Station, for every operator from Team A1, production +10%",
"descformat": "When stationed at a Craft Station, for every operator from <$cc.g.A1><@cc.kw>Team A1</></>, production <@cc.vup>+10%</>"
},
"manu_prod_spd&limit&bd[000]": {
"name": "Reliable Followers",
"desc": "When stationed at a Craft Station, storage capacity +8 and production +5%. Additionally, production +1% for every 1 Silvervine",
Expand Down Expand Up @@ -724,6 +789,11 @@
"desc": "When stationed at a Craft Station, increase production of precious metals by +25% and mood reduction per hour +0.25",
"descformat": "When stationed at a Craft Station, increase production of <@cc.kw>precious metals</> by <@cc.vup>+25%</> and mood reduction per hour <@cc.vdown>+0.25</>"
},
"manu_formula_spd&cost[001]": {
"name": "Clean Fragrance",
"desc": "When stationed at a Craft Station, increase production of precious metals by +25% and mood reduction per hour +0.25",
"descformat": "When stationed at a Craft Station, increase production of <@cc.kw>precious metals</> by <@cc.vup>+25%</> and mood reduction per hour <@cc.vdown>+0.25</>"
},
"manu_formula_spd&cost_bd[000]": {
"name": "Take the Lead",
"desc": "When stationed at a Craft Station, increase production of precious metals by +2% and mood reduction per hour -0.15 for every Blacksteel operator stationed in the base (excluding Assistants), up to 3",
Expand Down Expand Up @@ -1309,6 +1379,11 @@
"desc": "When stationed at the Synthesis Station and producing elite materials, increase the rate of by-products by 70%",
"descformat": "When stationed at the Synthesis Station and producing <@cc.kw>elite materials</>, increase the rate of by-products by <@cc.vup>70%</>"
},
"workshop_formula_probability[101]": {
"name": "High Efficiency Recycling",
"desc": "When stationed at the Synthesis Station and producing elite materials, increase the rate of by-products by 70%",
"descformat": "When stationed at the Synthesis Station and producing <@cc.kw>elite materials</>, increase the rate of by-products by <@cc.vup>70%</>"
},
"workshop_formula_probability[115]": {
"name": "Mandatory Courses",
"desc": "When stationed at the Synthesis Station and producing elite materials, increase the rate of by-products by 75%",
Expand Down Expand Up @@ -1554,6 +1629,11 @@
"desc": "When stationed at the Training Station, increase the skill training speed of Caster and Medic operators by +30%",
"descformat": "When stationed at the Training Station, increase the skill training speed of <@cc.kw>Caster</> and <@cc.kw>Medic</> operators by <@cc.vup>+30%</>"
},
"train_spd_doubleProf[200]": {
"name": "Banshee's Power",
"desc": "When stationed at the Training Station, increase the skill training speed of Caster and Supporter operators by +30%",
"descformat": "When stationed at the Training Station, increase the skill training speed of <@cc.kw>Caster</> and <@cc.kw>Supporter</> operators by <@cc.vup>+30%</>"
},
"train_spd_doubleProf[110]": {
"name": "Red Dragon's Blood",
"desc": "When stationed at the Training Station, increase the skill training speed of Caster and Medic operators by +45%",
Expand All @@ -1574,6 +1654,11 @@
"desc": "When stationed at the Training Station and after assisting an operator in training for 5 hours in a single session, reduce the training time required for that operator's next training by 50% (effect disappears if either operator leaves the Training Station)",
"descformat": "When stationed at the Training Station and after assisting an operator in training for <@cc.vup>5</> hours in a single session, reduce the training time required for that operator's next training by <@cc.vup>50%</> (effect disappears if either operator leaves the Training Station)"
},
"train_spd_reduceTime[001]": {
"name": "Meaning of Words",
"desc": "When stationed at the Training Station and after assisting an operator in training for 5 hours in a single session, reduce the training time required for that operator's next training by 50% (effect disappears if either operator leaves the Training Station)",
"descformat": "When stationed at the Training Station and after assisting an operator in training for <@cc.vup>5</> hours in a single session, reduce the training time required for that operator's next training by <@cc.vup>50%</> (effect disappears if either operator leaves the Training Station)"
},
"train_spd_bd&reduceTime[000]": {
"name": "Thinking Before Action",
"desc": "When stationed at the Training Station, accumulate a certain amount of Bushido points whenever a Mastery training is completed. When the maximum number of Bushido points is accumulated, the next training for a Guard operator to Mastery 1 will be completed instantly and consume all Bushido points",
Expand Down Expand Up @@ -2603,5 +2688,10 @@
"name": "Philology Advisor",
"desc": "When stationed at Reception and only self is working, the next clue obtained after continuously spending 16 mood is guaranteed to be a Rhine Labs clue",
"descformat": "When stationed at Reception and only self is working, the next clue obtained after continuously spending <@cc.kw>16</> mood is <@cc.kw>guaranteed</> to be a <@cc.kw>Rhine Labs</> clue"
},
"meet_spd&condChar_mustget[100]": {
"name": "Hidden Clue",
"desc": "When stationed at Reception and only self is working, the next clue obtained after continuously spending 16 mood is guaranteed to be a Rhodes Island clue",
"descformat": "When stationed at Reception and only self is working, the next clue obtained after continuously spending <@cc.kw>16</> mood is <@cc.kw>guaranteed</> to be a <@cc.kw>Rhodes Island</> clue"
}
}
Loading

0 comments on commit 1a10327

Please sign in to comment.