Changeset 5874


Ignore:
Timestamp:
05/20/18 10:33:52 (23 months ago)
Author:
Bluestone
Message:

fix Game.Version vs Engine.Version

Location:
branches/BAR
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/BAR/luarules/configs/death_messages.lua

    r5871 r5874  
    2222 * This means you would buy me TWO beers   
    2323 * I accept horses if beers are not available in your country 
    24  * You also have to retain this notice 
     24 * You must retain this notice 
    2525 * ---------------------------------------------------------------------------- 
    2626--]] 
     
    681681        "XX drowned in a pool of childrens tears", 
    682682        "XX was too busy perming its ears", 
    683         "XX jumped under a fleet of oncoming buses", 
     683        "XX jumped under a bus", 
    684684    "XX painted matchstalk men and matchstalk cats and dogs", 
    685685    "XX went the same way as FPS mode", 
     
    739739    "XX only lived once", 
    740740    "XX sank without trace", 
    741     "XX smoked its kipper", 
     741    "XX smoked its last kipper", 
    742742    "XX got its coat", 
    743743    "XX mailed itself home", 
     
    876876        "XX blew itself out", 
    877877        "XX was a temporary filling in the great mouth of life", 
    878         "XX is temporarily unavailable", 
     878        "XX is temporarily unavailable, please try again later", 
    879879        "XX is available for birthdays, weddings and family gatherings", 
    880880        "XX fell down", 
     
    890890        "XX is living in its own private Idaho", 
    891891        "XX fell into a burning ring of fire", 
     892        "XX went down down down and the flames went higher", 
    892893        "XX was generally looked upon as a cancerous growth attached to Spring", 
    893894        "XX has been a poorly maintained pile of junk for many, many years", 
    894         "XX went down down down and the flames went higher", 
    895895    "XX has played AA/BA for years, much longer than you", 
    896896    "XX has excellent AI support", 
    897     "XX got Forbed", 
    898     "XX released versions 9.47, 9.48, 9.49, 9.50, 9.51, 9.52, 9.53 and 9.54 as a test", 
    899     "XX was migrated to Github", 
    900897        "XX went to the great gig in the sky", 
    901         "XX was born with a plastic spoon in its mouth", 
    902898        "All lies and jest, still, XX hears what it wants to hear and disregards the rest", 
    903899        "XX stopped believing", 
     
    909905    "XX dropped its bongos", 
    910906    "XX lost its bojangles", 
     907    "XX released versions 9.47, 9.48, 9.49, 9.50, 9.51, 9.52, 9.53 and 9.54 as a test", 
    911908    "XX was crushed to death by a pair of falling bazongas", 
    912909    "XX discovered why you don't stand behind horses", 
     
    914911    "XX was eaten by a polar bear", 
    915912    "XX gazed into the oncoming headlights", 
    916     "XX was bounced to death by the Duracell bunny", 
    917     "XX got horsed", 
    918913    "XX went sunny side down", 
    919914    "XX remembered the good old 1980s", 
    920915    "XX resigned its commission", 
    921     "XX was a four point tool eater Jaguar", 
    922916    "XX blew its lid", 
    923917    "XX tried so hard and got so far but in the end it doesn't even matter", 
    924     "XX discovered it was wabbit sheason", 
    925     "XX failed to repeal Obamacare", 
     918    "XX was wabbit sheason", 
     919    "XX got Foreboded by an Angel", 
    926920    "XX had the largest inauguration crowd in history", 
     921    "XX was attached to another object by an inclined plane, wrapped helically around an axis", 
     922    "XX lost its botflag", 
     923    "Error 404: XX not found", 
     924    "XX was warm apple pie", 
     925    "XX has gone on holiday by mistake", 
     926    "XX tanked", 
     927    "XX put its back out", 
     928    "XX is dark and full of terrors", 
     929    "XX was ABS0LUt3Ly FREAK1N' D3STr0Y3D!!!!! by [%1N53rT U53rN4M3%] with UB3R 0P Sw0Rd of Ub3R 0v4Rp0WarDneSS 1n a R1D1CUlOu5lY 4W3s()mE w4Y!!!111111", 
     930    "XX hit the cactus too hard", 
     931    "XX was slain by dragons", 
     932    "XX innards became outards", 
     933    "XX left a small crater", 
     934    "XX was gone, like a bat out of hell", 
     935    "XX took early retirement", 
     936    "XX joined the foreign legion", 
     937    "XX has an apple in its mouth", 
     938    "XX sausaged its way to paradise", 
     939    "XX danced like nobody was watching", 
     940    "XX was a lazy drunken hillbilly", 
     941    "XX found death and disaster", 
     942    "XX got taken to the cleaners", 
     943    "XX is no longer supported", 
     944    "XX has been discontinued with immediate effect", 
     945    "XX was de-constructed", 
     946    "XX was as fleeting as a shooting star that crossed the evening sky", 
     947    "XX blinked and missed it", 
     948    "XX entered into eternal damnation", 
     949    "XX stumbled and fell", 
     950    "XX was a fat penguin", 
     951    "XX got honked", 
     952    "XX listened to the voices", 
     953    "XX was lost in the flood", 
     954    "XX was paved over", 
     955    "XX had a date with destiny", 
     956     
     957     
    927958     
    928959     
  • branches/BAR/luarules/gadgets/version_check.lua

    r5856 r5874  
    1717-- don't forget to update it! 
    1818local minMajorEngineVersion = 103 
    19 local minMinorEngineVersion = 297 
     19local minMinorEngineVersion = 753 
    2020local maxEngineVersion = 104  
    2121-- no real need for a max minor version 
     
    3333    local reportedMajorVersion, reportedMinorVersion 
    3434    local devEngine 
    35     --Spring.Echo(Game.version) 
    36     if string.find(Game.version,".",1,true) then  
    37         local n = string.find(Game.version,".",1,true) 
    38         reportedMajorVersion = string.sub(Game.version,1,n-1)    
    39         local m = string.find(Game.version,"-",1,true) 
    40         local m2 = string.find(Game.version,"-",m+1,true) 
    41         reportedMinorVersion = string.sub(Game.version,m+1,m2-1) 
     35    --Spring.Echo(Engine.version) 
     36    if string.find(Engine.version,".",1,true) then  
     37        local n = string.find(Engine.version,".",1,true) 
     38        reportedMajorVersion = string.sub(Engine.version,1,n-1)    
     39        local m = string.find(Engine.version,"-",1,true) 
     40        local m2 = string.find(Engine.version,"-",m+1,true) 
     41        reportedMinorVersion = string.sub(Engine.version,m+1,m2-1) 
    4242        devEngine = true 
    4343    else  
    44         local n = string.len(Game.version) 
    45         reportedMajorVersion = string.sub(Game.version,1,n)   
     44        local n = string.len(Engine.version) 
     45        reportedMajorVersion = string.sub(Engine.version,1,n)   
    4646        devEngine = false 
    4747    end 
     
    5858        or (devEngine and reportedMajorVersion==minMajorEngineVersion and reportedMinorVersion<minMinorEngineVersion)  
    5959    then 
    60         Spring.Echo(red .. "WARNING: You are using Spring " .. Game.version .. ", which is too old for this game.") 
     60        Spring.Echo(red .. "WARNING: You are using Spring " .. Engine.version .. ", which is too old for this game.") 
    6161        Spring.Echo(red .. "Please update your engine to  " .. wantedEngineVersions) 
    6262    elseif reportedMajorVersion>maxEngineVersion then 
    63         Spring.Echo(red .. "WARNING: You are using Spring " .. Game.version .. " which is too recent for this game.") 
     63        Spring.Echo(red .. "WARNING: You are using Spring " .. Engine.version .. " which is too recent for this game.") 
    6464        Spring.Echo(red .. "Please downgrade your engine to Spring " .. wantedEngineVersions) 
    6565    end            
  • branches/BAR/luaui.lua

    r4216 r5874  
    2424  -- use a versionned directory name if it exists 
    2525  local sansslash = string.sub(LUAUI_DIRNAME, 1, -2) 
    26   local versiondir = sansslash .. '-' .. Game.version .. '/' 
     26  local versiondir = sansslash .. '-' .. (Game.version or Engine.version) .. '/' 
    2727  if (VFS.FileExists(versiondir  .. 'barmain.lua', VFS.ZIP)) then 
    2828    LUAUI_DIRNAME = versiondir 
Note: See TracChangeset for help on using the changeset viewer.