summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ryan_calculator.py8
-rw-r--r--server/sketch/.gitkeep0
-rw-r--r--server/table/exptableTMWMLsaulc.conf4
-rw-r--r--todo.md33
4 files changed, 23 insertions, 22 deletions
diff --git a/ryan_calculator.py b/ryan_calculator.py
index 6650d77..2dfd7cf 100644
--- a/ryan_calculator.py
+++ b/ryan_calculator.py
@@ -2,12 +2,14 @@ q=s=0
while (q < 100):
if (q < 25):
m=(q**2)+18
- elif (q < 50):
+ elif (q < 40):
m=625+18*(q-24)
+ elif (q < 50):
+ m=895+10*(q-39)
elif (q < 75):
- m=1092+q*2
+ m=1092+q*1
else:
- m=1092+q*3
+ m=1092+q*2
q+=1
s+=m
diff --git a/server/sketch/.gitkeep b/server/sketch/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/server/sketch/.gitkeep
+++ /dev/null
diff --git a/server/table/exptableTMWMLsaulc.conf b/server/table/exptableTMWMLsaulc.conf
index 3cf1035..187c316 100644
--- a/server/table/exptableTMWMLsaulc.conf
+++ b/server/table/exptableTMWMLsaulc.conf
@@ -10,8 +10,8 @@
2708132,2978946,3276840,3604530,3964987,4361495,4797656,5277432,5805175,
]
- 6368277,
- 6966895,7600882,8269760,8972690,9708450,10475418,11271550,12094373,12940979,13817083,
+
+ 13817083,
14720720,15649598,16601093,17572257,18559818,19560192,20569498,21583575,22598003,23627229,
24668953,25720714,26779893,27843724,28909303,29973599,31033466,32085656,33126835,34171987,
35219358,36267134,37313441,38356352,39393891,40424041,41444748,42453928,43449472,44442293,
diff --git a/todo.md b/todo.md
index 06df312..3f765b7 100644
--- a/todo.md
+++ b/todo.md
@@ -4,7 +4,7 @@
## Urgent Requests
* [x] tmw2.itch.io : Mark “powered by Hercules and ManaPlus” on download list
-* [ ] Ched Reward Logic Rewrite
+* [x] Ched Reward Logic Rewrite
* [ ] Make PF_HPCONVERSION a Mana Skill if needed, but add it.
* [x] Transmutation/Transmigration Interface
* [x] Snake Skin Subsystem (D)
@@ -54,7 +54,7 @@
* [ ] Max dungeon attempts: Guild Level?
* [ ] Badge Reward based on Guild Level? (1 badge/level)?
* [ ] Ancient Blueprints on Ancient Desert (blame @Saulc with all your mighty)
-* [ ] Main Story 6 and 7
+* [x] Main Story 6 and 7
* [x] LoF Townhall
* [ ] Lalica Arch
* [ ] The Temple
@@ -63,7 +63,7 @@
* [ ] Misc. Scripts
* [ ] Airship Graphics (Bottom area, unless it is Tiled building)
* [ ] Airship Landing Area
- * [ ] Fortress Island
+ * [x] Fortress Island
* [ ] Intro Cutscene
* [ ] Ancient Legacy (PS Ultimate)
* [ ] Random Treasure and Abandoned Houses
@@ -81,20 +81,22 @@
* [x] Magic Council Redesign
* [ ] Imperial PVP Arena
* Near Frostia, to elect the PVP King, see #admin
+* [ ] Mercenary Evolution
+ * Convert 1* cards in 2* cards, etc.
* [ ] Fishing v2: Open Seas
* [ ] Rowboat
* [ ] Mechanics
* [ ] NPC to allow it
-* [ ] Public Lightining System
- * [ ] Add 'town light' NPCs
- * [ ] Enable/Disable them along day/night announces
- * [ ] Candor
- * [ ] Tulimshar
+* [x] Public Lightining System
+ * [x] Add 'town light' NPCs
+ * [x] Enable/Disable them along day/night announces
+ * [x] Candor
+ * [x] Tulimshar
* [ ] Halinarzo
- * [ ] Hurnscald
+ * [x] Hurnscald
* [ ] LoF Village
* [ ] Lilit Island
- * [ ] Nivalis
+ * [x] Nivalis
* [ ] Frostia
* [ ] World's Edge Village
* [x] Mercenary System Redesign
@@ -121,8 +123,8 @@
* [x] Blue Sage Quest
* [x] Blue Sage Maps
* [x] Blue Sage Quest Special Reward
-* [ ] Frostia
- * [ ] AF King
+* [x] Frostia
+ * [x] AF King
* AFK Cap (all ready, just push)
* [x] Replace Desert Bow by Elfic Bow and make it available.
* [ ] Lilit
@@ -160,7 +162,8 @@
* [ ] Other
* [ ] Guild - Warp object
* [ ] Guild - Kamelot Castle
- * [ ] Lightbringer - only gm - guild_lv minutes - rent system
+ * [x] Lightbringer - only gm - guild_lv minutes - rent system
+ * [ ] Guild - GvG
* [x] Braknar Shield
* [x] Add Baktar
* [x] Add Khafar
@@ -178,10 +181,6 @@
on player count) - Or mimic :> Feeling lucky? :>
* [ ] Traps, poison makers for poison arrows: Buy common Arrow, and ask a Poison
Maker Player to upgrade them! (Make normal arrows cheaper, too)
-* [ ] Guilds
- * [ ] Guild GvG
- * [x] Alchemy Recipes
- * [x] Smith Recipes
* [ ] Experience Orb items
* Treasure chests drop those?