devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

leader->leadership, power->strength

Browse Source
This commit is contained in:
Hide_D
2019-10-04 18:07:42 +09:00
parent 71254e86f4
commit 843f469914
101 changed files with 770 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/js/battle_simulator.js
+6 -6
View File
@@ -156,9 +156,9 @@ jQuery(function($){
setVal('.form_exp_level', data.explevel);
setVal('.form_injury', data.injury);
setVal('.form_leadership', data.leader);
setVal('.form_leadership', data.leadership);
setVal('.form_general_horse', data.horse);
setVal('.form_power', data.power);
setVal('.form_strength', data.strength);
setVal('.form_general_weap', data.weap);
setVal('.form_intel', data.intel);
setVal('.form_general_book', data.book);
@@ -203,9 +203,9 @@ jQuery(function($){
level:getInt('.form_general_level'),
explevel:getInt('.form_exp_level'),
leader:getInt('.form_leadership'),
leadership:getInt('.form_leadership'),
horse:getInt('.form_general_horse'),
power:getInt('.form_power'),
strength:getInt('.form_strength'),
weap:getInt('.form_general_weap'),
intel:getInt('.form_intel'),
book:getInt('.form_general_book'),
@@ -365,8 +365,8 @@ jQuery(function($){
city: (generalData.no)<=1 ? 1 : 3,
turntime:'2018-08-26 12:00',
special:defaultSpecialDomestic,
leader2:0,
power2:0,
leadership2:0,
strength2:0,
intel2:0,
gold:10000,
hwe/js/ext.kingdoms.js
+1 -1
View File
@@ -77,7 +77,7 @@ $(function(){
장수.국가 = 국가;
장수.벌점 = parseInt($tds.eq(-1).text());
장수.통 = parseInt($this.data('general-leadership'));
장수.무 = parseInt($this.data('general-power'));
장수.무 = parseInt($this.data('general-strength'));
장수.지 = parseInt($this.data('general-intel'));
장수.삭턴 = parseInt($tds.eq(-2).text());
장수.종류 = getUserType(장수.통, 장수.무, 장수.지);
hwe/js/join.js
+68 -68
View File
@@ -1,148 +1,148 @@
jQuery(function($){
var $leader = $('#leader');
var $power = $('#power');
var $leadership = $('#leadership');
var $strength = $('#strength');
var $intel = $('#intel');
function abilityRand(){
var leader = Math.random()*65 + 10;
var power = Math.random()*65 + 10;
var leadership = Math.random()*65 + 10;
var strength = Math.random()*65 + 10;
var intel = Math.random()*65 + 10;
var rate = leader + power + intel;
var rate = leadership + strength + intel;
leader = Math.floor(leader / rate * defaultStatTotal);
power = Math.floor(power / rate * defaultStatTotal);
leadership = Math.floor(leadership / rate * defaultStatTotal);
strength = Math.floor(strength / rate * defaultStatTotal);
intel = Math.floor(intel / rate * defaultStatTotal);
while(leader+power+intel < defaultStatTotal){
leader+=1;
while(leadership+strength+intel < defaultStatTotal){
leadership+=1;
}
if(leader > defaultStatMax || power > defaultStatMax || intel > defaultStatMax || leader < defaultStatMin || power < defaultStatMin || intel < defaultStatMin){
if(leadership > defaultStatMax || strength > defaultStatMax || intel > defaultStatMax || leadership < defaultStatMin || strength < defaultStatMin || intel < defaultStatMin){
return abilityRand();
}
$leader.val(leader);
$power.val(power);
$leadership.val(leadership);
$strength.val(strength);
$intel.val(intel);
}
function abilityLeadpow(){
var leader = Math.random() * 6;
var power = Math.random() * 6;
var leadership = Math.random() * 6;
var strength = Math.random() * 6;
var intel = Math.random() * 1;
var rate = leader + power + intel;
var rate = leadership + strength + intel;
leader = Math.floor(leader / rate * defaultStatTotal);
power = Math.floor(power / rate * defaultStatTotal);
leadership = Math.floor(leadership / rate * defaultStatTotal);
strength = Math.floor(strength / rate * defaultStatTotal);
intel = Math.floor(intel / rate * defaultStatTotal);
while(leader+power+intel < defaultStatTotal){
power+=1;
while(leadership+strength+intel < defaultStatTotal){
strength+=1;
}
if(intel < defaultStatMin){
leader -= defaultStatMin - intel;
leadership -= defaultStatMin - intel;
intel = defaultStatMin;
}
if(leader > defaultStatMax){
power += leader - defaultStatMax;
leader = defaultStatMax;
if(leadership > defaultStatMax){
strength += leadership - defaultStatMax;
leadership = defaultStatMax;
}
if(power > defaultStatMax){
leader += power - defaultStatMax;
power = defaultStatMax;
if(strength > defaultStatMax){
leadership += strength - defaultStatMax;
strength = defaultStatMax;
}
if(leader > defaultStatMax){
intel += leader - defaultStatMax;
leader = defaultStatMax;
if(leadership > defaultStatMax){
intel += leadership - defaultStatMax;
leadership = defaultStatMax;
}
$leader.val(leader);
$power.val(power);
$leadership.val(leadership);
$strength.val(strength);
$intel.val(intel);
}
function abilityLeadint(){
var leader = Math.random() * 6;
var power = Math.random() * 1;
var leadership = Math.random() * 6;
var strength = Math.random() * 1;
var intel = Math.random() * 6;
var rate = leader + power + intel;
var rate = leadership + strength + intel;
leader = Math.floor(leader / rate * defaultStatTotal);
power = Math.floor(power / rate * defaultStatTotal);
leadership = Math.floor(leadership / rate * defaultStatTotal);
strength = Math.floor(strength / rate * defaultStatTotal);
intel = Math.floor(intel / rate * defaultStatTotal);
while(leader+power+intel < defaultStatTotal){
while(leadership+strength+intel < defaultStatTotal){
intel+=1;
}
if(power < defaultStatMin){
leader -= defaultStatMin - power;
power = defaultStatMin;
if(strength < defaultStatMin){
leadership -= defaultStatMin - strength;
strength = defaultStatMin;
}
if(leader > defaultStatMax){
intel += leader - defaultStatMax;
leader = defaultStatMax;
if(leadership > defaultStatMax){
intel += leadership - defaultStatMax;
leadership = defaultStatMax;
}
if(intel > defaultStatMax){
leader += intel - defaultStatMax;
leadership += intel - defaultStatMax;
intel = defaultStatMax;
}
if(leader > defaultStatMax){
power += leader - defaultStatMax;
leader = defaultStatMax;
if(leadership > defaultStatMax){
strength += leadership - defaultStatMax;
leadership = defaultStatMax;
}
$leader.val(leader);
$power.val(power);
$leadership.val(leadership);
$strength.val(strength);
$intel.val(intel);
}
function abilityPowint(){
var leader = Math.random() * 1;
var power = Math.random() * 6;
var leadership = Math.random() * 1;
var strength = Math.random() * 6;
var intel = Math.random() * 6;
var rate = leader + power + intel;
var rate = leadership + strength + intel;
leader = Math.floor(leader / rate * defaultStatTotal);
power = Math.floor(power / rate * defaultStatTotal);
leadership = Math.floor(leadership / rate * defaultStatTotal);
strength = Math.floor(strength / rate * defaultStatTotal);
intel = Math.floor(intel / rate * defaultStatTotal);
while(leader+power+intel < defaultStatTotal){
while(leadership+strength+intel < defaultStatTotal){
intel+=1;
}
if(leader < defaultStatMin){
power -= defaultStatMin - leader;
leader = defaultStatMin;
if(leadership < defaultStatMin){
strength -= defaultStatMin - leadership;
leadership = defaultStatMin;
}
if(power > defaultStatMax){
intel += power - defaultStatMax;
power = defaultStatMax;
if(strength > defaultStatMax){
intel += strength - defaultStatMax;
strength = defaultStatMax;
}
if(intel > defaultStatMax){
power += intel - defaultStatMax;
strength += intel - defaultStatMax;
intel = defaultStatMax;
}
if(power > defaultStatMax){
leader += power - defaultStatMax;
power = defaultStatMax;
if(strength > defaultStatMax){
leadership += strength - defaultStatMax;
strength = defaultStatMax;
}
$leader.val(leader);
$power.val(power);
$leadership.val(leadership);
$strength.val(strength);
$intel.val(intel);
}
@@ -182,7 +182,7 @@ jQuery(function($){
alert('장수 이름이 너무 깁니다!');
return false;
}
var currentStatTotal = parseInt($leader.val()) + parseInt($power.val()) + parseInt($intel.val());
var currentStatTotal = parseInt($leadership.val()) + parseInt($strength.val()) + parseInt($intel.val());
if(currentStatTotal < defaultStatTotal){
if(!confirm('현재 능력치 총합은 {0}으로, {1}보다 낮습니다. 장수 생성을 진행할까요?'.format(currentStatTotal, defaultStatTotal))){
return false;
hwe/js/select_npc.js
+10 -10
View File
@@ -2,7 +2,7 @@ var templateGeneralCard =
'<div class="general_card">\
<h4 class="bg1 with_border"><%name%></h4>\
<h4><img src="<%iconPath%>" height=64 width=64></h4>\
<p><%leader%> / <%power%> / <%intel%><br>\
<p><%leadership%> / <%strength%> / <%intel%><br>\
<%nation%><br>\
<%personalText%><br>\
<%specialText%> / <%special2Text%></p>\
@@ -31,8 +31,8 @@ var templateGeneralRow =
<td><%dedication%></td>\
<td><%level%></td>\
<td><%total%></td>\
<td><%leader%></td>\
<td><%power%></td>\
<td><%leadership%></td>\
<td><%strength%></td>\
<td><%intel%></td>\
<td><%killturn%></td>\
</tr>';
@@ -111,8 +111,8 @@ function printGenerals(value){
});
pick.sort(function(lhs, rhs){
var lsum = lhs.leader+lhs.power+lhs.intel;
var rsum = rhs.leader+rhs.power+rhs.intel;
var lsum = lhs.leadership+lhs.strength+lhs.intel;
var rsum = rhs.leadership+rhs.strength+rhs.intel;
return lsum - rsum;
});
@@ -181,9 +181,9 @@ function printGeneralList(value){
name:general[9],
name2:general[10],
injury:general[11],
leader:general[12],
leadership:general[12],
lbonus:general[13],
power:general[14],
strength:general[14],
intel:general[15],
explevel:general[16],
experience:general[17],
@@ -222,7 +222,7 @@ function printGeneralList(value){
}
general.total = general.leader + general.power + general.intel;
general.total = general.leadership + general.strength + general.intel;
general.iconPath = getIconPath(general.imgsvr, general.picture);
general.specialDomesticWithTooltip = TemplateEngine(templateSpecial, {
@@ -253,8 +253,8 @@ function printGeneralList(value){
if(lhs.total != rhs.total){
return rhs.total - lhs.total;
}
if(lhs.leader != rhs.leader){
return rhs.leader - lhs.total;
if(lhs.leadership != rhs.leadership){
return rhs.leadership - lhs.total;
}
if(lhs.name < rhs.name){