Skip to content
Snippets Groups Projects
Commit 40264eef authored by kopareigns's avatar kopareigns
Browse files

Corp Asset Fix

parent af1db093
No related branches found
No related tags found
2 merge requests!2150Corp Asset Fix,!2047RA rework
Hide whitespace changes
Inline Side-by-side
src/pregmod/widgets/economyWidgets.tw
+ 11
− 5
View file @ 40264eef
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
<<link "Buy">> <<link "Buy">>
<<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>> /* Checks if _Numasset is string */ <<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>> /* Checks if _Numasset is string */
/* Buy all */ /* Buy all */
<<if State.temporary[$args[1]].toLowerCase() == "all" || "max">> <<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>> <<set State.temporary[$args[1]] = Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
Bought <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> units for <<print cashFormat(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))*500*State.variables[$args[0]+"AssetPrice"])>> Bought <<print commaNum(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500)))>> units for <<print cashFormat(Math.floor($corpCash/(State.variables[$args[0]+"AssetPrice"] * 500))*500*State.variables[$args[0]+"AssetPrice"])>>
...@@ -409,8 +409,11 @@ ...@@ -409,8 +409,11 @@
/* Error if decimal or not "all" or "max" string */ /* Error if decimal or not "all" or "max" string */
<<replace `'#'+$args[0]+'AssetsPurchasing'`>> Please input a round number. <</replace>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>> Please input a round number. <</replace>>
<</if>> <</if>>
/* Negative number, try again */
<<elseif Number.parseFloat(eval(parse('_Num' + $args[0]))) < 0>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>Please input a positive number.<</replace>>
/* Buy % */ /* Buy % */
<<elseif State.temporary[$args[1]].toString().includes("%")>> <<elseif State.temporary[$args[1]].toString().includes("%")>>
<<set _DesPerc = State.temporary[$args[1]]>> <<set _DesPerc = State.temporary[$args[1]]>>
<<set State.temporary[$args[1]] = Math.floor((Math.clamp((Number.parseFloat(State.temporary[$args[1]])/100),0,1)*$corpCash)/(State.variables[$args[0]+"AssetPrice"] * 500))>> <<set State.temporary[$args[1]] = Math.floor((Math.clamp((Number.parseFloat(State.temporary[$args[1]])/100),0,1)*$corpCash)/(State.variables[$args[0]+"AssetPrice"] * 500))>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
...@@ -445,13 +448,13 @@ ...@@ -445,13 +448,13 @@
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>> <<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Unsuccessful buy */ /* Unsuccessful buy */
<<else>> <<else>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>There are insufficient funds for additional purchases.<</replace>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>>There are insufficient funds for additional purchases.<</replace>>
<</if>> <</if>>
<</link>> <</link>>
| <<link "Sell">> | <<link "Sell">>
<<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>> <<if !Number.isInteger(Number.parseFloat(eval(parse('_Num' + $args[0]))))>>
/* Sell all */ /* Sell all */
<<if State.temporary[$args[1]].toLowerCase() == "all" || "max">> <<if ["all", "max"].includes(State.temporary[$args[1]].toLowerCase())>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>>
Sold <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> units for <<print cashFormat(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)*500*State.variables[$args[0]+"AssetPrice"])>> Sold <<print commaNum(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500))>> units for <<print cashFormat(Math.ceil((State.variables[$args[0]+"Assets"]-500)/500)*500*State.variables[$args[0]+"AssetPrice"])>>
<</replace>> <</replace>>
...@@ -469,6 +472,9 @@ ...@@ -469,6 +472,9 @@
<<else>> <<else>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>> Please input a round number. <</replace>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>> Please input a round number. <</replace>>
<</if>> <</if>>
/* Negative number, try again */
<<elseif Number.parseFloat(eval(parse('_Num' + $args[0]))) < 0>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>Please input a positive number.<</replace>>
/* Sell % */ /* Sell % */
<<elseif State.temporary[$args[1]].toString().includes("%")>> <<elseif State.temporary[$args[1]].toString().includes("%")>>
<<set _DesPerc = State.temporary[$args[1]]>> <<set _DesPerc = State.temporary[$args[1]]>>
...@@ -505,7 +511,7 @@ ...@@ -505,7 +511,7 @@
<<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>> <<replace `'#'+'controls'+$args[0]`>><<CorpDevBuySell $args[0] $args[1]>><</replace>><<script>>setReplaceTextboxMaxLength(State.temporary["textboxMLArg"], 10);<</script>>
/* Unsuccessful sell */ /* Unsuccessful sell */
<<else>> <<else>>
<<replace `'#'+$args[0]+'AssetsPurchasing'`>>The corp cannot sell any more $args[0] assets.<</replace>> <<replace `'#'+$args[0]+'AssetsPurchasing'`>>The corp cannot sell any more $args[0] assets.<</replace>>
<</if>> <</if>>
<</link>> <</link>>
<</widget>> <</widget>>
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